diff --git a/.gitignore b/.gitignore index 0ef47f1..628434e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ config-6.tar.bz2 bind-9.7.1-P2.tar.gz +/config-6.tar.bz2 +/bind-9.7.2-P3.tar.gz diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch index 0dec92b..b05025c 100644 --- a/bind-9.5-sdb.patch +++ b/bind-9.5-sdb.patch @@ -1,6 +1,6 @@ -diff -up bind-9.7.0rc1/bin/Makefile.in.sdb bind-9.7.0rc1/bin/Makefile.in ---- bind-9.7.0rc1/bin/Makefile.in.sdb 2009-10-05 14:07:08.000000000 +0200 -+++ bind-9.7.0rc1/bin/Makefile.in 2009-12-15 12:58:11.913941164 +0100 +diff -up bind-9.7.2-P3/bin/Makefile.in.sdb bind-9.7.2-P3/bin/Makefile.in +--- bind-9.7.2-P3/bin/Makefile.in.sdb 2009-10-05 14:07:08.000000000 +0200 ++++ bind-9.7.2-P3/bin/Makefile.in 2010-12-02 10:08:51.568972295 +0100 @@ -19,8 +19,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ @@ -12,9 +12,9 @@ diff -up bind-9.7.0rc1/bin/Makefile.in.sdb bind-9.7.0rc1/bin/Makefile.in TARGETS = @BIND9_MAKE_RULES@ -diff -up bind-9.7.0rc1/bin/named/Makefile.in.sdb bind-9.7.0rc1/bin/named/Makefile.in ---- bind-9.7.0rc1/bin/named/Makefile.in.sdb 2009-12-15 12:58:11.863950805 +0100 -+++ bind-9.7.0rc1/bin/named/Makefile.in 2009-12-15 12:58:57.163938385 +0100 +diff -up bind-9.7.2-P3/bin/named/Makefile.in.sdb bind-9.7.2-P3/bin/named/Makefile.in +--- bind-9.7.2-P3/bin/named/Makefile.in.sdb 2010-12-02 10:08:51.532971016 +0100 ++++ bind-9.7.2-P3/bin/named/Makefile.in 2010-12-02 10:08:51.572972437 +0100 @@ -45,7 +45,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @@ -58,15 +58,15 @@ diff -up bind-9.7.0rc1/bin/named/Makefile.in.sdb bind-9.7.0rc1/bin/named/Makefil MANPAGES = named.8 lwresd.8 named.conf.5 -@@ -166,5 +164,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i +@@ -169,5 +167,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5 - -@DLZ_DRIVER_RULES@ -diff -up bind-9.7.0rc1/bin/named-sdb/main.c.sdb bind-9.7.0rc1/bin/named-sdb/main.c ---- bind-9.7.0rc1/bin/named-sdb/main.c.sdb 2009-12-15 12:58:11.893960333 +0100 -+++ bind-9.7.0rc1/bin/named-sdb/main.c 2009-12-15 12:58:11.913941164 +0100 +diff -up bind-9.7.2-P3/bin/named-sdb/main.c.sdb bind-9.7.2-P3/bin/named-sdb/main.c +--- bind-9.7.2-P3/bin/named-sdb/main.c.sdb 2010-12-02 10:08:51.552971727 +0100 ++++ bind-9.7.2-P3/bin/named-sdb/main.c 2010-12-02 10:08:51.572972437 +0100 @@ -75,6 +75,9 @@ * Include header files for database drivers here. */ @@ -77,7 +77,7 @@ diff -up bind-9.7.0rc1/bin/named-sdb/main.c.sdb bind-9.7.0rc1/bin/named-sdb/main /* * Include DLZ drivers if appropriate. -@@ -766,6 +769,10 @@ setup(void) { +@@ -770,6 +773,10 @@ setup(void) { ns_main_earlyfatal("isc_app_start() failed: %s", isc_result_totext(result)); @@ -88,7 +88,7 @@ diff -up bind-9.7.0rc1/bin/named-sdb/main.c.sdb bind-9.7.0rc1/bin/named-sdb/main isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version, saved_command_line); -@@ -849,6 +856,57 @@ setup(void) { +@@ -853,6 +860,57 @@ setup(void) { isc_result_totext(result)); #endif @@ -146,7 +146,7 @@ diff -up bind-9.7.0rc1/bin/named-sdb/main.c.sdb bind-9.7.0rc1/bin/named-sdb/main ns_server_create(ns_g_mctx, &ns_g_server); } -@@ -876,6 +934,10 @@ cleanup(void) { +@@ -880,6 +938,10 @@ cleanup(void) { dns_name_destroy(); @@ -157,9 +157,9 @@ diff -up bind-9.7.0rc1/bin/named-sdb/main.c.sdb bind-9.7.0rc1/bin/named-sdb/main isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, "exiting"); ns_log_shutdown(); -diff -up bind-9.7.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.7.0rc1/bin/named-sdb/Makefile.in ---- bind-9.7.0rc1/bin/named-sdb/Makefile.in.sdb 2009-12-15 12:58:11.873941824 +0100 -+++ bind-9.7.0rc1/bin/named-sdb/Makefile.in 2009-12-15 12:58:11.913941164 +0100 +diff -up bind-9.7.2-P3/bin/named-sdb/Makefile.in.sdb bind-9.7.2-P3/bin/named-sdb/Makefile.in +--- bind-9.7.2-P3/bin/named-sdb/Makefile.in.sdb 2010-12-02 10:08:51.548971585 +0100 ++++ bind-9.7.2-P3/bin/named-sdb/Makefile.in 2010-12-02 10:08:51.572972437 +0100 @@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@ # # Add database drivers here. @@ -192,7 +192,7 @@ diff -up bind-9.7.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.7.0rc1/bin/named-sdb export MAKE_SYMTABLE="yes"; \ export BASEOBJS="${OBJS} ${UOBJS}"; \ ${FINALBUILDCMD} -@@ -157,14 +157,8 @@ statschannel.@O@: bind9.xsl.h +@@ -160,14 +160,8 @@ statschannel.@O@: bind9.xsl.h installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} @@ -209,10 +209,10 @@ diff -up bind-9.7.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.7.0rc1/bin/named-sdb + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir} @DLZ_DRIVER_RULES@ -diff -up bind-9.7.0rc1/configure.in.sdb bind-9.7.0rc1/configure.in ---- bind-9.7.0rc1/configure.in.sdb 2009-11-11 09:46:47.000000000 +0100 -+++ bind-9.7.0rc1/configure.in 2009-12-15 12:58:11.913941164 +0100 -@@ -3241,6 +3241,8 @@ AC_CONFIG_FILES([ +diff -up bind-9.7.2-P3/configure.in.sdb bind-9.7.2-P3/configure.in +--- bind-9.7.2-P3/configure.in.sdb 2010-08-16 07:14:13.000000000 +0200 ++++ bind-9.7.2-P3/configure.in 2010-12-02 10:09:28.298296466 +0100 +@@ -3268,6 +3268,8 @@ AC_CONFIG_FILES([ bin/confgen/unix/Makefile bin/named/Makefile bin/named/unix/Makefile @@ -221,8 +221,8 @@ diff -up bind-9.7.0rc1/configure.in.sdb bind-9.7.0rc1/configure.in bin/rndc/Makefile bin/dig/Makefile bin/nsupdate/Makefile -@@ -3262,6 +3264,7 @@ AC_CONFIG_FILES([ - bin/tests/headerdep_test.sh +@@ -3292,6 +3294,7 @@ AC_CONFIG_FILES([ + bin/tests/virtual-time/conf.sh bin/tools/Makefile bin/dnssec/Makefile + bin/sdb_tools/Makefile diff --git a/bind.spec b/bind.spec index 40e482c..72705e4 100644 --- a/bind.spec +++ b/bind.spec @@ -2,7 +2,7 @@ # Red Hat BIND package .spec file # -%define PATCHVER P2 +%define PATCHVER P3 #%define PREVER rc2 #%define VERSION %{version}%{PREVER} #%define VERSION %{version} @@ -20,8 +20,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Name: bind License: ISC -Version: 9.7.1 -Release: 3.%{PATCHVER}%{?dist} +Version: 9.7.2 +Release: 1.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -688,6 +688,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Thu Dec 02 2010 Adam Tkac 32:9.7.2-1.P3 +- update to 9.7.2-P3 + * Mon Nov 29 2010 Jan Görig 32:9.7.1-3.P2 - added root zone DNS key diff --git a/sources b/sources index 310910b..27a13ab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 90bd7f32fd5717b8294313b6b5ccc742 config-6.tar.bz2 -bd6be63cc910d04da39103d441871596 bind-9.7.1-P2.tar.gz +b4537cbae38b2daef36775bf49f33db9 bind-9.7.2-P3.tar.gz