diff --git a/Makefile.in.diff b/Makefile.in.diff index fb51d73..c9ebcd2 100644 --- a/Makefile.in.diff +++ b/Makefile.in.diff @@ -1,41 +1,3 @@ ---- bind-9.2.3/lib/bind/port/linux/include/Makefile.in -+++ bind-9.2.3/lib/bind/port/linux/include/Makefile.in 2003-03-03 16:35:43 -@@ -17,7 +17,6 @@ - - srcdir = @srcdir@ - VPATH = @srcdir@ --top_srcdir = @top_srcdir@ - - NHEADERS= net/route.h - SHEADERS= sys/mbuf.h -@@ -26,6 +25,8 @@ - - @BIND9_MAKE_RULES@ - -+top_srcdir = @top_srcdir@ -+ - installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/net \ - ${DESTDIR}${includedir}/sys ---- bind-9.2.3/lib/bind/Makefile.in -+++ bind-9.2.3/lib/bind/Makefile.in 2003-03-03 17:04:15 -@@ -17,7 +17,6 @@ - - srcdir = @srcdir@ - VPATH = @srcdir@ --top_srcdir = @top_srcdir@ - - @LIBBIND_API@ - -@@ -94,6 +94,8 @@ - - @BIND9_MAKE_RULES@ - -+top_srcdir = @top_srcdir@ -+ - libbind.@SA@: ${OBJS} - ${AR} ${ARFLAGS} $@ ${OBJS} - ${RANLIB} $@ --- bind-9.3.1/bin/named/Makefile.in +++ bind-9.3.1/bin/named/Makefile.in 2006/05/09 13:00:18 @@ -138,8 +138,6 @@ diff --git a/bind-9.5.0P2.tar.gz b/bind-9.5.0P2.tar.gz deleted file mode 100644 index fd783d9..0000000 --- a/bind-9.5.0P2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aacc87127ceb7e541f88b95be3861320849713ce90d8415c74c9e64d1500b68e -size 6710306 diff --git a/bind-9.6.0P1.tar.gz b/bind-9.6.0P1.tar.gz new file mode 100644 index 0000000..26b4c6e --- /dev/null +++ b/bind-9.6.0P1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d78ea39b30f10d33440cc358603e5af43223483553f9cc5cf800436af8b71b9 +size 6618579 diff --git a/bind.changes b/bind.changes index 26ff33f..5fbae7e 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Jan 28 10:53:30 CET 2009 - ug@suse.de + +- key names with spaces are allowed by genDDNSkey now + (bnc#459739) +- a missing /etc/named.conf.include could lead to an + error while "restart" (bnc#455888) +- version update to 9.6.0-P1 +- Full NSEC3 support +- Automatic zone re-signing +- New update-policy methods tcp-self and 6to4-self +- The BIND 8 resolver library, libbind, has been removed from the + BIND 9 distribution + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/bind.spec b/bind.spec index 9f2e34b..b6f471b 100644 --- a/bind.spec +++ b/bind.spec @@ -1,7 +1,7 @@ # -# spec file for package bind (Version 9.5.0P2) +# spec file for package bind (Version 9.6.0P1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,12 @@ Name: bind %define pkg_name bind -%define pkg_vers 9.5.0P2 +%define pkg_vers 9.6.0P1 #BuildRequires: openldap2 openldap2-devel BuildRequires: libcap libcap-devel libxml2-devel openssl openssl-devel Summary: Domain Name System (DNS) Server (named) -Version: 9.5.0P2 -Release: 18 +Version: 9.6.0P1 +Release: 1 %define SDB_LDAP_VERSION 1.0-beta License: BSD 3-Clause; X11/MIT Group: Productivity/Networking/DNS/Servers @@ -212,7 +212,7 @@ Authors: %setup -n %{pkg_name}-%{pkg_vers} -T -D -a1 %patch -p1 %patch1 -p1 -%patch2 -p1 +%patch2 -p0 %patch4 -p1 #%patch50 %if 0%{?suse_version} >= 1000 @@ -245,13 +245,13 @@ cat /usr/share/aclocal/libtool.m4 >> aclocal.m4 %{__libtoolize} -f %{__aclocal} %{__autoconf} -pushd lib/bind -%{?suse_update_config:%{suse_update_config -f}} -cat /usr/share/aclocal/libtool.m4 >> aclocal.m4 -%{__libtoolize} -f -%{__aclocal} -%{__autoconf} -popd +#pushd lib/bind +#%{?suse_update_config:%{suse_update_config -f}} +#cat /usr/share/aclocal/libtool.m4 >> aclocal.m4 +#%{__libtoolize} -f +#%{__aclocal} +#%{__autoconf} +#popd #pushd contrib/idn/idnkit-1.0-src #%{?suse_update_config:%{suse_update_config -f}} #cat /usr/share/aclocal/libtool.m4 >> aclocal.m4 @@ -274,7 +274,6 @@ CONFIGURE_OPTIONS="\ --infodir=%{_infodir} \ --with-openssl \ --enable-threads \ - --enable-libbind \ --with-libtool \ --enable-runidn \ --with-libxml2 @@ -597,6 +596,8 @@ fi %doc %{_mandir}/man8/named-checkzone.8.gz %doc %{_mandir}/man8/named.8.gz %doc %{_mandir}/man8/named-compilezone.8.gz +%doc %{_mandir}/man8/dnssec-dsfromkey.8.gz +%doc %{_mandir}/man8/dnssec-keyfromlabel.8.gz %dir %{_datadir}/bind %{_datadir}/bind/createNamedConfInclude %{_datadir}/bind/ldapdump @@ -682,6 +683,8 @@ fi %{_bindir}/nsupdate %{_bindir}/genDDNSkey %{_bindir}/runidn +%{_sbindir}/dnssec-dsfromkey +%{_sbindir}/dnssec-keyfromlabel %{_sbindir}/rndc %{_sbindir}/rndc-confgen %dir %{_datadir}/idnkit @@ -692,7 +695,7 @@ fi %doc %{_mandir}/man1/host.1.gz %doc %{_mandir}/man1/nslookup.1.gz %doc %{_mandir}/man5/rndc.conf.5.gz -%doc %{_mandir}/man8/nsupdate.8.gz +%doc %{_mandir}/man1/nsupdate.1.gz %doc %{_mandir}/man8/rndc-confgen.8.gz %doc %{_mandir}/man8/rndc.8.gz # idn kit @@ -703,6 +706,17 @@ fi %doc %{_mandir}/man5/idnrc.5.gz %changelog +* Wed Jan 28 2009 ug@suse.de +- key names with spaces are allowed by genDDNSkey now + (bnc#459739) +- a missing /etc/named.conf.include could lead to an + error while "restart" (bnc#455888) +- version update to 9.6.0-P1 +- Full NSEC3 support +- Automatic zone re-signing +- New update-policy methods tcp-self and 6to4-self +- The BIND 8 resolver library, libbind, has been removed from the + BIND 9 distribution * Wed Dec 10 2008 olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) diff --git a/configure.in.diff b/configure.in.diff index ea97e31..3a819a4 100644 --- a/configure.in.diff +++ b/configure.in.diff @@ -18,14 +18,3 @@ $1="" AC_MSG_CHECKING(for $2) for d in $3 ---- bind-9.2.2rc1/lib/bind/configure.in -+++ bind-9.2.2rc1/lib/bind/configure.in 2003-01-31 11:18:00 -@@ -23,7 +23,7 @@ - AC_CANONICAL_HOST - - AC_PROG_MAKE_SET --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - - AC_SUBST(STD_CINCLUDES) diff --git a/pid-path.diff b/pid-path.diff index 7929090..00da028 100644 --- a/pid-path.diff +++ b/pid-path.diff @@ -1,19 +1,19 @@ ---- bind-9.2.2rc1/bin/named/include/named/globals.h -+++ bind-9.2.2rc1/bin/named/include/named/globals.h 2003/01/12 18:15:26 -@@ -102,9 +102,9 @@ - EXTERN isc_boolean_t ns_g_logstderr INIT(ISC_FALSE); - +--- bin/named/include/named/globals.h ++++ bin/named/include/named/globals.h 2009/01/28 11:01:54 +@@ -121,9 +121,9 @@ + "lwresd.pid"); + #else EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR - "/run/named.pid"); + "/run/named/named.pid"); EXTERN const char * lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR -- "/run/lwresd.pid"); -+ "/run/named/lwresd.pid"); - EXTERN const char * ns_g_username INIT(NULL); +- "/run/lwresd.pid"); ++ "/run/named/lwresd.pid"); + #endif - #undef EXTERN ---- bind-9.2.2rc1/contrib/nanny/nanny.pl -+++ bind-9.2.2rc1/contrib/nanny/nanny.pl 2003-02-19 18:44:10.000000000 +0100 + EXTERN const char * ns_g_username INIT(NULL); +--- contrib/nanny/nanny.pl ++++ contrib/nanny/nanny.pl 2009/01/28 11:02:29 @@ -19,7 +19,7 @@ # A simple nanny to make sure named stays running. diff --git a/pie_compile.diff b/pie_compile.diff index 6db1507..fa0f860 100644 --- a/pie_compile.diff +++ b/pie_compile.diff @@ -40,9 +40,9 @@ +LDFLAGS += -pie + - dnssec-keygen@EXEEXT@: dnssec-keygen.@O@ ${OBJS} ${DEPLIBS} + dnssec-dsfromkey@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ - dnssec-keygen.@O@ ${OBJS} ${LIBS} + dnssec-dsfromkey.@O@ ${OBJS} ${LIBS} --- bin/Makefile.in +++ bin/Makefile.in 2005/06/17 12:52:58 @@ -22,4 +22,8 @@ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 58656ce..170c0ad 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f3cceb6d37d9042483c33a3269031b56f637a8b27f6fe81a66229e9936b0383 -size 20450 +oid sha256:a2123e15ff4ad8cf7c06588d46ae82d5599110ba484d21d3d46203e38ce7bbf9 +size 20509