diff options
| -rw-r--r-- | net/isc-dhcp4/Makefile.common | 6 | ||||
| -rw-r--r-- | net/isc-dhcp4/distinfo | 12 | ||||
| -rw-r--r-- | net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_configure | 15 | ||||
| -rw-r--r-- | net/isc-dhcp4/patches/patch-bind_bind-9.9.7_configure | 24 | ||||
| -rw-r--r-- | net/isc-dhcp4/patches/patch-bind_bind-9.9.7_lib_export_dns_Makefile.in (renamed from net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in) | 6 |
5 files changed, 36 insertions, 27 deletions
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common index 2023143f8a2..fe91fc3325f 100644 --- a/net/isc-dhcp4/Makefile.common +++ b/net/isc-dhcp4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2015/02/14 04:44:43 riastradh Exp $ +# $NetBSD: Makefile.common,v 1.25 2015/03/15 00:47:59 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.1 +VERSION= 4.3.2 .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.5-P1 +BIND_WRKSRC= ${WRKSRC}/bind/bind-9.9.7 post-configure: ${RUN}${_ULIMIT_CMD} \ diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo index 087a924a56a..99159a254d4 100644 --- a/net/isc-dhcp4/distinfo +++ b/net/isc-dhcp4/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.19 2014/10/14 13:53:00 taca Exp $ +$NetBSD: distinfo,v 1.20 2015/03/15 00:47:59 taca Exp $ -SHA1 (dhcp-4.3.1.tar.gz) = 4d2b79b3b9f9e7c2791951db86ec32c291e62875 -RMD160 (dhcp-4.3.1.tar.gz) = c31e25b37b6885895e1ba82fdf16a6f1593eeaba -Size (dhcp-4.3.1.tar.gz) = 8980806 bytes +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.5-P1_configure) = bea739b7d38a4235b05a4609e9a4d18c47a38154 -SHA1 (patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in) = e77ae72f5fee2643146f27cd6c7db9d7b89898a4 +SHA1 (patch-bind_bind-9.9.7_configure) = 2e674702082c24b99de7ca3e512816683270b30c +SHA1 (patch-bind_bind-9.9.7_lib_export_dns_Makefile.in) = 7293da1ce120946b25090f3a2aaa31ff97582560 SHA1 (patch-common_dlpi.c) = 76e30ca92a7d3ba10ed73b4f03de0582bccb2acc SHA1 (patch-includes_Makefile.in) = 8b40bd1bf1e828fb99250450fc1b887580fc9233 diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_configure b/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_configure deleted file mode 100644 index 55ff46fa76b..00000000000 --- a/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_configure +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bind_bind-9.9.5-P1_configure,v 1.1 2014/10/14 13:53:01 taca Exp $ - -* Avoid using "==" for argument of test(1). - ---- bind/bind-9.9.5-P1/configure.orig 2014-05-23 13:42:39.000000000 +0000 -+++ bind/bind-9.9.5-P1/configure -@@ -11685,7 +11685,7 @@ done - - ;; - esac -- if test "X$PYTHON" == "X" -+ if test "X$PYTHON" = "X" - then - case "$use_python" in - unspec) 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_configure new file mode 100644 index 00000000000..a9b9a94da2c --- /dev/null +++ b/net/isc-dhcp4/patches/patch-bind_bind-9.9.7_configure @@ -0,0 +1,24 @@ +$NetBSD: patch-bind_bind-9.9.7_configure,v 1.1 2015/03/15 00:47:59 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 +@@ -11691,7 +11691,7 @@ fi + test -n "$PYTHON" && break + done + +- if test "X$PYTHON" == "X"; then ++ if test "X$PYTHON" = "X"; then + continue; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking python module 'argparse'" >&5 +@@ -11706,7 +11706,7 @@ $as_echo "not found" >&6; } + unset ac_cv_path_PYTHON + unset PYTHON + done +- if test "X$PYTHON" == "X" ++ if test "X$PYTHON" = "X" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python support" >&5 + $as_echo_n "checking for python support... " >&6; } diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in b/net/isc-dhcp4/patches/patch-bind_bind-9.9.7_lib_export_dns_Makefile.in index f28ef743552..2befabda57a 100644 --- a/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in +++ b/net/isc-dhcp4/patches/patch-bind_bind-9.9.7_lib_export_dns_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in,v 1.1 2014/10/14 13:53:01 taca Exp $ +$NetBSD: patch-bind_bind-9.9.7_lib_export_dns_Makefile.in,v 1.1 2015/03/15 00:47:59 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.5-P1/lib/export/dns/Makefile.in.orig 2014-05-23 13:42:39.000000000 +0000 -+++ bind/bind-9.9.5-P1/lib/export/dns/Makefile.in +--- 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 @@ -168,7 +168,8 @@ code.h: gen ./gen -s ${srcdir} > code.h |