diff --git a/dhcp-errwarn-message.patch b/dhcp-errwarn-message.patch deleted file mode 100644 index 18f77cfcab72b06b2dd0e54482ac6d3ac87f8b01..0000000000000000000000000000000000000000 --- a/dhcp-errwarn-message.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c ---- dhcp-4.3.5/omapip/errwarn.c.errwarn 2016-09-27 21:16:50.000000000 +0200 -+++ dhcp-4.3.5/omapip/errwarn.c 2016-11-29 19:44:03.515031147 +0100 -@@ -49,6 +49,41 @@ void (*log_cleanup) (void); - static char mbuf [CVT_BUF_MAX + 1]; - static char fbuf [CVT_BUF_MAX + 1]; - -+// get BUG_REPORT_URL from /etc/os-release -+char * bug_report_url(void) { -+ FILE * file = fopen("/etc/os-release", "r"); -+ size_t len; -+ char * line = NULL; -+ char * url = NULL; -+ size_t url_len = 256; -+ -+ url = (char *) malloc(url_len * sizeof(char)); -+ strcpy(url, "https://bugzilla.redhat.com/"); -+ -+ if (!file) -+ return url; -+ -+ while ((getline(&line, &len, file)) != -1) { -+ if (strstr(line, "BUG_REPORT_URL") != NULL) { -+ char * start = strchr(line, '='); -+ char * rquotes = strrchr(line, '"'); -+ -+ if (rquotes != NULL) { -+ *rquotes = '\0'; -+ strncpy(url, start+2, url_len); -+ } else { -+ strncpy(url, start+1, url_len); -+ } -+ url[url_len-1] = '\0'; -+ fclose(file); -+ return url; -+ } -+ } -+ fclose(file); -+ return url; -+} -+ -+ - /* Log an error message, then exit... */ - - void log_fatal (const char * fmt, ... ) -@@ -75,11 +110,13 @@ void log_fatal (const char * fmt, ... ) - } - - log_error ("%s", ""); -- log_error ("If you think you have received this message due to a bug rather"); -- log_error ("than a configuration issue please read the section on submitting"); -- log_error ("bugs on either our web page at www.isc.org or in the README file"); -- log_error ("before submitting a bug. These pages explain the proper"); -- log_error ("process and the information we find helpful for debugging."); -+ log_error ("This version of ISC DHCP is based on the release available"); -+ log_error ("on ftp.isc.org. Features have been added and other changes"); -+ log_error ("have been made to the base software release in order to make"); -+ log_error ("it work better with this distribution."); -+ log_error ("%s", ""); -+ log_error ("Please report issues with this software via: "); -+ log_error ("%s", bug_report_url()); - log_error ("%s", ""); - log_error ("exiting."); - diff --git a/dhcp-manpages.patch b/dhcp-manpages.patch deleted file mode 100644 index 24d6972af996dfd21d9a115876c7029526692699..0000000000000000000000000000000000000000 --- a/dhcp-manpages.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff -up dhcp-4.3.5b1/client/dhclient.conf.5.man dhcp-4.3.5b1/client/dhclient.conf.5 ---- dhcp-4.3.5b1/client/dhclient.conf.5.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/client/dhclient.conf.5 2016-09-12 17:09:23.243313514 +0200 -@@ -228,7 +228,8 @@ responding to the client send the client - options. Only the option names should be specified in the request - statement - not option parameters. By default, the DHCPv4 client - requests the subnet-mask, broadcast-address, time-offset, routers, --domain-name, domain-name-servers and host-name options while the DHCPv6 -+domain-search, domain-name, domain-name-servers, host-name, nis-domain, -+nis-servers, ntp-servers and interface-mtu options while the DHCPv6 - client requests the dhcp6 name-servers and domain-search options. Note - that if you enter a \'request\' statement, you over-ride these defaults - and these options will not be requested. -@@ -736,6 +737,17 @@ know the DHCP service(s) anycast MAC add - client. The \fIlink-type\fR and \fImac-address\fR parameters are configured - in a similar manner to the \fBhardware\fR statement. - .PP -+ \fBbootp-broadcast-always;\fR -+.PP -+The -+.B bootp-broadcast-always -+statement instructs dhclient to always set the bootp broadcast flag in -+request packets, so that servers will always broadcast replies. -+This is equivalent to supplying the dhclient -B argument, and has -+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf. -+This option is provided as an extension to enable dhclient to work -+on IBM s390 Linux guests. -+.PP - .SH SAMPLE - The following configuration file was used on a laptop running NetBSD - 1.3, though the domains have been modified. -diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient-script.8 ---- dhcp-4.3.5b1/client/dhclient-script.8.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/client/dhclient-script.8 2016-09-12 17:08:09.516254385 +0200 -@@ -45,7 +45,7 @@ customizations are needed, they should b - exit hooks provided (see HOOKS for details). These hooks will allow the - user to override the default behaviour of the client in creating a - .B /etc/resolv.conf --file. -+file, and to handle DHCP options not handled by default. - .PP - No standard client script exists for some operating systems, even though - the actual client may work, so a pioneering user may well need to create -@@ -89,6 +89,26 @@ present. The - .B ETCDIR/dhclient-exit-hooks - script can modify the valid of exit_status to change the exit status - of dhclient-script. -+.PP -+Immediately after dhclient brings an interface UP with a new IP address, -+subnet mask, and routes, in the REBOOT/BOUND states, it will check for the -+existence of an executable -+.B ETCDIR/dhclient-up-hooks -+script, and source it if found. This script can handle DHCP options in -+the environment that are not handled by default. A per-interface. -+.B ETCDIR/dhclient-${IF}-up-hooks -+script will override the generic script and be sourced when interface -+$IF has been brought up. -+.PP -+Immediately before dhclient brings an interface DOWN, removing its IP -+address, subnet mask, and routes, in the STOP/RELEASE states, it will -+check for the existence of an executable -+.B ETCDIR/dhclient-down-hooks -+script, and source it if found. This script can handle DHCP options in -+the environment that are not handled by default. A per-interface -+.B ETCDIR/dhclient-${IF}-down-hooks -+script will override the generic script and be sourced when interface -+$IF is about to be brought down. - .SH OPERATION - When dhclient needs to invoke the client configuration script, it - defines a set of variables in the environment, and then invokes -diff -up dhcp-4.3.5b1/common/dhcp-options.5.man dhcp-4.3.5b1/common/dhcp-options.5 ---- dhcp-4.3.5b1/common/dhcp-options.5.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/common/dhcp-options.5 2016-09-12 17:08:09.517254386 +0200 -@@ -1013,6 +1013,21 @@ classless IP routing - it does not inclu - classless IP routing is now the most widely deployed routing standard, - this option is virtually useless, and is not implemented by any of the - popular DHCP clients, for example the Microsoft DHCP client. -+.PP -+NOTE to Fedora dhclient users: -+.br -+dhclient-script interprets trailing 0 octets of the target as indicating -+the subnet class of the route, so for the following static-routes value: -+.br -+ option static-routes 172.0.0.0 172.16.2.254, -+.br -+ 192.168.0.0 192.168.2.254; -+.br -+dhclient-script will create routes: -+.br -+ 172/8 via 172.16.2.254 dev $interface -+.br -+ 192.168/16 via 192.168.2.254 dev $interface - .RE - .PP - .nf -diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 ---- dhcp-4.3.5b1/server/dhcpd.conf.5.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/dhcpd.conf.5 2016-09-12 17:10:11.205351980 +0200 -@@ -528,6 +528,9 @@ pool { - }; - .fi - .PP -+Dynamic BOOTP leases are not compatible with failover, and, as such, -+you need to disallow BOOTP in pools that you are using failover for. -+.PP - The server currently does very little sanity checking, so if you - configure it wrong, it will just fail in odd ways. I would recommend - therefore that you either do failover or don't do failover, but don't -@@ -542,9 +545,9 @@ primary server might look like this: - failover peer "foo" { - primary; - address anthrax.rc.example.com; -- port 519; -+ port 647; - peer address trantor.rc.example.com; -- peer port 520; -+ peer port 847; - max-response-delay 60; - max-unacked-updates 10; - mclt 3600; -@@ -1246,7 +1249,7 @@ the zone containing PTR records - for IS - .PP - .nf - key DHCP_UPDATER { -- algorithm HMAC-MD5.SIG-ALG.REG.INT; -+ algorithm hmac-md5; - secret pRP5FapFoJ95JEL06sv4PQ==; - }; - -@@ -1269,7 +1272,7 @@ dhcpd.conf file: - .PP - .nf - key DHCP_UPDATER { -- algorithm HMAC-MD5.SIG-ALG.REG.INT; -+ algorithm hmac-md5; - secret pRP5FapFoJ95JEL06sv4PQ==; - }; - -@@ -2742,7 +2745,8 @@ statement - The \fInext-server\fR statement is used to specify the host address of - the server from which the initial boot file (specified in the - \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should --be a numeric IP address or a domain name. -+be a numeric IP address or a domain name. If no \fInext-server\fR statement -+applies to a given client, the address 0.0.0.0 is used. - .RE - .PP - The diff --git a/dhcp.spec b/dhcp.spec index 5a971dc4c2f8d0e6a40813b5507d112d7ce6296c..2cb4044fb6778b4756ef730edf0ee596663e9a7b 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -3,14 +3,13 @@ Name: dhcp Version: 4.3.6 -Release: 33 +Release: 34 Summary: Dynamic host configuration protocol software #Please don't change the epoch on this package Epoch: 12 License: ISC URL: https://www.isc.org/dhcp/ Source0: http://ftp.isc.org/isc/dhcp/%{version}/dhcp-%{version}.tar.gz -#Source1~8 copy from fedora Source1: dhclient-script Source2: README.dhclient.d Source3: 11-dhclient @@ -20,7 +19,6 @@ Source6: dhcpd.service Source7: dhcpd6.service Source8: dhcrelay.service -#patch18,20,39,40,41,,42,43 from upstream,other from fedora Patch0: dhcp-remove-bind.patch Patch1: dhcp-sharedlib.patch @@ -31,7 +29,6 @@ Patch4: dhcp-dhclient-decline-backoff.patch Patch5: dhcp-unicast-bootp.patch Patch6: dhcp-default-requested-options.patch -Patch7: dhcp-manpages.patch Patch8: dhcp-paths.patch Patch9: dhcp-CLOEXEC.patch Patch10: dhcp-garbage-chars.patch @@ -307,6 +304,12 @@ exit 0 %{_mandir}/man3/omapi.3.gz %changelog +* Sat Jan 11 2020 openEuler Buildteam - 4.3.6-34 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: delete patches + * Tue Dec 24 2019 openEuler Buildteam - 4.3.6-33 - rename doc subpackage as help subpackage