- build with -D_GNU_SOURCE (#431734)

- improved fix for #253537, posttrans script is now used
- improved fix for #400461
- 9.5.0b2
- bind-9.3.2b1-PIE.patch replaced by bind-9.5-PIE.patch
- only named, named-sdb and lwresd are PIE
- bind-9.5-sdb.patch has been updated
- bind-9.5-libidn.patch has been updated
- bind-9.4.0-sdb-sqlite-bld.patch replaced by bind-9.5-sdb-sqlite-bld.patch
- removed bind-9.5-gssapi-header.patch (upstream)
- removed bind-9.5-CVE-2008-0122.patch (upstream)
- removed bind-9.2.2-nsl.patch

1 files changed, 35 insertions, 37 deletions

diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch
index 0f30f1d..6549ff8 100644
--- a/bind-9.5-sdb.patch
+++ b/bind-9.5-sdb.patch
@@ -1,7 +1,7 @@
-diff -up bind-9.5.0a6/configure.in.sdb bind-9.5.0a6/configure.in
---- bind-9.5.0a6/configure.in.sdb	2007-06-19 01:47:16.000000000 +0200
-+++ bind-9.5.0a6/configure.in	2007-11-15 10:10:06.000000000 +0100
-@@ -2735,6 +2735,7 @@ AC_CONFIG_FILES([
+diff -up bind-9.5.0b2/configure.in.sdb bind-9.5.0b2/configure.in
+--- bind-9.5.0b2/configure.in.sdb	2008-01-24 03:29:56.000000000 +0100
++++ bind-9.5.0b2/configure.in	2008-02-11 17:32:43.000000000 +0100
+@@ -2782,6 +2782,7 @@ AC_CONFIG_FILES([
  	bin/tests/system/tkey/Makefile
  	bin/tests/headerdep_test.sh
  	bin/dnssec/Makefile
@@ -9,9 +9,9 @@ diff -up bind-9.5.0a6/configure.in.sdb bind-9.5.0a6/configure.in
  	doc/Makefile
  	doc/arm/Makefile
  	doc/misc/Makefile
-diff -up bind-9.5.0a6/bin/Makefile.in.sdb bind-9.5.0a6/bin/Makefile.in
---- bind-9.5.0a6/bin/Makefile.in.sdb	2007-06-20 01:46:59.000000000 +0200
-+++ bind-9.5.0a6/bin/Makefile.in	2007-11-15 10:10:06.000000000 +0100
+diff -up bind-9.5.0b2/bin/Makefile.in.sdb bind-9.5.0b2/bin/Makefile.in
+--- bind-9.5.0b2/bin/Makefile.in.sdb	2007-06-20 01:46:59.000000000 +0200
++++ bind-9.5.0b2/bin/Makefile.in	2008-02-11 17:32:43.000000000 +0100
 @@ -19,7 +19,7 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
@@ -21,16 +21,16 @@ diff -up bind-9.5.0a6/bin/Makefile.in.sdb bind-9.5.0a6/bin/Makefile.in
  TARGETS =
  
  @BIND9_MAKE_RULES@
-diff -up bind-9.5.0a6/bin/named/Makefile.in.sdb bind-9.5.0a6/bin/named/Makefile.in
---- bind-9.5.0a6/bin/named/Makefile.in.sdb	2007-11-15 10:10:06.000000000 +0100
-+++ bind-9.5.0a6/bin/named/Makefile.in	2007-11-15 10:11:56.000000000 +0100
+diff -up bind-9.5.0b2/bin/named/Makefile.in.sdb bind-9.5.0b2/bin/named/Makefile.in
+--- bind-9.5.0b2/bin/named/Makefile.in.sdb	2008-02-11 17:32:43.000000000 +0100
++++ bind-9.5.0b2/bin/named/Makefile.in	2008-02-11 17:43:50.000000000 +0100
 @@ -26,10 +26,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
  #
 -DBDRIVER_OBJS =
 -DBDRIVER_SRCS =
-+DBDRIVER_OBJS =      ldapdb.o     pgsqldb.o    dirdb.o
++DBDRIVER_OBJS =      ldapdb.@O@   pgsqldb.@O@  dirdb.@O@
 +DBDRIVER_SRCS =      ldapdb.c     pgsqldb.c    dirdb.c
  DBDRIVER_INCLUDES =
 -DBDRIVER_LIBS =
@@ -47,7 +47,7 @@ diff -up bind-9.5.0a6/bin/named/Makefile.in.sdb bind-9.5.0a6/bin/named/Makefile.
  
  CWARNINGS =
  
-@@ -66,21 +66,20 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
+@@ -66,27 +66,26 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
  
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@@ -59,50 +59,48 @@ diff -up bind-9.5.0a6/bin/named/Makefile.in.sdb bind-9.5.0a6/bin/named/Makefile.
 -TARGETS =	named@EXEEXT@ lwresd@EXEEXT@
 +TARGETS =	named@EXEEXT@ named-sdb@EXEEXT@ lwresd@EXEEXT@
  
- OBJS =		builtin.o client.o config.o control.o \
- 		controlconf.o interfacemgr.o \
--		listenlist.o log.o logconf.o main.o notify.o \
-+		listenlist.o log.o logconf.o notify.o \
- 		query.o server.o sortlist.o \
- 		tkeyconf.o tsigconf.o update.o xfrout.o \
- 		zoneconf.o \
- 		lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \
- 		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \
+ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
+ 		controlconf.@O@ interfacemgr.@O@ \
+-		listenlist.@O@ log.@O@ logconf.@O@ main.@O@ notify.@O@ \
++		listenlist.@O@ log.@O@ logconf.@O@ notify.@O@ \
+ 		query.@O@ server.@O@ sortlist.@O@ statschannel.@O@ \
+ 		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
+ 		zoneconf.@O@ \
+ 		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
+ 		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
 -		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
  
- UOBJS =		unix/os.o
- 
-@@ -88,7 +87,7 @@ GENERATED =	bind9.xsl.h
+ UOBJS =		unix/os.@O@
  
  SRCS =		builtin.c client.c config.c control.c \
  		controlconf.c interfacemgr.c \
 -		listenlist.c log.c logconf.c main.c notify.c \
 +		listenlist.c log.c logconf.c main.c main-sdb.c notify.c \
- 		query.c server.c sortlist.c \
+ 		query.c server.c sortlist.c statschannel.c \
  		tkeyconf.c tsigconf.c update.c xfrout.c \
  		zoneconf.c \
-@@ -116,15 +115,26 @@ main.o: main.c
+@@ -112,15 +111,26 @@ main.@O@: main.c
  		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
  		-DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c
  
-+main-sdb.o : main-sdb.c
-+	${CC} ${ALL_CFLAGS} @USE_DLZ@ \
++main-sdb.@O@: main-sdb.c
++	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} @USE_DLZ@ \
 +		-DVERSION=\"${VERSION}\" \
 +		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
 +		-DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main-sdb.c
 +
- config.o: config.c
- 	${CC} ${ALL_CFLAGS} \
+ config.@O@: config.c
+ 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
  		-DVERSION=\"${VERSION}\" \
  		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
  		-c ${srcdir}/config.c
  
 -named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
-+named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS} main.o
++named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS} main.@O@
 +	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-+	${OBJS} main.o ${UOBJS} ${LIBS}
++	${OBJS} main.@O@ ${UOBJS} ${LIBS}
 +
-+named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS} main-sdb.o ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
++named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS} main-sdb.@O@ ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
  	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 -	${OBJS} ${UOBJS} ${LIBS}
 +	${OBJS} main-sdb.o ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS} ${UOBJS} ${LIBS} \
@@ -110,7 +108,7 @@ diff -up bind-9.5.0a6/bin/named/Makefile.in.sdb bind-9.5.0a6/bin/named/Makefile.
  
  lwresd@EXEEXT@: named@EXEEXT@
  	rm -f lwresd@EXEEXT@
-@@ -149,8 +159,9 @@ installdirs:
+@@ -145,8 +155,9 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
  
@@ -121,9 +119,9 @@ diff -up bind-9.5.0a6/bin/named/Makefile.in.sdb bind-9.5.0a6/bin/named/Makefile.
  	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
  	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
  	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
-diff -up bind-9.5.0a6/bin/named/main-sdb.c.sdb bind-9.5.0a6/bin/named/main-sdb.c
---- bind-9.5.0a6/bin/named/main-sdb.c.sdb	2007-11-15 10:10:06.000000000 +0100
-+++ bind-9.5.0a6/bin/named/main-sdb.c	2007-11-15 10:10:06.000000000 +0100
+diff -up bind-9.5.0b2/bin/named/main-sdb.c.sdb bind-9.5.0b2/bin/named/main-sdb.c
+--- bind-9.5.0b2/bin/named/main-sdb.c.sdb	2008-02-11 17:32:43.000000000 +0100
++++ bind-9.5.0b2/bin/named/main-sdb.c	2008-02-11 17:32:43.000000000 +0100
 @@ -72,6 +72,9 @@
   * Include header files for database drivers here.
   */