From a8b252e239cceb2360ae546537a625903d47b5b8 Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 9 Mar 2022 18:09:53 +0000 Subject: [PATCH] update to isc-dhcp-4.4.3 NOTE: The client and relay components are now End-Of-Life. This is the final release that contains those components. --- net/isc-dhcp/Makefile | 4 +- net/isc-dhcp/distinfo | 4 +- net/isc-dhcp/files/dhclient-script | 2 - net/isc-dhcp/patches/patch-bind_Makefile_in | 7 ++- net/isc-dhcp/patches/patch-client_Makefile_in | 3 +- net/isc-dhcp/patches/patch-client_dhclient_c | 22 ---------- net/isc-dhcp/patches/patch-common_discover_c | 21 --------- net/isc-dhcp/patches/patch-keama_confparse_c | 13 ------ net/isc-dhcp/patches/patch-keama_data_c | 2 - net/isc-dhcp/patches/patch-keama_eval_c | 13 ------ net/isc-dhcp/patches/patch-keama_keama_c | 29 ------------- net/isc-dhcp/patches/patch-keama_keama_h | 43 ++----------------- net/isc-dhcp/patches/patch-relay_dhcrelay_c | 21 --------- net/isc-dhcp/patches/patch-server_mdb6_c | 19 -------- net/isc-dhcp/patches/patch-server_mdb_c | 19 -------- net/isc-dhcp/pkg/PLIST-client | 1 - net/isc-dhcp/pkg/PLIST-main | 1 - net/isc-dhcp/pkg/PLIST-omapi | 1 - net/isc-dhcp/pkg/isc_dhcpd.rc | 2 - net/isc-dhcp/pkg/isc_dhcrelay.rc | 2 - 20 files changed, 11 insertions(+), 218 deletions(-) delete mode 100644 net/isc-dhcp/patches/patch-client_dhclient_c delete mode 100644 net/isc-dhcp/patches/patch-common_discover_c delete mode 100644 net/isc-dhcp/patches/patch-keama_confparse_c delete mode 100644 net/isc-dhcp/patches/patch-keama_eval_c delete mode 100644 net/isc-dhcp/patches/patch-keama_keama_c delete mode 100644 net/isc-dhcp/patches/patch-relay_dhcrelay_c delete mode 100644 net/isc-dhcp/patches/patch-server_mdb6_c delete mode 100644 net/isc-dhcp/patches/patch-server_mdb_c diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index 76c3f6e9307..49e0f1dd287 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.59 2021/05/26 21:32:04 sthen Exp $ - COMMENT-main= ISC DHCP Server COMMENT-client= ISC DHCP Client COMMENT-omapi= ISC DHCP OMAPI -VERSION= 4.4.2-P1 +VERSION= 4.4.3 DISTNAME= isc-dhcp-${VERSION} PKGNAME= isc-dhcp-${VERSION:S/-P/./} PKGNAME-main= isc-dhcp-server-${VERSION:S/-P/./} diff --git a/net/isc-dhcp/distinfo b/net/isc-dhcp/distinfo index a7d93adfe80..88846c10654 100644 --- a/net/isc-dhcp/distinfo +++ b/net/isc-dhcp/distinfo @@ -1,2 +1,2 @@ -SHA256 (dhcp-4.4.2-P1.tar.gz) = sF4EM3U5VFqPqg1qxRje/GGgflrsZqhX9FXn8hjIWho= -SIZE (dhcp-4.4.2-P1.tar.gz) = 9898311 +SHA256 (dhcp-4.4.3.tar.gz) = Dj7GtMKgXsAUiHS82ZmmbQVRg3jXdCH2B/sLydATWBg= +SIZE (dhcp-4.4.3.tar.gz) = 10078953 diff --git a/net/isc-dhcp/files/dhclient-script b/net/isc-dhcp/files/dhclient-script index 64326be643b..4619e0b3a48 100644 --- a/net/isc-dhcp/files/dhclient-script +++ b/net/isc-dhcp/files/dhclient-script @@ -1,7 +1,5 @@ #!/bin/sh # -# $OpenBSD: dhclient-script,v 1.1 2012/10/31 23:21:05 brad Exp $ -# # Copyright (c) 2003 Kenneth R Westerback # # Permission to use, copy, modify, and distribute this software for any diff --git a/net/isc-dhcp/patches/patch-bind_Makefile_in b/net/isc-dhcp/patches/patch-bind_Makefile_in index 794687ccddb..821964142df 100644 --- a/net/isc-dhcp/patches/patch-bind_Makefile_in +++ b/net/isc-dhcp/patches/patch-bind_Makefile_in @@ -1,4 +1,3 @@ -$OpenBSD: patch-bind_Makefile_in,v 1.5 2020/01/22 16:11:55 sthen Exp $ Index: bind/Makefile.in --- bind/Makefile.in.orig +++ bind/Makefile.in @@ -19,8 +18,8 @@ Index: bind/Makefile.in + ./configure ${bindconfig} 2>&1 | tee ${binddir}/configure.log); \ fi - atf: -@@ -66,7 +66,7 @@ atf: + atf: bind1 +@@ -66,7 +66,7 @@ atf: bind1 else \ echo Building ATF support ; \ (cd ${bindsrcdir}/unit; \ @@ -29,7 +28,7 @@ Index: bind/Makefile.in cp -rp atf ${binddir}) ; \ fi -@@ -80,15 +80,15 @@ bind2: +@@ -81,15 +81,15 @@ bind2: bind1 for libdir in ${bindlibs} ; do \ (cd ${bindsrcdir}/lib/$$libdir ; \ echo Building $$libdir library in `pwd` ; \ diff --git a/net/isc-dhcp/patches/patch-client_Makefile_in b/net/isc-dhcp/patches/patch-client_Makefile_in index 83b262f466e..ba4faecc3bc 100644 --- a/net/isc-dhcp/patches/patch-client_Makefile_in +++ b/net/isc-dhcp/patches/patch-client_Makefile_in @@ -1,8 +1,7 @@ -$OpenBSD: patch-client_Makefile_in,v 1.10 2020/01/22 16:11:55 sthen Exp $ Index: client/Makefile.in --- client/Makefile.in.orig +++ client/Makefile.in -@@ -371,7 +371,8 @@ top_srcdir = @top_srcdir@ +@@ -372,7 +372,8 @@ top_srcdir = @top_srcdir@ # production code. Sadly, we are not there yet. SUBDIRS = . tests AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ diff --git a/net/isc-dhcp/patches/patch-client_dhclient_c b/net/isc-dhcp/patches/patch-client_dhclient_c deleted file mode 100644 index 225cfab8bfc..00000000000 --- a/net/isc-dhcp/patches/patch-client_dhclient_c +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-client_dhclient_c,v 1.2 2021/02/01 22:01:16 sthen Exp $ - -From 6c7e61578b1b449272dbb40dd8b98d03dad8a57a Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Thu, 30 Jul 2020 10:01:36 -0400 -Subject: [PATCH] [#117] Fixed gcc 10 compilation issues - -Index: client/dhclient.c ---- client/dhclient.c.orig -+++ client/dhclient.c -@@ -83,8 +83,9 @@ static const char message [] = "Internet Systems Conso - 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; -+extern u_int16_t local_port; -+extern u_int16_t remote_port; -+ - #if defined(DHCPv6) && defined(DHCP4o6) - int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */ - #endif diff --git a/net/isc-dhcp/patches/patch-common_discover_c b/net/isc-dhcp/patches/patch-common_discover_c deleted file mode 100644 index 7a6d64c0c5f..00000000000 --- a/net/isc-dhcp/patches/patch-common_discover_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-common_discover_c,v 1.1 2021/02/01 22:01:16 sthen Exp $ - -From 6c7e61578b1b449272dbb40dd8b98d03dad8a57a Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Thu, 30 Jul 2020 10:01:36 -0400 -Subject: [PATCH] [#117] Fixed gcc 10 compilation issues - -Index: common/discover.c ---- common/discover.c.orig -+++ common/discover.c -@@ -45,8 +45,8 @@ struct interface_info *fallback_interface = 0; - - int interfaces_invalidated; - int quiet_interface_discovery; --u_int16_t local_port; --u_int16_t remote_port; -+u_int16_t local_port = 0; -+u_int16_t remote_port = 0; - u_int16_t relay_port = 0; - int dhcpv4_over_dhcpv6 = 0; - int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *); diff --git a/net/isc-dhcp/patches/patch-keama_confparse_c b/net/isc-dhcp/patches/patch-keama_confparse_c deleted file mode 100644 index 34afdcf2944..00000000000 --- a/net/isc-dhcp/patches/patch-keama_confparse_c +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-keama_confparse_c,v 1.1 2020/01/22 16:11:55 sthen Exp $ - -Index: keama/confparse.c ---- keama/confparse.c.orig -+++ keama/confparse.c -@@ -26,6 +26,7 @@ - #include "keama.h" - - #include -+#include - #include - #include - #include diff --git a/net/isc-dhcp/patches/patch-keama_data_c b/net/isc-dhcp/patches/patch-keama_data_c index 361eb3d8c17..7beafe9d1d4 100644 --- a/net/isc-dhcp/patches/patch-keama_data_c +++ b/net/isc-dhcp/patches/patch-keama_data_c @@ -1,5 +1,3 @@ -$OpenBSD: patch-keama_data_c,v 1.1 2020/01/22 16:11:55 sthen Exp $ - Index: keama/data.c --- keama/data.c.orig +++ keama/data.c diff --git a/net/isc-dhcp/patches/patch-keama_eval_c b/net/isc-dhcp/patches/patch-keama_eval_c deleted file mode 100644 index 391220646f5..00000000000 --- a/net/isc-dhcp/patches/patch-keama_eval_c +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-keama_eval_c,v 1.1 2020/01/22 16:11:55 sthen Exp $ - -Index: keama/eval.c ---- keama/eval.c.orig -+++ keama/eval.c -@@ -24,6 +24,7 @@ - #include "keama.h" - - #include -+#include - #include - #include - #include diff --git a/net/isc-dhcp/patches/patch-keama_keama_c b/net/isc-dhcp/patches/patch-keama_keama_c deleted file mode 100644 index cc6491b9c2a..00000000000 --- a/net/isc-dhcp/patches/patch-keama_keama_c +++ /dev/null @@ -1,29 +0,0 @@ -$OpenBSD: patch-keama_keama_c,v 1.2 2021/02/01 22:01:16 sthen Exp $ - -From c666652e10e28558ed7b2b0025bf193478e98030 Mon Sep 17 00:00:00 2001 -From: Francis Dupont -Date: Fri, 3 Jul 2020 15:24:32 +0200 -Subject: [PATCH] Fixed gcc10 build - -Index: keama/keama.c ---- keama/keama.c.orig -+++ keama/keama.c -@@ -22,6 +22,8 @@ - */ - - #include -+#include -+#include - #include - #include - #include -@@ -46,6 +48,9 @@ usage(const char *sfmt, const char *sarg) { - fputs(KEAMA_USAGE, stderr); - exit(1); - } -+ -+enum resolve resolve; -+struct parses parses; - - int local_family = 0; - char *hook_library_path = NULL; diff --git a/net/isc-dhcp/patches/patch-keama_keama_h b/net/isc-dhcp/patches/patch-keama_keama_h index 5c16067db28..d664c5c556d 100644 --- a/net/isc-dhcp/patches/patch-keama_keama_h +++ b/net/isc-dhcp/patches/patch-keama_keama_h @@ -1,47 +1,12 @@ -$OpenBSD: patch-keama_keama_h,v 1.2 2021/02/01 22:01:16 sthen Exp $ - -From c666652e10e28558ed7b2b0025bf193478e98030 Mon Sep 17 00:00:00 2001 -From: Francis Dupont -Date: Fri, 3 Jul 2020 15:24:32 +0200 -Subject: [PATCH] Fixed gcc10 build - Index: keama/keama.h --- keama/keama.h.orig +++ keama/keama.h -@@ -29,14 +29,17 @@ +@@ -28,6 +28,8 @@ + #include "data.h" #include "dhctoken.h" - #include +#include ++#include + #include /* Resolution of FQDNs into IPv4 addresses */ - enum resolve { - perform = 0, /* resolve */ - fatal, /* raise a fatal error */ - pass /* pass the string wth a warning */ --} resolve; -+}; - -+extern enum resolve resolve; -+ - /* From includes/dhcp.h */ - - #define HTYPE_ETHER 1 -@@ -58,8 +61,6 @@ extern int local_family; - - /* A parsing context. */ - --TAILQ_HEAD(parses, parse) parses; -- - struct parse { - int lexline; - int lexchar; -@@ -119,6 +120,8 @@ struct parse { - TAILQ_ENTRY(parse) next; - - }; -+ -+extern TAILQ_HEAD(parses, parse) parses; - - #define PARAMETER 0 - #define TOPLEVEL 1 diff --git a/net/isc-dhcp/patches/patch-relay_dhcrelay_c b/net/isc-dhcp/patches/patch-relay_dhcrelay_c deleted file mode 100644 index 2d8a7890684..00000000000 --- a/net/isc-dhcp/patches/patch-relay_dhcrelay_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-relay_dhcrelay_c,v 1.1 2021/02/01 22:01:16 sthen Exp $ - -From 6c7e61578b1b449272dbb40dd8b98d03dad8a57a Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Thu, 30 Jul 2020 10:01:36 -0400 -Subject: [PATCH] [#117] Fixed gcc 10 compilation issues - -Index: relay/dhcrelay.c ---- relay/dhcrelay.c.orig -+++ relay/dhcrelay.c -@@ -95,8 +95,8 @@ enum { forward_and_append, /* Forward and append our o - forward_untouched, /* Forward without changes. */ - discard } agent_relay_mode = forward_and_replace; - --u_int16_t local_port; --u_int16_t remote_port; -+extern u_int16_t local_port; -+extern u_int16_t remote_port; - - /* Relay agent server list. */ - struct server_list { diff --git a/net/isc-dhcp/patches/patch-server_mdb6_c b/net/isc-dhcp/patches/patch-server_mdb6_c deleted file mode 100644 index 4f9201382cb..00000000000 --- a/net/isc-dhcp/patches/patch-server_mdb6_c +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-server_mdb6_c,v 1.1 2021/02/01 22:01:16 sthen Exp $ - -From 6c7e61578b1b449272dbb40dd8b98d03dad8a57a Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Thu, 30 Jul 2020 10:01:36 -0400 -Subject: [PATCH] [#117] Fixed gcc 10 compilation issues - -Index: server/mdb6.c ---- server/mdb6.c.orig -+++ server/mdb6.c -@@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt - } - new_ds.data = new_ds.buffer->data; - memcpy(new_ds.buffer->data, ds.data, ds.len); -- memcpy(new_ds.buffer->data + ds.len, &tmp, sizeof(tmp)); -+ memcpy(&new_ds.buffer->data[0] + ds.len, &tmp, sizeof(tmp)); - data_string_forget(&ds, MDL); - data_string_copy(&ds, &new_ds, MDL); - data_string_forget(&new_ds, MDL); diff --git a/net/isc-dhcp/patches/patch-server_mdb_c b/net/isc-dhcp/patches/patch-server_mdb_c deleted file mode 100644 index d833029e3a4..00000000000 --- a/net/isc-dhcp/patches/patch-server_mdb_c +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-server_mdb_c,v 1.1 2021/02/01 22:01:16 sthen Exp $ - -From 6c7e61578b1b449272dbb40dd8b98d03dad8a57a Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Thu, 30 Jul 2020 10:01:36 -0400 -Subject: [PATCH] [#117] Fixed gcc 10 compilation issues - -Index: server/mdb.c ---- server/mdb.c.orig -+++ server/mdb.c -@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL; - - int numclasseswritten; - --omapi_object_type_t *dhcp_type_host; -+extern omapi_object_type_t *dhcp_type_host; - - isc_result_t enter_class(cd, dynamicp, commit) - struct class *cd; diff --git a/net/isc-dhcp/pkg/PLIST-client b/net/isc-dhcp/pkg/PLIST-client index 4e6f5b1dd2c..d2e22eff9ee 100644 --- a/net/isc-dhcp/pkg/PLIST-client +++ b/net/isc-dhcp/pkg/PLIST-client @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST-client,v 1.5 2012/10/31 23:21:05 brad Exp $ @conflict isc-dhcp-* @man man/man5/dhclient.conf.5 @man man/man5/dhclient.leases.5 diff --git a/net/isc-dhcp/pkg/PLIST-main b/net/isc-dhcp/pkg/PLIST-main index a3ee1209501..149317c6d52 100644 --- a/net/isc-dhcp/pkg/PLIST-main +++ b/net/isc-dhcp/pkg/PLIST-main @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST-main,v 1.6 2020/01/22 16:11:55 sthen Exp $ @conflict isc-dhcp-* @pkgpath net/isc-dhcp @newgroup _isc-dhcp:744 diff --git a/net/isc-dhcp/pkg/PLIST-omapi b/net/isc-dhcp/pkg/PLIST-omapi index bcbcdfc02fd..bad6a72667b 100644 --- a/net/isc-dhcp/pkg/PLIST-omapi +++ b/net/isc-dhcp/pkg/PLIST-omapi @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST-omapi,v 1.7 2020/01/22 16:11:55 sthen Exp $ @conflict isc-dhcp-* @bin bin/omshell include/dhcpctl/ diff --git a/net/isc-dhcp/pkg/isc_dhcpd.rc b/net/isc-dhcp/pkg/isc_dhcpd.rc index fe8bd978c85..70a082572e5 100644 --- a/net/isc-dhcp/pkg/isc_dhcpd.rc +++ b/net/isc-dhcp/pkg/isc_dhcpd.rc @@ -1,6 +1,4 @@ #!/bin/ksh -# -# $OpenBSD: isc_dhcpd.rc,v 1.3 2018/01/11 19:27:06 rpe Exp $ daemon="${TRUEPREFIX}/sbin/dhcpd" daemon_flags="-user _isc-dhcp -group _isc-dhcp" diff --git a/net/isc-dhcp/pkg/isc_dhcrelay.rc b/net/isc-dhcp/pkg/isc_dhcrelay.rc index 3c5408d7f4c..7ba14a72ef8 100644 --- a/net/isc-dhcp/pkg/isc_dhcrelay.rc +++ b/net/isc-dhcp/pkg/isc_dhcrelay.rc @@ -1,6 +1,4 @@ #!/bin/ksh -# -# $OpenBSD: isc_dhcrelay.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $ daemon="${TRUEPREFIX}/sbin/dhcrelay"