- 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, 102 insertions, 0 deletions

diff --git a/bind-9.5-sdb-sqlite-bld.patch b/bind-9.5-sdb-sqlite-bld.patch
new file mode 100644
index 0000000..a7eec4e
--- /dev/null
+++ b/bind-9.5-sdb-sqlite-bld.patch
@@ -0,0 +1,102 @@
+diff -up bind-9.5.0b2/bin/named/Makefile.in.sdb-sqlite-bld bind-9.5.0b2/bin/named/Makefile.in
+--- bind-9.5.0b2/bin/named/Makefile.in.sdb-sqlite-bld	2008-02-11 17:44:32.000000000 +0100
++++ bind-9.5.0b2/bin/named/Makefile.in	2008-02-11 17:46:00.000000000 +0100
+@@ -26,10 +26,10 @@ top_srcdir =	@top_srcdir@
+ #
+ # Add database drivers here.
+ #
+-DBDRIVER_OBJS =      ldapdb.@O@   pgsqldb.@O@  dirdb.@O@
+-DBDRIVER_SRCS =      ldapdb.c     pgsqldb.c    dirdb.c
++DBDRIVER_OBJS =      ldapdb.@O@   pgsqldb.@O@  sqlitedb.@O@ dirdb.@O@
++DBDRIVER_SRCS =      ldapdb.c     pgsqldb.c    sqlitedb.c   dirdb.c
+ DBDRIVER_INCLUDES =
+-DBDRIVER_LIBS =      -lldap -llber  -lpq
++DBDRIVER_LIBS =      -lldap -llber  -lpq  -lsqlite3
+ 
+ DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
+ 
+diff -up bind-9.5.0b2/bin/named/main-sdb.c.sdb-sqlite-bld bind-9.5.0b2/bin/named/main-sdb.c
+--- bind-9.5.0b2/bin/named/main-sdb.c.sdb-sqlite-bld	2008-02-11 17:44:32.000000000 +0100
++++ bind-9.5.0b2/bin/named/main-sdb.c	2008-02-11 17:44:33.000000000 +0100
+@@ -74,6 +74,7 @@
+ /* #include "xxdb.h" */
+ #include "ldapdb.h"
+ #include "pgsqldb.h"
++#include "sqlitedb.h"
+ #include "dirdb.h"
+ 
+ /*
+@@ -646,6 +647,7 @@ setup(void) {
+ 
+ 	ldapdb_clear();
+ 	pgsqldb_clear();
++	sqlitedb_clear();
+ 	dirdb_clear();
+ 
+ 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+@@ -743,6 +745,23 @@ setup(void) {
+                           ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
+                          );
+ 
++        result = sqlitedb_init();
++        if (result != ISC_R_SUCCESS)
++        {
++             isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
++                          ISC_LOG_ERROR, 
++                          "SDB sqlite3 module initialisation failed: %s.",
++                          isc_result_totext(result)
++                );
++            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
++                          ISC_LOG_ERROR, 
++                          "SDB sqlite3 zone database will be unavailable."
++                );
++        }else
++            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
++                          ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded."
++                         );
++
+         result = dirdb_init();
+         if (result != ISC_R_SUCCESS)
+         {
+@@ -787,6 +806,7 @@ cleanup(void) {
+ 
+         ldapdb_clear();
+         pgsqldb_clear();
++        sqlitedb_clear();
+         dirdb_clear();
+ 
+ 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+diff -up bind-9.5.0b2/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.0b2/bin/sdb_tools/Makefile.in
+--- bind-9.5.0b2/bin/sdb_tools/Makefile.in.sdb-sqlite-bld	2008-02-11 17:44:33.000000000 +0100
++++ bind-9.5.0b2/bin/sdb_tools/Makefile.in	2008-02-11 17:44:33.000000000 +0100
+@@ -30,11 +30,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
+ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
+ 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
+ 
+-TARGETS =	zone2ldap@EXEEXT@ ldap2zone@EXEEXT@ zonetodb@EXEEXT@
++TARGETS =	zone2ldap@EXEEXT@ ldap2zone@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
+ 
+-OBJS	=	zone2ldap.o ldap2zone.o zonetodb.o
++OBJS	=	zone2ldap.o ldap2zone.o zonetodb.o zone2sqlite
+ 
+-SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c
++SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c zone2sqlite.c
+ 
+ MANPAGES =      zone2ldap.1
+ 
+@@ -54,6 +54,9 @@ zone2ldap:	zone2ldap.o ${DEPLIBS}
+ zonetodb:	zonetodb.o  ${DEPLIBS}
+ 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.o -lpq ${LIBS}
+ 
++zone2sqlite:	zone2sqlite.o  ${DEPLIBS}
++	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.o -lsqlite3 -lssl ${LIBS}
++
+ ldap2zone:	ldap2zone.o ${DEPLIBS}
+ 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ldap2zone.o -lldap -llber ${LIBS}
+ 
+@@ -68,4 +71,5 @@ install:: ${TARGETS} installdirs
+ 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap ${DESTDIR}${sbindir}
+ 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone ${DESTDIR}${sbindir}
+ 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb  ${DESTDIR}${sbindir}
++	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite  ${DESTDIR}${sbindir}
+ 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1