pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2009Q3]: pkgsrc/net/bind95 Pullup ticket 2938 - requested by tron
details: https://anonhg.NetBSD.org/pkgsrc/rev/8def71c4a598
branches: pkgsrc-2009Q3
changeset: 399986:8def71c4a598
user: spz <spz%pkgsrc.org@localhost>
date: Tue Dec 01 06:39:03 2009 +0000
description:
Pullup ticket 2938 - requested by tron
security update
Revisions pulled up:
- pkgsrc/net/bind95/Makefile 1.13
- pkgsrc/net/bind95/PLIST 1.4
- pkgsrc/net/bind95/distinfo 1.11
- pkgsrc/net/bind95/patches/patch-ac 1.3
- pkgsrc/net/bind95/patches/patch-ad 1.3
- pkgsrc/net/bind95/patches/patch-ai 1.3
-------------------------------------------------------------------------
Module Name: pkgsrc
Committed By: joerg
Date: Wed Nov 25 23:25:44 UTC 2009
Modified Files:
pkgsrc/net/bind95: Makefile distinfo
pkgsrc/net/bind95/patches: patch-ad patch-ai
Log Message:
Not MAKE_JOBS_SAFE. Prepare for libtool-2.2.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/bind95/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/bind95/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/bind95/patches/patch-ad \
pkgsrc/net/bind95/patches/patch-ai
-------------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tron
Date: Mon Nov 30 11:58:30 UTC 2009
Modified Files:
pkgsrc/net/bind95: Makefile PLIST distinfo
pkgsrc/net/bind95/patches: patch-ac patch-ad patch-ai
Log Message:
Update "bind95" package to version 9.5.2pl1. Changes since 9.5.1pl3:
- Security fix for CVE-2009-4022 (incorrect DNSSEC validation)
- Bug fixes
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/bind95/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/bind95/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/bind95/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bind95/patches/patch-ac \
pkgsrc/net/bind95/patches/patch-ad pkgsrc/net/bind95/patches/patch-ai
diffstat:
net/bind95/Makefile | 5 ++-
net/bind95/PLIST | 3 +-
net/bind95/distinfo | 14 ++++++------
net/bind95/patches/patch-ac | 30 +++-----------------------
net/bind95/patches/patch-ad | 24 ++++++++++++++++-----
net/bind95/patches/patch-ai | 50 +++++++++++++++++++++++++++-----------------
6 files changed, 65 insertions(+), 61 deletions(-)
diffs (267 lines):
diff -r 1707d54c5487 -r 8def71c4a598 net/bind95/Makefile
--- a/net/bind95/Makefile Mon Nov 30 23:11:45 2009 +0000
+++ b/net/bind95/Makefile Tue Dec 01 06:39:03 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/07/29 00:24:03 reed Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2009/12/01 06:39:03 spz Exp $
DISTNAME= bind-${BIND_VERSION}
PKGNAME= ${DISTNAME:S/-P/pl/}
@@ -14,8 +14,9 @@
CONFLICTS+= bind>=9.6.0
PKG_DESTDIR_SUPPORT= user-destdir
+MAKE_JOBS_SAFE= no
-BIND_VERSION= 9.5.1-P3
+BIND_VERSION= 9.5.2-P1
# IPv6 ready, automatically detected
.include "../../mk/bsd.prefs.mk"
diff -r 1707d54c5487 -r 8def71c4a598 net/bind95/PLIST
--- a/net/bind95/PLIST Mon Nov 30 23:11:45 2009 +0000
+++ b/net/bind95/PLIST Tue Dec 01 06:39:03 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:09:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2009/12/01 06:39:03 spz Exp $
bin/dig
bin/host
bin/isc-config.sh
@@ -198,6 +198,7 @@
lib/liblwres.la
man/man1/dig.1
man/man1/host.1
+man/man1/isc-config.sh.1
man/man1/nslookup.1
man/man1/nsupdate.1
man/man3/lwres.3
diff -r 1707d54c5487 -r 8def71c4a598 net/bind95/distinfo
--- a/net/bind95/distinfo Mon Nov 30 23:11:45 2009 +0000
+++ b/net/bind95/distinfo Tue Dec 01 06:39:03 2009 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.9 2009/07/29 00:24:03 reed Exp $
+$NetBSD: distinfo,v 1.9.2.1 2009/12/01 06:39:03 spz Exp $
-SHA1 (bind-9.5.1-P3.tar.gz) = fa17c60a1e0e95c67b2680f091e46c5677dcb805
-RMD160 (bind-9.5.1-P3.tar.gz) = 6a929a8860b4e0f4394783023eef8b488ad58af8
-Size (bind-9.5.1-P3.tar.gz) = 6690806 bytes
+SHA1 (bind-9.5.2-P1.tar.gz) = 532d448554601cec13a645df812638d46fd41743
+RMD160 (bind-9.5.2-P1.tar.gz) = 2e2872a06fc1d97e4bcecaea3fb4f009f83cdb2b
+Size (bind-9.5.2-P1.tar.gz) = 6799718 bytes
SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5
-SHA1 (patch-ac) = 71a379fcb128013bfbacd87002c27dd90c1844b1
-SHA1 (patch-ad) = 9a46d8de9d84e708ac64df8e4da504176dba05d4
+SHA1 (patch-ac) = a2c24198044f8cf29198e08a1a10b7e4ea739c40
+SHA1 (patch-ad) = 5c8af5a826e4f6891dfdf949b8a541ee33e16c3e
SHA1 (patch-af) = b21bb5195cdb4deec00e5abd39f5bf2137549c3f
SHA1 (patch-ag) = 9d61e0f527a76977bf8457355997d201fa37dd4e
-SHA1 (patch-ai) = 88e6d90b67fccaab26c3a3a1b5539c374d51e417
+SHA1 (patch-ai) = 15fb7b46d0c997a6abd60307f111848657a57412
SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
diff -r 1707d54c5487 -r 8def71c4a598 net/bind95/patches/patch-ac
--- a/net/bind95/patches/patch-ac Mon Nov 30 23:11:45 2009 +0000
+++ b/net/bind95/patches/patch-ac Tue Dec 01 06:39:03 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2009/02/21 14:43:03 adrianp Exp $
+$NetBSD: patch-ac,v 1.2.6.1 2009/12/01 06:39:03 spz Exp $
---- lib/lwres/getaddrinfo.c.orig 2007-09-12 21:45:18.000000000 -0700
-+++ lib/lwres/getaddrinfo.c
+--- lib/lwres/getaddrinfo.c.orig 2008-11-25 23:46:36.000000000 +0000
++++ lib/lwres/getaddrinfo.c 2009-11-30 10:48:37.000000000 +0000
@@ -142,6 +142,10 @@
#include <lwres/netdb.h>
#include <lwres/stdlib.h>
@@ -13,7 +13,7 @@
#define SA(addr) ((struct sockaddr *)(addr))
#define SIN(addr) ((struct sockaddr_in *)(addr))
#define SIN6(addr) ((struct sockaddr_in6 *)(addr))
-@@ -366,14 +370,22 @@ lwres_getaddrinfo(const char *hostname,
+@@ -366,14 +370,22 @@
p = strchr(ntmp, '%');
ep = NULL;
@@ -37,25 +37,3 @@
if (p != NULL && ep != NULL && ep[0] == '\0')
*p = '\0';
else {
-@@ -709,17 +721,17 @@ lwres_freeaddrinfo(struct addrinfo *ai)
- static int
- get_local(const char *name, int socktype, struct addrinfo **res) {
- struct addrinfo *ai;
-- struct sockaddr_un *sun;
-+ struct sockaddr_un *un;
-
- if (socktype == 0)
- return (EAI_SOCKTYPE);
-
-- ai = ai_alloc(AF_LOCAL, sizeof(*sun));
-+ ai = ai_alloc(AF_LOCAL, sizeof(*un));
- if (ai == NULL)
- return (EAI_MEMORY);
-
-- sun = SUN(ai->ai_addr);
-- strncpy(sun->sun_path, name, sizeof(sun->sun_path));
-+ un = SUN(ai->ai_addr);
-+ strncpy(un->sun_path, name, sizeof(un->sun_path));
-
- ai->ai_socktype = socktype;
- /*
diff -r 1707d54c5487 -r 8def71c4a598 net/bind95/patches/patch-ad
--- a/net/bind95/patches/patch-ad Mon Nov 30 23:11:45 2009 +0000
+++ b/net/bind95/patches/patch-ad Tue Dec 01 06:39:03 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-ad,v 1.1.1.1.16.1 2009/12/01 06:39:03 spz Exp $
---- configure.orig 2008-05-06 02:33:33.000000000 +0100
-+++ configure
-@@ -6550,6 +6550,8 @@ case $host in
+--- configure.orig 2009-08-13 03:02:45.000000000 +0100
++++ configure 2009-11-30 11:10:18.000000000 +0000
+@@ -23072,6 +23072,8 @@
use_threads=false ;;
*-freebsd*)
use_threads=false ;;
@@ -11,7 +11,7 @@
*-bsdi234*)
# Thread signals do not work reliably on some versions of BSD/OS.
use_threads=false ;;
-@@ -6638,7 +6640,7 @@ echo "$as_me: WARNING: linking with PTL2
+@@ -23160,7 +23162,7 @@
echo "${ECHO_T}native" >&6; }
LIBS="-lpthread $LIBS"
else
@@ -20,7 +20,7 @@
then
{ echo "$as_me:$LINENO: result: none" >&5
echo "${ECHO_T}none" >&6; }
-@@ -6649,14 +6651,23 @@ echo "$as_me: error: \"could not find th
+@@ -23171,14 +23173,23 @@
if $use_threads
then
@@ -51,3 +51,15 @@
fi
fi
fi
+@@ -25596,9 +25607,9 @@
+ O=lo
+ A=la
+ LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
+- LIBTOOL_MODE_COMPILE='--mode=compile'
++ LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
+ LIBTOOL_MODE_INSTALL='--mode=install'
+- LIBTOOL_MODE_LINK='--mode=link'
++ LIBTOOL_MODE_LINK='--mode=link --tag=CC'
+ case "$host" in
+ *) LIBTOOL_ALLOW_UNDEFINED= ;;
+ esac
diff -r 1707d54c5487 -r 8def71c4a598 net/bind95/patches/patch-ai
--- a/net/bind95/patches/patch-ai Mon Nov 30 23:11:45 2009 +0000
+++ b/net/bind95/patches/patch-ai Tue Dec 01 06:39:03 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-ai,v 1.1.1.1.16.1 2009/12/01 06:39:03 spz Exp $
---- lib/bind/configure.orig 2008-04-29 00:51:46.000000000 +0100
-+++ lib/bind/configure
-@@ -2600,12 +2600,7 @@ done
+--- lib/bind/configure.orig 2009-01-19 01:59:36.000000000 +0000
++++ lib/bind/configure 2009-11-30 11:18:36.000000000 +0000
+@@ -19651,12 +19651,7 @@
#
case "$includedir" in
'${prefix}/include')
@@ -16,7 +16,7 @@
;;
esac
-@@ -5379,6 +5374,8 @@ case $host in
+@@ -22037,6 +22032,8 @@
use_threads=false ;;
*-freebsd*)
use_threads=false ;;
@@ -25,30 +25,30 @@
*-bsdi234*)
# Thread signals do not work reliably on some versions of BSD/OS.
use_threads=false ;;
-@@ -5467,7 +5464,7 @@ echo "$as_me: WARNING: linking with PTL2
- echo "${ECHO_T}native" >&6; }
+@@ -22125,7 +22122,7 @@
+ $as_echo "native" >&6; }
LIBS="-lpthread $LIBS"
else
- if test ! -d $LOCALBASE/pthreads
-+ if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h
++ if test ! -d $LOCALBASE/pthreads-a ! -f /usr/include/pthread.h
then
- { echo "$as_me:$LINENO: result: none" >&5
- echo "${ECHO_T}none" >&6; }
-@@ -5478,14 +5475,23 @@ echo "$as_me: error: \"could not find th
+ { $as_echo "$as_me:$LINENO: result: none" >&5
+ $as_echo "none" >&6; }
+@@ -22136,14 +22133,23 @@
if $use_threads
then
-- { echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
+- { $as_echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
+ if test -f /usr/include/pthread.h
+ then
-+ { echo "$as_me:$LINENO: result: native pthreads" >&5
-+echo "${ECHO_T}native pthreads" >&6; }
++ { $as_echo "$as_me:$LINENO: result: native pthreads" >&5
++$as_echo "native pthreads" >&6; }
+ LIBS="-lpthread $LIBS"
+ CPPFLAGS="$CPPFLAGS -I/usr/include"
+ STD_CINDLUES="$STD_CINDLUES -I/usr/include"
+ else
-+ { echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
- echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6; }
++ { $as_echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
+ $as_echo "mit-pthreads/unproven-pthreads" >&6; }
- pkg="$LOCALBASE/pthreads"
- lib1="-L$pkg/lib -Wl,-R$pkg/lib"
- lib2="-lpthread -lm -lgcc -lpthread"
@@ -65,7 +65,7 @@
fi
fi
fi
-@@ -6220,6 +6226,10 @@ then
+@@ -22918,6 +22924,10 @@
CCOPT="$CCOPT -pthread"
STD_CDEFINES="$STD_CDEFINES -D_THREAD_SAFE"
;;
@@ -76,7 +76,19 @@
*-openbsd*)
CC="$CC -pthread"
CCOPT="$CCOPT -pthread"
-@@ -24730,6 +24740,7 @@ case "$host" in
+@@ -25391,9 +25401,9 @@
+ O=lo
+ A=la
+ LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
+- LIBTOOL_MODE_COMPILE='--mode=compile'
++ LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
+ LIBTOOL_MODE_INSTALL='--mode=install'
+- LIBTOOL_MODE_LINK='--mode=link'
++ LIBTOOL_MODE_LINK='--mode=link --tag=CC'
+ ;;
+ *)
+ O=o
+@@ -26169,6 +26179,7 @@
*-bsdi2345*) have_minimum_ifreq=yes;;
*-darwin*) have_minimum_ifreq=yes;;
*-freebsd*) have_minimum_ifreq=yes;;
@@ -84,7 +96,7 @@
*-lynxos*) have_minimum_ifreq=yes;;
*-netbsd*) have_minimum_ifreq=yes;;
*-next*) have_minimum_ifreq=yes;;
-@@ -24769,6 +24780,7 @@ case "$host" in
+@@ -26208,6 +26219,7 @@
*-darwin*) PORT_DIR="port/darwin";;
*-osf*) PORT_DIR="port/decunix";;
*-freebsd*) PORT_DIR="port/freebsd";;
Home |
Main Index |
Thread Index |
Old Index