From 803c0cd8ec01455002ac508590b9f508ca4494ce Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 30 Mar 2013 17:52:50 +0000 Subject: Pullup ticket #4103 - requested by taca net/bind99: security update Revisions pulled up: - net/bind99/Makefile 1.21-1.23 - net/bind99/distinfo 1.12-1.14 - net/bind99/options.mk 1.5-1.6 - net/bind99/patches/patch-configure 1.4 --- Module Name: pkgsrc Committed By: jperkin Date: Wed Feb 6 23:24:19 UTC 2013 Modified Files: pkgsrc/net/bind99: Makefile Log Message: PKGREVISION bumps for the security/openssl 1.0.1d update. --- Module Name: pkgsrc Committed By: wiz Date: Sat Mar 2 20:33:35 UTC 2013 Modified Files: pkgsrc/net/bind96: Makefile Log Message: Bump PKGREVISION for mysql default change to 55. --- Module Name: pkgsrc Committed By: pettai Date: Sat Feb 9 00:14:34 UTC 2013 Modified Files: pkgsrc/net/bind99: distinfo options.mk Log Message: Updated rrl patch version + source --- Module Name: pkgsrc Committed By: taca Date: Tue Mar 26 22:12:14 UTC 2013 Modified Files: pkgsrc/net/bind99: Makefile distinfo pkgsrc/net/bind99/patches: patch-configure Log Message: Update bind99 to 9.9.2pl2 (BIND 9.9.2-P2). --- 9.9.2-P2 released --- 3516. [security] Removed the check for regex.h in configure in order to disable regex syntax checking, as it exposes BIND to a critical flaw in libregex on some platforms. [RT #32688] --- Module Name: pkgsrc Committed By: pettai Date: Wed Mar 27 12:08:24 UTC 2013 Modified Files: pkgsrc/net/bind99: distinfo options.mk Log Message: Also update the corresponding RRL patch + distinfo file --- net/bind99/Makefile | 5 ++--- net/bind99/distinfo | 16 ++++++++-------- net/bind99/options.mk | 6 +++--- net/bind99/patches/patch-configure | 16 ++++++++-------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/net/bind99/Makefile b/net/bind99/Makefile index 6eb7d4972a2..5ec6fff24b4 100644 --- a/net/bind99/Makefile +++ b/net/bind99/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2012/12/16 01:52:27 obache Exp $ +# $NetBSD: Makefile,v 1.20.2.1 2013/03/30 17:52:50 tron Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P/pl/} -PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \ http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/ @@ -15,7 +14,7 @@ CONFLICTS+= host-[0-9]* MAKE_JOBS_SAFE= no -BIND_VERSION= 9.9.2-P1 +BIND_VERSION= 9.9.2-P2 .include "../../mk/bsd.prefs.mk" diff --git a/net/bind99/distinfo b/net/bind99/distinfo index 58dbdfedf6b..19a37cd6152 100644 --- a/net/bind99/distinfo +++ b/net/bind99/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.11 2012/12/05 00:55:54 taca Exp $ +$NetBSD: distinfo,v 1.11.2.1 2013/03/30 17:52:50 tron Exp $ -SHA1 (bind-9.9.2-P1.tar.gz) = 9d56db2a86dde8167f7adfb200beee0f51d771a5 -RMD160 (bind-9.9.2-P1.tar.gz) = 0693b2dd3678ea918d30107dc78514b60bcf923d -Size (bind-9.9.2-P1.tar.gz) = 7277498 bytes -SHA1 (rl-9.9.2.patch) = 18250e466e03a36a0b81dbceb41570aa2d548118 -RMD160 (rl-9.9.2.patch) = ea855f46db89b0791a8cf610474106775104568b -Size (rl-9.9.2.patch) = 91993 bytes +SHA1 (bind-9.9.2-P2.tar.gz) = 3aadeaf64164a31a1cf22737ff2eea706792b68d +RMD160 (bind-9.9.2-P2.tar.gz) = 3fd39bc8a572ac2c888ce6fc71454a8034cd9b68 +Size (bind-9.9.2-P2.tar.gz) = 7277958 bytes +SHA1 (rl-9.9.2-P2.patch) = f1a9514ed3777f2c7eed3f705f62b77a5167858e +RMD160 (rl-9.9.2-P2.patch) = ccbc7dd5ed7270bf24a2c60082d582c4133627f3 +Size (rl-9.9.2-P2.patch) = 100619 bytes SHA1 (patch-bin_dig_Makefile.in) = d2c2a0b137be7e31fdc15438d107116fc38a38b9 SHA1 (patch-bin_dig_dighost.c) = 186cdc70605242afb0211dc8802ec75677a65614 SHA1 (patch-bin_nsupdate_Makefile.in) = 42b39d60468ffa8ed13f77259755b217966de664 SHA1 (patch-bin_tests_system_Makefile.in) = 1f268808c55223ac11d1794039503424a51ee71b SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2 -SHA1 (patch-configure) = a9f5f75fafc9f0b756adcbbf6bee257fd5d4567e +SHA1 (patch-configure) = 96135505a9c554c95dade6872b42f360ad5bfeec SHA1 (patch-configure.in) = f07381d79ef45a7356d0657c220fcec3ffc6741d SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f SHA1 (patch-lib_bind9_Makefile.in) = 89e21d21fa512f11a2fdb8d7455abd5d95f20ba5 diff --git a/net/bind99/options.mk b/net/bind99/options.mk index 96f740b60dd..a506c85c7c1 100644 --- a/net/bind99/options.mk +++ b/net/bind99/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2012/11/10 23:45:39 pettai Exp $ +# $NetBSD: options.mk,v 1.4.2.1 2013/03/30 17:52:50 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bind99 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server @@ -55,8 +55,8 @@ CONFIGURE_ARGS+= --with-dlz-filesystem .endif .if !empty(PKG_OPTIONS:Mrrl) -PATCHFILES=rl-9.9.2.patch -PATCH_SITES=http://ss.vix.com/~vixie/ +PATCHFILES=rl-9.9.2-P2.patch +PATCH_SITES=http://ss.vix.su/~vjs/ .endif ### diff --git a/net/bind99/patches/patch-configure b/net/bind99/patches/patch-configure index 7bf7ee04bd0..1ce38d1d8fc 100644 --- a/net/bind99/patches/patch-configure +++ b/net/bind99/patches/patch-configure @@ -1,13 +1,13 @@ -$NetBSD: patch-configure,v 1.3 2012/10/10 03:07:12 taca Exp $ +$NetBSD: patch-configure,v 1.3.2.1 2013/03/30 17:52:50 tron Exp $ * Add DragonFly support. * Link proper postgresql library. * Use separate @LIBREADLINE@ AC_SUBST. * Avoid using "==" for argument of test(1). ---- configure.orig 2012-09-27 00:35:19.000000000 +0000 +--- configure.orig 2013-03-06 16:56:08.000000000 +0000 +++ configure -@@ -1341,6 +1341,7 @@ LWRES_PLATFORM_NEEDVSNPRINTF +@@ -1369,6 +1369,7 @@ LWRES_PLATFORM_NEEDVSNPRINTF ISC_PLATFORM_NEEDVSNPRINTF LWRES_PLATFORM_NEEDSPRINTF ISC_PLATFORM_NEEDSPRINTF @@ -15,7 +15,7 @@ $NetBSD: patch-configure,v 1.3 2012/10/10 03:07:12 taca Exp $ ISC_PLATFORM_NEEDSTRLCAT ISC_PLATFORM_NEEDSTRLCPY GENRANDOMLIB -@@ -19754,7 +19755,7 @@ done +@@ -19784,7 +19785,7 @@ done ;; esac @@ -24,7 +24,7 @@ $NetBSD: patch-configure,v 1.3 2012/10/10 03:07:12 taca Exp $ then case "$use_python" in unspec) -@@ -22390,6 +22391,8 @@ case $host in +@@ -22420,6 +22421,8 @@ case $host in use_threads=false ;; *-freebsd*) use_threads=true ;; @@ -33,7 +33,7 @@ $NetBSD: patch-configure,v 1.3 2012/10/10 03:07:12 taca Exp $ *-bsdi[234]*) # Thread signals do not work reliably on some versions of BSD/OS. use_threads=false ;; -@@ -25024,23 +25027,47 @@ no) ;; +@@ -25054,23 +25057,47 @@ no) ;; then readline=-lreadline fi @@ -42,7 +42,7 @@ $NetBSD: patch-configure,v 1.3 2012/10/10 03:07:12 taca Exp $ - for ac_func in readline -do : - ac_fn_c_check_func "$LINENO" "readline" "ac_cv_func_readline" --if test "x$ac_cv_func_readline" = x""yes; then : +-if test "x$ac_cv_func_readline" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_READLINE 1 -_ACEOF @@ -96,7 +96,7 @@ $NetBSD: patch-configure,v 1.3 2012/10/10 03:07:12 taca Exp $ ;; esac -@@ -27372,7 +27399,7 @@ $as_echo "no" >&6; } +@@ -27402,7 +27429,7 @@ $as_echo "no" >&6; } fi if test -n "-L$use_dlz_postgres_lib -lpq" then -- cgit v1.2.3