Update to 4.4.2 and make it work @th-2020.

- dropped dhclient-decline-backoff patch. The source has changed beyond any hope in the meantime. Also if I read the new source correctly, it supports the DECLINE messages itself.
- dropped dhclient_hooks_d.patch. The patch is not needed anymore, as the original code now uses "run-parts" tool, which is smart enough to avoid .rpmnew files and the likes.
- added a new patch (extravars) that fixes a build breakage caused by some variables declared multiple times. This seems to be broken in original unpatched distribution of dhcp. I assume we run into that issue because of some combination of compiler options we use.

diff --git a/dhcp-errwarn-message.patch b/dhcp-errwarn-message.patch
index f42d1e980db3ebe2ecb07f0a18e15ddc991cc810..c90f0bde3e7377871fc9ee0272648b1e248cb4f2 100644 (file)
--- a/dhcp-errwarn-message.patch
+++ b/dhcp-errwarn-message.patch
@@ -43,7 +43,7 @@ diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c
  /* Log an error message, then exit... */
  
  void log_fatal (const char * fmt, ... )
-@@ -75,11 +110,13 @@ void log_fatal (const char * fmt, ... )
+@@ -74,11 +109,13 @@ void log_fatal (const char * fmt, ... )
    }
  
    log_error ("%s", "");
@@ -51,7 +51,7 @@ diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c
 -  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 ("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");

diff --git a/dhcp-extravars.patch b/dhcp-extravars.patch
new file mode 100644 (file)
index 0000000..dbbbe0b
--- /dev/null
+++ b/dhcp-extravars.patch
@@ -0,0 +1,34 @@
+--- dhcp-4.4.2/client/dhclient.c.extravars     2021-04-02 12:50:00.989139908 +0000
++++ dhcp-4.4.2/client/dhclient.c               2021-04-02 12:55:15.477409996 +0000
+@@ -89,8 +89,6 @@ static const char message [] = "Internet
+ static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
+ #endif /* UNIT_TEST */
+ 
+-u_int16_t local_port = 0;
+-u_int16_t remote_port = 0;
+ #if defined(DHCPv6) && defined(DHCP4o6)
+ int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
+ #endif
+--- dhcp-4.4.2/relay/dhcrelay.c.extravars      2021-04-02 13:05:13.513727484 +0000
++++ dhcp-4.4.2/relay/dhcrelay.c                        2021-04-02 13:05:33.690494049 +0000
+@@ -95,9 +95,6 @@ enum { forward_and_append,   /* Forward an
+        forward_untouched,     /* Forward without changes. */
+        discard } agent_relay_mode = forward_and_replace;
+ 
+-u_int16_t local_port;
+-u_int16_t remote_port;
+-
+ /* Relay agent server list. */
+ struct server_list {
+       struct server_list *next;
+--- dhcp-4.4.2/server/mdb.c.extravars  2019-12-17 19:13:31.000000000 +0000
++++ dhcp-4.4.2/server/mdb.c            2021-04-02 13:09:26.508311259 +0000
+@@ -67,8 +67,6 @@ static host_id_info_t *host_id_info = NU
+ 
+ int numclasseswritten;
+ 
+-omapi_object_type_t *dhcp_type_host;
+-
+ isc_result_t enter_class(cd, dynamicp, commit)
+       struct class *cd;
+       int dynamicp;

diff --git a/dhcp-options.patch b/dhcp-options.patch
index 8f0dfe98b57f15a7ebe052d62c7014c6ef4f1949..0ed3eb578e2837c84ed8dea97a6e67a474b9d3af 100644 (file)
--- a/dhcp-options.patch
+++ b/dhcp-options.patch
@@ -139,12 +139,11 @@ diff -up dhcp-4.3.4/client/dhclient.8.options dhcp-4.3.4/client/dhclient.8
  .TP
  .BI \-n
  Do not configure any interfaces.  This is most likely to be useful in
-diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
---- dhcp-4.3.4/client/dhclient.c.options       2016-03-22 14:16:51.000000000 +0100
-+++ dhcp-4.3.4/client/dhclient.c       2016-04-29 12:12:14.182364093 +0200
-@@ -40,6 +40,12 @@
- #include <isc/file.h>
- #include <dns/result.h>
+--- dhcp-4.4.2b1/client/dhclient.c.orig        2021-04-02 12:10:49.327389327 +0000
++++ dhcp-4.4.2b1/client/dhclient.c     2021-04-02 12:18:50.599787128 +0000
+@@ -41,6 +41,12 @@
+ #include <sys/wait.h>
+ #include <limits.h>
  
 +/*
 + * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
@@ -155,7 +154,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
  TIME default_lease_time = 43200; /* 12 hours... */
  TIME max_lease_time = 86400; /* 24 hours... */
  
-@@ -100,6 +106,10 @@ char *mockup_relay = NULL;
+@@ -112,6 +118,10 @@ char *mockup_relay = NULL;
  
  char *progname = NULL;
  
@@ -166,22 +165,22 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
  void run_stateless(int exit_mode, u_int16_t port);
  
  static isc_result_t write_duid(struct data_string *duid);
-@@ -177,7 +187,11 @@ usage(const char *sfmt, const char *sarg
-                 "                [-s server-addr] [-cf config-file]\n"
-                 "                [-df duid-file] [-lf lease-file]\n"
-                 "                [-pf pid-file] [--no-pid] [-e VAR=val]\n"
--                "                [-sf script-file] [interface]*",
-+                "                [-sf script-file] [interface]*\n"
-+                "                [-C <dhcp-client-identifier>] [-B]\n"
-+                "                [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n"
-+                "                [-V <vendor-class-identifier>]\n"
-+                "                [--request-options <request option list>]",
-                 isc_file_basename(progname));
- }
+@@ -188,7 +198,11 @@ static const char use_v6command[] = "Com
+ "                [-s server-addr] [-cf config-file]\n" \
+ "                [-df duid-file] [-lf lease-file]\n" \
+ "                [-pf pid-file] [--no-pid] [-e VAR=val]\n" \
+-"                [-sf script-file] [interface]*"
++"                [-sf script-file] [interface]*\n" \
++"                [-C <dhcp-client-identifier>] [-B]\n" \
++"                [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n" \
++"                [-V <vendor-class-identifier>]\n" \
++"                [--request-options <request option list>]"
  
-@@ -214,6 +228,16 @@ main(int argc, char **argv) {
-       progname = argv[0];
- #endif
+ #define DHCLIENT_USAGEH "{--version|--help|-h}"
+ 
+@@ -251,6 +265,17 @@ main(int argc, char **argv) {
+       /* Initialize client globals. */
+       memset(&default_duid, 0, sizeof(default_duid));
  
 +      char *dhcp_client_identifier_arg = NULL;
 +      char *dhcp_host_name_arg = NULL;
@@ -193,11 +192,12 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
 +      char *arg_conf = NULL;
 +      int arg_conf_len = 0;
 +
-       /* Initialize client globals. */
-       memset(&default_duid, 0, sizeof(default_duid));
- 
-@@ -431,6 +455,88 @@ main(int argc, char **argv) {
-                                        strlen(PACKAGE_VERSION)));
++
+       /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
+          2 (stderr) are open. To do this, we assume that when we
+          open a file the lowest available file descriptor is used. */
+@@ -305,6 +330,89 @@ main(int argc, char **argv) {
+                                        strlen(DHCLIENT_USAGEH)));
                        IGNORE_RET(write(STDERR_FILENO, "\n", 1));
                        exit(0);
 +              } else if (!strcmp(argv[i], "-C")) {
@@ -282,10 +282,11 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
 +                      }
 +
 +                      dhclient_request_options = argv[i];
-               } else if (argv[i][0] == '-') {
-                       usage("Unknown command: %s", argv[i]);
-               } else if (interfaces_requested < 0) {
-@@ -630,6 +736,156 @@ main(int argc, char **argv) {
++
+               }
+       }
+       /* When not forbidden prepare to become a daemon */
+@@ -831,6 +939,156 @@ main(int argc, char **argv) {
        /* Parse the dhclient.conf file. */
        read_client_conf();
  
@@ -442,7 +443,46 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
        /* Parse the lease database. */
        read_client_leases();
  
-@@ -3067,7 +3323,8 @@ void make_discover (client, lease)
+@@ -991,7 +1249,7 @@ main(int argc, char **argv) {
+                                                *whole seconds
+                                                */
+                                               add_timeout(&tv, state_reboot,
+-                                                          client, 0, 0);
++                                                          client, 0, 0);
+                                       } else {
+                                               state_reboot(client);
+                                       }
+@@ -1771,11 +2029,11 @@ void bootp (packet)
+            ap; ap = ap -> next) {
+               if (addr_match(&packet->client_addr, &ap->match)) {
+ 
+-                      /* piaddr() returns its result in a static
++                      /* piaddr() returns its result in a static
+                          buffer sized 4*16 (see common/inet.c). */
+ 
+-                      strcpy(addrbuf, piaddr(ap->match.addr));
+-                      strcpy(maskbuf, piaddr(ap->match.mask));
++                      strcpy(addrbuf, piaddr(ap->match.addr));
++                      strcpy(maskbuf, piaddr(ap->match.mask));
+ 
+                       log_info("BOOTREPLY from %s rejected by rule %s "
+                                "mask %s.", piaddr(packet->client_addr),
+@@ -1823,11 +2081,11 @@ void dhcp (packet)
+            ap; ap = ap -> next) {
+               if (addr_match(&packet->client_addr, &ap->match)) {
+ 
+-                      /* piaddr() returns its result in a static
++                      /* piaddr() returns its result in a static
+                          buffer sized 4*16 (see common/inet.c). */
+ 
+-                      strcpy(addrbuf, piaddr(ap->match.addr));
+-                      strcpy(maskbuf, piaddr(ap->match.mask));
++                      strcpy(addrbuf, piaddr(ap->match.addr));
++                      strcpy(maskbuf, piaddr(ap->match.mask));
+ 
+                       log_info("%s from %s rejected by rule %s mask %s.",
+                                type, piaddr(packet->client_addr),
+@@ -3403,7 +3661,8 @@ void make_discover (client, lease)
        client -> packet.xid = random ();
        client -> packet.secs = 0; /* filled in by send_discover. */
  
@@ -452,7 +492,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
                client -> packet.flags = 0;
        else
                client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -3152,7 +3409,9 @@ void make_request (client, lease)
+@@ -3488,7 +3747,9 @@ void make_request (client, lease)
        } else {
                memset (&client -> packet.ciaddr, 0,
                        sizeof client -> packet.ciaddr);
@@ -463,7 +503,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
                        client -> packet.flags = 0;
                else
                        client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -3215,7 +3474,8 @@ void make_decline (client, lease)
+@@ -3551,7 +3812,8 @@ void make_decline (client, lease)
        client -> packet.hops = 0;
        client -> packet.xid = client -> xid;
        client -> packet.secs = 0; /* Filled in by send_request. */
@@ -498,16 +538,16 @@ diff -up dhcp-4.3.4/includes/dhcpd.h.options dhcp-4.3.4/includes/dhcpd.h
  };
  
  /* Per-interface state used in the dhcp client... */
-diff -up dhcp-4.3.4/includes/dhctoken.h.options dhcp-4.3.4/includes/dhctoken.h
---- dhcp-4.3.4/includes/dhctoken.h.options     2016-04-29 11:59:50.449590076 +0200
-+++ dhcp-4.3.4/includes/dhctoken.h     2016-04-29 12:15:03.073300846 +0200
-@@ -373,7 +373,8 @@ enum dhcp_token {
-       TOKEN_BIG_ENDIAN = 675,
+--- dhcp-4.4.2b1/includes/dhctoken.h.orig       2021-04-02 12:10:49.334056028 +0000
++++ dhcp-4.4.2b1/includes/dhctoken.h    2021-04-02 12:20:14.623533025 +0000
+@@ -376,7 +376,8 @@ enum dhcp_token {
        LEASE_ID_FORMAT = 676,
        TOKEN_HEX = 677,
--      TOKEN_OCTAL = 678
-+      TOKEN_OCTAL = 678,
-+      BOOTP_BROADCAST_ALWAYS = 679
+       TOKEN_OCTAL = 678,
+-      KEY_ALGORITHM = 679
++      KEY_ALGORITHM = 679,
++      BOOTP_BROADCAST_ALWAYS = 680
  };
  
- #define is_identifier(x)      ((x) >= FIRST_TOKEN &&  \
+ #define is_identifier(x)       ((x) >= FIRST_TOKEN &&  \
+

diff --git a/dhcp.spec b/dhcp.spec
index 118bdc4a2b57aab8fb837867dc4ed0a50f4ed677..f2e75a9395f24699114915c8b084a43788171a34 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -3,7 +3,7 @@
 %bcond_without ldap    # without support for ldap storage
 %bcond_without static_libs     # don't build static library
 
-%define         ver     4.3.5
+%define         ver     4.4.2
 %if 0
 %define         pverdot .P1
 %define         pverdir -P1
@@ -20,12 +20,12 @@ Summary(pl.UTF-8):  Serwer DHCP
 Summary(pt_BR.UTF-8):  Servidor DHCP (Protocolo de configuração dinâmica de hosts)
 Name:          dhcp
 Version:       %{ver}%{pverdot}
-Release:       3
+Release:       1
 Epoch:         4
 License:       MIT
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/dhcp/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.gz
-# Source0-md5: 2b5e5b2fa31c2e27e487039d86f83d3f
+# Source0-md5: 2afdaf8498dc1edaf3012efdd589b3e1
 Source1:       %{name}.init
 Source2:       %{name}6.init
 Source3:       %{name}-relay.init
@@ -42,11 +42,10 @@ Patch3:             %{name}-timeouts.patch
 Patch4:                %{name}-options.patch
 Patch5:                %{name}-errwarn-message.patch
 Patch6:                %{name}-memory.patch
-Patch7:                %{name}-dhclient-decline-backoff.patch
-Patch8:                %{name}-unicast-bootp.patch
-Patch9:                %{name}-default-requested-options.patch
-Patch10:       %{name}-manpages.patch
-Patch11:       dhclient_hooks_d.patch
+Patch7:                %{name}-unicast-bootp.patch
+Patch8:                %{name}-default-requested-options.patch
+Patch9:                %{name}-manpages.patch
+Patch10:       %{name}-extravars.patch
 URL:           http://www.isc.org/sw/dhcp/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -207,7 +206,6 @@ komunikacji z działającym serwerem ISC DHCP i jego kontroli.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 cp -a %{SOURCE11} README.ldap
@@ -406,10 +404,10 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
+%{_libdir}/libdhcp.a
 %{_libdir}/libdhcpctl.a
 %{_libdir}/libomapi.a
 %{_includedir}/dhcpctl
-%{_includedir}/isc-dhcp
 %{_includedir}/omapip
 %{_mandir}/man3/dhcpctl.3*
 %{_mandir}/man3/omapi.3*