diff options
author | taca <taca@pkgsrc.org> | 2015-09-27 06:58:11 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2015-09-27 06:58:11 +0000 |
commit | 52f70f13e5d2dcfa4911eea811349bde1a31036b (patch) | |
tree | 98952d4c2a29a0519ad026c4ce4ebc1486426902 /net/isc-dhcp4 | |
parent | f08cd5035a54c8c08ffa36e53842d38dedaca578 (diff) | |
download | pkgsrc-52f70f13e5d2dcfa4911eea811349bde1a31036b.tar.gz |
Update ISC DHCP packages to 4.3.3.
Changes are too many to write here, please refer RELNOTES file.
Diffstat (limited to 'net/isc-dhcp4')
-rw-r--r-- | net/isc-dhcp4/Makefile.common | 6 | ||||
-rw-r--r-- | net/isc-dhcp4/distinfo | 20 | ||||
-rw-r--r-- | net/isc-dhcp4/patches/patch-aa | 6 | ||||
-rw-r--r-- | net/isc-dhcp4/patches/patch-ab | 6 | ||||
-rw-r--r-- | net/isc-dhcp4/patches/patch-ac | 14 | ||||
-rw-r--r-- | net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_configure (renamed from net/isc-dhcp4/patches/patch-bind_bind-9.9.7_configure) | 6 | ||||
-rw-r--r-- | net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in (renamed from net/isc-dhcp4/patches/patch-bind_bind-9.9.7_lib_export_dns_Makefile.in) | 6 | ||||
-rw-r--r-- | net/isc-dhcp4/patches/patch-includes_Makefile.in | 6 |
8 files changed, 35 insertions, 35 deletions
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common index fe91fc3325f..f5ea799a020 100644 --- a/net/isc-dhcp4/Makefile.common +++ b/net/isc-dhcp4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2015/03/15 00:47:59 taca Exp $ +# $NetBSD: Makefile.common,v 1.26 2015/09/27 06:58:11 taca Exp $ # # used by net/isc-dhcp4/Makefile # used by net/isc-dhcpd4/Makefile @@ -17,7 +17,7 @@ LICENSE= isc CONFLICTS+= isc-dhcp-base-3.*{,nb*} -VERSION= 4.3.2 +VERSION= 4.3.3 .include "../../mk/bsd.prefs.mk" @@ -85,7 +85,7 @@ BIND_CONFIGURE_ARGS+= --with-export-includedir=${WRKSRC}/bind/include BIND_CONFIGURE_ARGS+= --with-export-libdir=${WRKSRC}/bind/lib BIND_CONFIGURE_ARGS+= --with-gssapi=no -BIND_WRKSRC= ${WRKSRC}/bind/bind-9.9.7 +BIND_WRKSRC= ${WRKSRC}/bind/bind-9.9.7-P3 post-configure: ${RUN}${_ULIMIT_CMD} \ diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo index 99159a254d4..37ea8d8a2c3 100644 --- a/net/isc-dhcp4/distinfo +++ b/net/isc-dhcp4/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.20 2015/03/15 00:47:59 taca Exp $ +$NetBSD: distinfo,v 1.21 2015/09/27 06:58:11 taca Exp $ -SHA1 (dhcp-4.3.2.tar.gz) = c7fcc4fa2bd135700b410f47eca238dd67419654 -RMD160 (dhcp-4.3.2.tar.gz) = 7424b8b2295a63513fb230ad7d4e5baf181f7526 -Size (dhcp-4.3.2.tar.gz) = 9230340 bytes -SHA1 (patch-aa) = 27afe063248db97c3022d726f4e1653e83aeedff -SHA1 (patch-ab) = c87ae71fdd70137a97f918d3240a1025a4dbe0cc -SHA1 (patch-ac) = 440cd2d3db555fb7f4a433f218e2c9aa6bcf390c -SHA1 (patch-bind_bind-9.9.7_configure) = 2e674702082c24b99de7ca3e512816683270b30c -SHA1 (patch-bind_bind-9.9.7_lib_export_dns_Makefile.in) = 7293da1ce120946b25090f3a2aaa31ff97582560 +SHA1 (dhcp-4.3.3.tar.gz) = a21b89a5074dd1262d677e779c6793db570befdf +RMD160 (dhcp-4.3.3.tar.gz) = f3695a28466a236fe125e89fbcb542ef49de3670 +Size (dhcp-4.3.3.tar.gz) = 9205539 bytes +SHA1 (patch-aa) = da090b3b824f5d437f8d05ce00e2ac4dfc65d6af +SHA1 (patch-ab) = 0683dd2259e48184713559aa0356ee352aa52c39 +SHA1 (patch-ac) = cce2b5c32cd2a8bec50690c10edd59133d7ee049 +SHA1 (patch-bind_bind-9.9.7-P3_configure) = 78e631a2e7b3a310ebef09b69af837f3a0d3e4f3 +SHA1 (patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in) = 6a6fce1a6518821bd1033c31e368f02829c4de39 SHA1 (patch-common_dlpi.c) = 76e30ca92a7d3ba10ed73b4f03de0582bccb2acc -SHA1 (patch-includes_Makefile.in) = 8b40bd1bf1e828fb99250450fc1b887580fc9233 +SHA1 (patch-includes_Makefile.in) = f595803acd49223766e0f8d5354eff73a5ed9cb8 diff --git a/net/isc-dhcp4/patches/patch-aa b/net/isc-dhcp4/patches/patch-aa index e6a8bc7a095..0aaf0253c93 100644 --- a/net/isc-dhcp4/patches/patch-aa +++ b/net/isc-dhcp4/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.5 2014/02/09 04:34:31 taca Exp $ +$NetBSD: patch-aa,v 1.6 2015/09/27 06:58:11 taca Exp $ * Don't install config files. ---- server/Makefile.in.orig 2014-01-31 19:20:49.000000000 +0000 +--- server/Makefile.in.orig 2015-08-26 19:13:14.000000000 +0000 +++ server/Makefile.in -@@ -808,19 +808,6 @@ uninstall-man8: +@@ -844,19 +844,6 @@ uninstall-man8: dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-dist_sysconfDATA: $(dist_sysconf_DATA) @$(NORMAL_INSTALL) diff --git a/net/isc-dhcp4/patches/patch-ab b/net/isc-dhcp4/patches/patch-ab index b5607893093..5ee764f952a 100644 --- a/net/isc-dhcp4/patches/patch-ab +++ b/net/isc-dhcp4/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.5 2014/02/09 04:34:31 taca Exp $ +$NetBSD: patch-ab,v 1.6 2015/09/27 06:58:11 taca Exp $ * Don't install config files. ---- client/Makefile.in.orig 2014-01-31 19:20:49.000000000 +0000 +--- client/Makefile.in.orig 2015-08-26 19:13:14.000000000 +0000 +++ client/Makefile.in -@@ -492,19 +492,6 @@ uninstall-man8: +@@ -543,19 +543,6 @@ uninstall-man8: dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-dist_sysconfDATA: $(dist_sysconf_DATA) @$(NORMAL_INSTALL) diff --git a/net/isc-dhcp4/patches/patch-ac b/net/isc-dhcp4/patches/patch-ac index da648eed144..71602e91f9d 100644 --- a/net/isc-dhcp4/patches/patch-ac +++ b/net/isc-dhcp4/patches/patch-ac @@ -1,29 +1,29 @@ -$NetBSD: patch-ac,v 1.3 2014/02/09 04:34:31 taca Exp $ +$NetBSD: patch-ac,v 1.4 2015/09/27 06:58:11 taca Exp $ * Honor PKG_SYSCONFDIR and PREFIX. ---- includes/dhcpd.h.orig 2014-01-31 19:20:49.000000000 +0000 +--- includes/dhcpd.h.orig 2015-08-26 19:13:14.000000000 +0000 +++ includes/dhcpd.h -@@ -1419,7 +1419,7 @@ typedef unsigned char option_mask [16]; +@@ -1500,7 +1500,7 @@ typedef unsigned char option_mask [16]; #else /* !DEBUG */ #ifndef _PATH_DHCPD_CONF -#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" -+#define _PATH_DHCPD_CONF "@@PKG_SYSCONFDIR@@/dhcpd.conf" ++#define _PATH_DHCPD_CONF "/usr/pkg/etc/dhcp/dhcpd.conf" #endif /* DEBUG */ #ifndef _PATH_DHCPD_DB -@@ -1441,11 +1441,11 @@ typedef unsigned char option_mask [16]; +@@ -1522,11 +1522,11 @@ typedef unsigned char option_mask [16]; #endif /* DEBUG */ #ifndef _PATH_DHCLIENT_CONF -#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" -+#define _PATH_DHCLIENT_CONF "@@PKG_SYSCONFDIR@@/dhclient.conf" ++#define _PATH_DHCLIENT_CONF "/usr/pkg/etc/dhcp/dhclient.conf" #endif #ifndef _PATH_DHCLIENT_SCRIPT -#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" -+#define _PATH_DHCLIENT_SCRIPT "@@PREFIX@@/sbin/dhclient-script" ++#define _PATH_DHCLIENT_SCRIPT "/usr/pkg/sbin/dhclient-script" #endif #ifndef _PATH_DHCLIENT_PID diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.9.7_configure b/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_configure index a9b9a94da2c..91c247937cd 100644 --- a/net/isc-dhcp4/patches/patch-bind_bind-9.9.7_configure +++ b/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_configure @@ -1,9 +1,9 @@ -$NetBSD: patch-bind_bind-9.9.7_configure,v 1.1 2015/03/15 00:47:59 taca Exp $ +$NetBSD: patch-bind_bind-9.9.7-P3_configure,v 1.1 2015/09/27 06:58:11 taca Exp $ * Avoid using "==" for argument of test(1). ---- bind/bind-9.9.7/configure.orig 2015-02-18 01:56:06.000000000 +0000 -+++ bind/bind-9.9.7/configure +--- bind/bind-9.9.7-P3/configure.orig 2015-08-15 00:29:09.000000000 +0000 ++++ bind/bind-9.9.7-P3/configure @@ -11691,7 +11691,7 @@ fi test -n "$PYTHON" && break done diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.9.7_lib_export_dns_Makefile.in b/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in index 2befabda57a..60441f900cf 100644 --- a/net/isc-dhcp4/patches/patch-bind_bind-9.9.7_lib_export_dns_Makefile.in +++ b/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-bind_bind-9.9.7_lib_export_dns_Makefile.in,v 1.1 2015/03/15 00:47:59 taca Exp $ +$NetBSD: patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in,v 1.1 2015/09/27 06:58:11 taca Exp $ Build gen with BUILD_CC and the associated BUILD_* flags so it can run on the build platform when cross-compiling. ---- bind/bind-9.9.7/lib/export/dns/Makefile.in.orig 2015-02-18 01:56:06.000000000 +0000 -+++ bind/bind-9.9.7/lib/export/dns/Makefile.in +--- bind/bind-9.9.7-P3/lib/export/dns/Makefile.in.orig 2015-08-15 00:29:09.000000000 +0000 ++++ bind/bind-9.9.7-P3/lib/export/dns/Makefile.in @@ -168,7 +168,8 @@ code.h: gen ./gen -s ${srcdir} > code.h diff --git a/net/isc-dhcp4/patches/patch-includes_Makefile.in b/net/isc-dhcp4/patches/patch-includes_Makefile.in index 7b611b18a51..a883ce7e8e9 100644 --- a/net/isc-dhcp4/patches/patch-includes_Makefile.in +++ b/net/isc-dhcp4/patches/patch-includes_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-includes_Makefile.in,v 1.3 2014/02/09 04:34:31 taca Exp $ +$NetBSD: patch-includes_Makefile.in,v 1.4 2015/09/27 06:58:11 taca Exp $ Don't need isc-dhcp/dst.h. ---- includes/Makefile.in.orig 2014-01-31 19:19:59.000000000 +0000 +--- includes/Makefile.in.orig 2015-08-26 19:13:14.000000000 +0000 +++ includes/Makefile.in -@@ -262,8 +262,7 @@ top_builddir = @top_builddir@ +@@ -265,8 +265,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \ omapip/hash.h omapip/isclib.h omapip/omapip.h \ |