Hello community, here is the log from the commit of package bind for openSUSE:Factory checked in at 2012-03-01 17:18:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bind (Old) and /work/SRC/openSUSE:Factory/.bind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bind", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/bind/bind.changes 2011-10-26 15:34:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bind.new/bind.changes 2012-03-01 17:18:53.000000000 +0100 @@ -1,0 +2,32 @@ +Mon Feb 13 10:44:33 UTC 2012 - [email protected] + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Wed Dec 21 22:16:02 UTC 2011 - [email protected] + +- Ensure to create the required dir or sym link in /var/run; (bnc#738156). + +------------------------------------------------------------------- +Mon Dec 5 16:47:48 CET 2011 - [email protected] + +- root nameserver updated (root.hint file) + +------------------------------------------------------------------- +Mon Dec 5 12:55:15 CET 2011 - [email protected] + +- added managed-keys-directory to named.conf + +------------------------------------------------------------------- +Tue Nov 22 11:37:01 CET 2011 - [email protected] + +- fixed apparmor profile for lib and lib64 in chroot + (bnc#716745) + +------------------------------------------------------------------- +Thu Nov 17 15:25:54 CET 2011 - [email protected] + +- Cache lookup could return RRSIG data associated with nonexistent + records, leading to an assertion failure. CVE-2011-4313; (bnc#730995). + +------------------------------------------------------------------- Old: ---- bind-9.8.1.tar.gz ldapdump-allow-uri.diff named-direct-proc-mount.diff tmpfs.patch New: ---- bind-9.8.1-P1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bind.spec ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bind # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,20 +16,24 @@ # - Name: bind %define pkg_name bind -%define pkg_vers 9.8.1 -BuildRequires: openldap2-devel -BuildRequires: libcap libcap-devel libmysqlclient-devel libxml2-devel openssl openssl-devel -BuildRequires: update-desktop-files +%define pkg_vers 9.8.1-P1 BuildRequires: krb5-devel +BuildRequires: libcap +BuildRequires: libcap-devel +BuildRequires: libmysqlclient-devel BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: openldap2-devel +BuildRequires: openssl +BuildRequires: openssl-devel +BuildRequires: update-desktop-files Summary: Domain Name System (DNS) Server (named) -Version: 9.8.1 -Release: 1 -License: BSD3c(or similar) ; MIT License (or similar) +License: BSD-3-Clause ; MIT Group: Productivity/Networking/DNS/Servers +Version: 9.8.1P1 +Release: 0 Provides: dns_daemon bind8 bind9 Obsoletes: bind8 bind9 Requires: %{name}-utils %{name}-chrootenv @@ -44,11 +48,8 @@ Patch1: Makefile.in.diff Patch2: pid-path.diff Patch4: perl-path.diff -Patch5: tmpfs.patch -Patch6: ldapdump-allow-uri.diff Patch51: pie_compile.diff Patch52: named-bootconf.diff -Patch54: named-direct-proc-mount.diff Patch70: dlz_compile.diff Patch100: configure.in.diff2 Source60: dlz-schema.txt @@ -81,7 +82,6 @@ System. This package includes the components to operate a DNS server. %package chrootenv -License: BSD3c(or similar) ; MIT License (or similar) Summary: Chroot environment for BIND named and lwresd Group: Productivity/Networking/DNS/Servers PreReq: /usr/sbin/groupadd /usr/sbin/useradd @@ -92,7 +92,6 @@ structure below /var/lib/named. %package devel -License: BSD3c(or similar) ; MIT License (or similar) Summary: Development Libraries and Header Files of BIND Group: Development/Libraries/C and C++ Requires: %{name}-libs = %{version} @@ -111,7 +110,6 @@ System (DNS) protocols. %package doc -License: BSD3c(or similar) ; MIT License (or similar) Summary: BIND documentation Group: Documentation/Other %if 0%{?suse_version} >= 1120 @@ -124,7 +122,6 @@ includes also the BIND Administrator Reference Manual (ARM). %package libs -License: BSD3c(or similar) ; MIT License (or similar) Summary: Shared libraries of BIND Group: Development/Libraries/C and C++ # bug437293 @@ -139,7 +136,6 @@ System (DNS) protocols. %package lwresd -License: BSD3c(or similar) ; MIT License (or similar) Summary: Lightweight Resolver Daemon Group: Productivity/Networking/DNS/Utilities Requires: %{name}-chrootenv @@ -158,7 +154,6 @@ protocol. %package utils -License: BSD3c(or similar) ; MIT License (or similar) Summary: Utilities to query and test DNS Group: Productivity/Networking/DNS/Utilities Provides: dns_utils bindutil bind9-utils @@ -182,15 +177,11 @@ %patch1 -p1 %patch2 -p0 %patch4 -p0 -%patch5 -p0 -%patch6 -p1 #%patch50 %if 0%{?suse_version} >= 1000 %patch51 %endif %patch52 -#%patch53 -%patch54 -p1 %if 0%{?suse_version} <= 1010 %patch100 -p1 %endif ++++++ Makefile.in.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- 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 @@ +Index: bind-9.8.1-P1/bin/named/Makefile.in +=================================================================== +--- bind-9.8.1-P1.orig/bin/named/Makefile.in ++++ bind-9.8.1-P1/bin/named/Makefile.in +@@ -162,8 +162,6 @@ installdirs: install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir} (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@) ++++++ configure.in.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- bind-9.2.3/configure.in -+++ bind-9.2.3/configure.in 2004-06-20 08:17:09 -@@ -1636,7 +1636,7 @@ +Index: bind-9.8.1-P1/configure.in +=================================================================== +--- bind-9.8.1-P1.orig/configure.in ++++ bind-9.8.1-P1/configure.in +@@ -2907,7 +2907,7 @@ AC_SUBST(DOXYGEN) # empty). The variable VARIABLE will be substituted into output files. # ++++++ dlz_compile.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,5 +1,7 @@ ---- contrib/dlz/drivers/sdlz_helper.c -+++ contrib/dlz/drivers/sdlz_helper.c 2011/09/05 08:09:41 +Index: contrib/dlz/drivers/sdlz_helper.c +=================================================================== +--- contrib/dlz/drivers/sdlz_helper.c.orig ++++ contrib/dlz/drivers/sdlz_helper.c @@ -50,7 +50,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ ++++++ named-bootconf.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,5 +1,7 @@ ---- contrib/named-bootconf/named-bootconf.sh -+++ contrib/named-bootconf/named-bootconf.sh 2006/11/06 08:59:04 +Index: contrib/named-bootconf/named-bootconf.sh +=================================================================== +--- contrib/named-bootconf/named-bootconf.sh.orig ++++ contrib/named-bootconf/named-bootconf.sh @@ -54,7 +54,8 @@ # POSSIBILITY OF SUCH DAMAGE. @@ -10,7 +12,7 @@ ( umask 077 ; mkdir $WORKDIR ) || { echo "unable to create work directory '$WORKDIR'" >&2 exit 1 -@@ -308,7 +309,7 @@ +@@ -308,7 +309,7 @@ if [ $DUMP -eq 1 ]; then cat $ZONEFILE $COMMENTFILE rm -f $OPTIONFILE $ZONEFILE $COMMENTFILE ++++++ named.root ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -5,12 +5,12 @@ ; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.root +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Feb 04, 2008 -; related version of root zone: 2008020400 +; last update: Jun 8, 2011 +; related version of root zone: 2011060800 ; ; formerly NS.INTERNIC.NET ; @@ -18,68 +18,71 @@ A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30 ; -; formerly NS1.ISI.EDU +; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 ; -; formerly C.PSI.NET +; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 ; -; formerly TERP.UMD.EDU +; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90 +D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2D::D ; -; formerly NS.NASA.GOV +; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 ; -; formerly NS.ISC.ORG +; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 -F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F ; -; formerly NS.NIC.DDN.MIL +; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 ; -; formerly AOS.ARL.ARMY.MIL +; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53 -H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803f:235 +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235 ; -; formerly NIC.NORDU.NET +; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53 ; -; operated by VeriSign, Inc. +; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30 ; -; operated by RIPE NCC +; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. -K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 -K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1 ; -; operated by ICANN +; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42 ; -; operated by WIDE +; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 -M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35 ; End of File ++++++ perl-path.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,21 +1,27 @@ ---- bin/tests/t_api.pl -+++ bin/tests/t_api.pl 2011/02/24 08:53:35 +Index: bin/tests/t_api.pl +=================================================================== +--- bin/tests/t_api.pl.orig ++++ bin/tests/t_api.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # # Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2001 Internet Software Consortium. ---- contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl -+++ contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl 2011/02/24 08:53:13 +Index: contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl +=================================================================== +--- contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl.orig ++++ contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl @@ -1,4 +1,4 @@ -#! /usr/local/bin/perl -w +#! /usr/bin/perl -w # $Id: generate_nameprep_data.pl,v 1.1.1.1 2003-06-04 00:27:54 marka Exp $ # # Copyright (c) 2001 Japan Network Information Center. All rights reserved. ---- contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl -+++ contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl 2011/02/24 08:53:24 +Index: contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl +=================================================================== +--- contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl.orig ++++ contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl @@ -1,4 +1,4 @@ -#! /usr/local/bin/perl -w +#! /usr/bin/perl -w ++++++ pid-path.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- bin/named/include/named/globals.h -+++ bin/named/include/named/globals.h 2009/01/28 11:01:54 -@@ -121,9 +121,9 @@ +Index: bin/named/include/named/globals.h +=================================================================== +--- bin/named/include/named/globals.h.orig ++++ bin/named/include/named/globals.h +@@ -134,9 +134,9 @@ EXTERN const char * lwresd_g_defaultpid "lwresd.pid"); #else EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR @@ -12,8 +14,10 @@ #endif EXTERN const char * ns_g_username INIT(NULL); ---- contrib/nanny/nanny.pl -+++ contrib/nanny/nanny.pl 2009/01/28 11:02:29 +Index: contrib/nanny/nanny.pl +=================================================================== +--- contrib/nanny/nanny.pl.orig ++++ contrib/nanny/nanny.pl @@ -19,7 +19,7 @@ # A simple nanny to make sure named stays running. ++++++ pie_compile.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- bin/Makefile.in -+++ bin/Makefile.in 2010/02/17 10:54:34 -@@ -23,4 +23,8 @@ +Index: bin/Makefile.in +=================================================================== +--- bin/Makefile.in.orig ++++ bin/Makefile.in +@@ -23,4 +23,8 @@ SUBDIRS = named rndc dig dnssec tests to check confgen @PKCS11_TOOLS@ TARGETS = @@ -9,9 +11,11 @@ @BIND9_MAKE_RULES@ + +LDFLAGS += -pie ---- bin/dig/Makefile.in -+++ bin/dig/Makefile.in 2010/02/17 10:52:39 -@@ -67,8 +67,12 @@ +Index: bin/dig/Makefile.in +=================================================================== +--- bin/dig/Makefile.in.orig ++++ bin/dig/Makefile.in +@@ -67,8 +67,12 @@ HTMLPAGES = dig.html host.html nslookup. MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -24,9 +28,11 @@ dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS} export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS}"; \ ${FINALBUILDCMD} ---- bin/dnssec/Makefile.in -+++ bin/dnssec/Makefile.in 2010/02/17 10:53:51 -@@ -60,8 +60,12 @@ +Index: bin/dnssec/Makefile.in +=================================================================== +--- bin/dnssec/Makefile.in.orig ++++ bin/dnssec/Makefile.in +@@ -60,8 +60,12 @@ HTMLPAGES = dnssec-dsfromkey.html dnssec MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -39,9 +45,11 @@ dnssec-dsfromkey@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS} export BASEOBJS="dnssec-dsfromkey.@O@ ${OBJS}"; \ ${FINALBUILDCMD} ---- bin/nsupdate/Makefile.in -+++ bin/nsupdate/Makefile.in 2010/02/17 10:55:42 -@@ -64,8 +64,12 @@ +Index: bin/nsupdate/Makefile.in +=================================================================== +--- bin/nsupdate/Makefile.in.orig ++++ bin/nsupdate/Makefile.in +@@ -64,8 +64,12 @@ HTMLPAGES = nsupdate.html MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -54,9 +62,11 @@ nsupdate.@O@: nsupdate.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\" \ ---- bin/rndc/Makefile.in -+++ bin/rndc/Makefile.in 2010/02/17 10:57:03 -@@ -59,8 +59,12 @@ +Index: bin/rndc/Makefile.in +=================================================================== +--- bin/rndc/Makefile.in.orig ++++ bin/rndc/Makefile.in +@@ -59,8 +59,12 @@ HTMLPAGES = rndc.html rndc.conf.html MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -69,9 +79,11 @@ rndc.@O@: rndc.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ ---- bin/check/Makefile.in -+++ bin/check/Makefile.in 2005/06/17 13:01:56 -@@ -55,8 +55,12 @@ +Index: bin/check/Makefile.in +=================================================================== +--- bin/check/Makefile.in.orig ++++ bin/check/Makefile.in +@@ -57,8 +57,12 @@ HTMLPAGES = named-checkconf.html named-c MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -84,9 +96,11 @@ named-checkconf.@O@: named-checkconf.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ ---- bin/named/Makefile.in -+++ bin/named/Makefile.in 2005/06/17 12:41:37 -@@ -91,8 +91,12 @@ +Index: bin/named/Makefile.in +=================================================================== +--- bin/named/Makefile.in.orig ++++ bin/named/Makefile.in +@@ -109,8 +109,12 @@ HTMLPAGES = named.html lwresd.html named MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -99,18 +113,22 @@ main.@O@: main.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ ---- bin/named/unix/Makefile.in -+++ bin/named/unix/Makefile.in 2005/06/17 12:40:23 -@@ -33,4 +33,6 @@ +Index: bin/named/unix/Makefile.in +=================================================================== +--- bin/named/unix/Makefile.in.orig ++++ bin/named/unix/Makefile.in +@@ -34,4 +34,6 @@ SRCS = os.c dlz_dlopen_driver.c TARGETS = ${OBJS} +EXT_CFLAGS = -fPIE + @BIND9_MAKE_RULES@ ---- bin/confgen/Makefile.in -+++ bin/confgen/Makefile.in 2010/02/17 11:09:01 -@@ -64,8 +64,12 @@ +Index: bin/confgen/Makefile.in +=================================================================== +--- bin/confgen/Makefile.in.orig ++++ bin/confgen/Makefile.in +@@ -64,8 +64,12 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} UOBJS = unix/os.@O@ ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/apparmor/usr.sbin.named new/vendor-files/apparmor/usr.sbin.named --- old/vendor-files/apparmor/usr.sbin.named 2009-11-18 10:42:46.000000000 +0100 +++ new/vendor-files/apparmor/usr.sbin.named 2012-01-02 23:07:41.000000000 +0100 @@ -41,4 +41,7 @@ /var/opt/novell/xad/ds/krb5kdc/krb5.keytab r, /var/tmp/DNS_* rw, /tmp/DNS_* rw, + + /var/lib/named/lib64/** mrlpx, + /var/lib/named/lib/** mrlpx, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/config/named.conf new/vendor-files/config/named.conf --- old/vendor-files/config/named.conf 2009-11-20 10:08:32.000000000 +0100 +++ new/vendor-files/config/named.conf 2012-01-03 11:52:45.000000000 +0100 @@ -19,6 +19,7 @@ # The directory statement defines the name server's working directory directory "/var__NSD__/named"; + managed-keys-directory "/var__NSD__/named/dyn/"; # Write dump and statistics file to the log subdirectory. The # pathenames are relative to the chroot jail. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/lwresd new/vendor-files/init/lwresd --- old/vendor-files/init/lwresd 2008-08-22 11:03:53.000000000 +0200 +++ new/vendor-files/init/lwresd 2012-01-02 18:05:09.000000000 +0100 @@ -92,6 +92,12 @@ test "${checkAndCopyConfigFilesCalled}" = "yes" && return # Handle known configuration files. if [ "${NAMED_RUN_CHROOTED}" = "yes" ]; then + # Create link if needed, /var/run might be on tmpfs + test -d /var/run/named && \ + rm -rf /var/run/named + test ! -L /var/run/named && \ + ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named + for configfile in /etc/{localtime,lwresd.conf,resolv.conf,rndc.key}; do if [ ! -e ${configfile} ]; then case ${configfile} in @@ -111,6 +117,13 @@ rm -f ${CHROOT_PREFIX}/${configfile} cp -a -L ${configfile} ${CHROOT_PREFIX}/${configfile%/*} done + else + # NAMED_RUN_CHROOTED != yes + test -L /var/run/named && rm /var/run/named + if [ ! -d /var/run/named ]; then + mkdir -p /var/run/named + chown named: /var/run/named + fi fi export checkAndCopyConfigFilesCalled="yes" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/named new/vendor-files/init/named --- old/vendor-files/init/named 2011-10-26 11:14:22.000000000 +0200 +++ new/vendor-files/init/named 2012-01-02 18:05:02.000000000 +0100 @@ -163,47 +163,21 @@ chmod 0640 /etc/rndc.key chown root:named /etc/rndc.key fi - # Handle all include files. - ##################################################################### - # OLD --- Copies only include files mentioned in NAMED_CONF_INCLUDE - ##################################################################### -# for configfile in "${NAMED_CONF_META_INCLUDE_FILE}" ${NAMED_CONF_INCLUDE_FILES}; do -# if [ ! -f "${configfile}" ]; then -# case "${configfile}" in -# "${NAMED_CONF_META_INCLUDE_FILE}") -# warnMessage "File, ${configfile} not found. Creating it." -# initializeNamed -# ;; -# *) -# test -z "${NAMED_CONF_META_INCLUDE_FILE}" && continue -# grep -qe "^[[:space:]]*include[[:space:]]*\"${configfile}\"" "${NAMED_CONF_META_INCLUDE_FILE}" && \ -# initializeNamed || \ -# warnMessage "File, ${configfile} not found. Skipping.\nPlease check the setting of NAMED_CONF_INCLUDE_FILES in /etc/sysconfig/named." -# continue -# ;; -# esac -# fi -# if [ "${NAMED_RUN_CHROOTED}" = "yes" ]; then -# makeDestDir -# rm -f ${CHROOT_PREFIX}/${configfile} -# cp -a -L ${configfile} ${CHROOT_PREFIX}/${configfile%/*} -# fi -# done - # Handle known configuration files. if [ "${NAMED_RUN_CHROOTED}" = "yes" ]; then + # Create link if needed, /var/run might be on tmpfs + test -d /var/run/named && \ + rm -rf /var/run/named + test ! -L /var/run/named && \ + ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named # mount /proc for multicore CPUs (bnc#470828) if [ ! -e "${CHROOT_PREFIX}/proc/meminfo" ]; then mkdir -p "${CHROOT_PREFIX}/proc" - mount --bind /proc "${CHROOT_PREFIX}/proc" 2>/dev/null - mount -o remount,ro,nosuid,nodev ${CHROOT_PREFIX}/proc 2>/dev/null + mount -tproc -oro,nosuid,nodev,noexec proc ${CHROOT_PREFIX}/proc 2>/dev/null fi; - ########################### - # NEW --- Copy complete /etc/named.d dir. Bug: bnc#408145 - ########################### NAMED_D="/etc/named.d" # delete old named.d test -z "${CHROOT_PREFIX}${NAMED_D}" || rm -rf ${CHROOT_PREFIX}${NAMED_D} @@ -226,6 +200,13 @@ mkdir -p ${CHROOT_PREFIX}/lib64 cp -r /lib64/engines ${CHROOT_PREFIX}/lib64/ fi + else + # NAMED_RUN_CHROOTED != yes + test -L /var/run/named && rm /var/run/named + if [ ! -d /var/run/named ]; then + mkdir -p /var/run/named + chown named: /var/run/named + fi fi export checkAndCopyConfigFilesCalled="yes" } @@ -254,6 +235,7 @@ if [ ! -e /etc/named.d/forwarders.conf ]; then touch /etc/named.d/forwarders.conf fi + checkproc -p ${NAMED_PID} ${NAMED_BIN} case $? in 0) echo -n "- Warning: named already running! " ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/ldapdump new/vendor-files/tools/ldapdump --- old/vendor-files/tools/ldapdump 2006-05-17 12:59:11.000000000 +0200 +++ new/vendor-files/tools/ldapdump 2012-01-02 23:17:29.000000000 +0100 @@ -622,6 +622,7 @@ my $data; open( FILE, "< /etc/openldap/ldap.conf" ) or die "unable to open /etc/openldap/ldap.conf. $!"; while(<FILE>) { + if ( /^uri\s+([^\s]*)\s*/i ) { $data = $1; last } if ( /^host\s+([^\s]*)\s*/i ) { $data = $1; last } } close(FILE); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
