From e94dabdce375fd3a6cb7fd8cf7e296eea8555d25157c2d4cb8dc184ecba6f86f Mon Sep 17 00:00:00 2001 From: Uwe Gansert Date: Mon, 3 May 2010 08:38:57 +0000 Subject: [PATCH 1/3] Accepting request 39247 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/bind via accept of submit request 39247 revision 2. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/39247 OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=27 --- bind.changes | 6 ++++++ bind.spec | 10 ++++++---- tmpfs.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 tmpfs.patch diff --git a/bind.changes b/bind.changes index bd0770f..045257a 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 1 12:18:57 UTC 2010 - aj@suse.de + +- Handle /var/run on tmpfs. +- do not use run_ldconfig. + ------------------------------------------------------------------- Wed Feb 24 18:30:08 UTC 2010 - jengelh@medozas.de diff --git a/bind.spec b/bind.spec index 0a262f7..9c9b1a2 100644 --- a/bind.spec +++ b/bind.spec @@ -43,6 +43,7 @@ Patch: configure.in.diff Patch1: Makefile.in.diff Patch2: pid-path.diff Patch4: perl-path.diff +Patch5: tmpfs.patch Patch51: pie_compile.diff Patch52: named-bootconf.diff Patch60: dlz-dollarvar.patch @@ -210,13 +211,14 @@ Authors: %prep [ "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" != "/" -a -d "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" ] && rm -rf "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" -%setup -n %{pkg_name}-%{pkg_vers} +%setup -q -n %{pkg_name}-%{pkg_vers} #%setup -n %{pkg_name}-%{version} -T -D -a1 -a50 -%setup -n %{pkg_name}-%{pkg_vers} -T -D -a1 +%setup -q -n %{pkg_name}-%{pkg_vers} -T -D -a1 %patch -p1 %patch1 -p1 %patch2 -p0 %patch4 -p1 +%patch5 -p0 #%patch50 %if 0%{?suse_version} >= 1000 %patch51 @@ -565,7 +567,7 @@ fi; %insserv_cleanup %post utils -%run_ldconfig +/sbin/ldconfig # Create a key if lwresd is installed. if [ -x usr/sbin/lwresd -a ! -f etc/rndc.key ]; then usr/sbin/rndc-confgen -a -b 512 -r dev/urandom @@ -635,7 +637,7 @@ fi %attr(0666, root, root) %dev(c, 1, 8) %{_var}/lib/named/dev/random %{_var}/lib/named/var/lib/named %{_var}/lib/named/var/log -%{_var}/run/named +%ghost %{_var}/run/named %{_var}/adm/fillup-templates/sysconfig.named-common %{_var}/adm/fillup-templates/sysconfig.syslog-named diff --git a/tmpfs.patch b/tmpfs.patch new file mode 100644 index 0000000..edd37f4 --- /dev/null +++ b/tmpfs.patch @@ -0,0 +1,31 @@ +Index: vendor-files/init/lwresd +=================================================================== +--- vendor-files/init/lwresd.orig ++++ vendor-files/init/lwresd +@@ -118,6 +118,10 @@ function checkAndCopyConfigFiles + case "$1" in + start) + echo -n "Starting Lightweight resolver daemon " ++ # Create link if needed, /var/run might be on tmpfs ++ if [ ! -L /var/run/named ] ; then ++ ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named ++ fi + checkAndCopyConfigFiles + startproc ${LWRESD_BIN} ${NAMED_ARGS} -u named + rc_status -v +Index: vendor-files/init/named +=================================================================== +--- vendor-files/init/named.orig ++++ vendor-files/init/named +@@ -231,6 +231,11 @@ case "$1" in + if [ ! -e /etc/named.d/forwarders.conf ]; then + touch /etc/named.d/forwarders.conf + fi ++ # Create link if needed, /var/run might be on tmpfs ++ if [ ! -L /var/run/named ] ; then ++ ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named ++ fi ++ + checkproc -p ${NAMED_PID} ${NAMED_BIN} + case $? in + 0) echo -n "- Warning: named already running! " ;; From 8e492a2c84bccd16301c31fd18979a5fd300243ee379c0ca9e3b269055ee1698 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 3 May 2010 19:15:31 +0000 Subject: [PATCH 2/3] Accepting request 39284 from network checked in (request 39284) OBS-URL: https://build.opensuse.org/request/show/39284 OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=28 --- bind.changes | 6 ------ bind.spec | 10 ++++------ tmpfs.patch | 31 ------------------------------- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 tmpfs.patch diff --git a/bind.changes b/bind.changes index 045257a..bd0770f 100644 --- a/bind.changes +++ b/bind.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Sat May 1 12:18:57 UTC 2010 - aj@suse.de - -- Handle /var/run on tmpfs. -- do not use run_ldconfig. - ------------------------------------------------------------------- Wed Feb 24 18:30:08 UTC 2010 - jengelh@medozas.de diff --git a/bind.spec b/bind.spec index 9c9b1a2..0a262f7 100644 --- a/bind.spec +++ b/bind.spec @@ -43,7 +43,6 @@ Patch: configure.in.diff Patch1: Makefile.in.diff Patch2: pid-path.diff Patch4: perl-path.diff -Patch5: tmpfs.patch Patch51: pie_compile.diff Patch52: named-bootconf.diff Patch60: dlz-dollarvar.patch @@ -211,14 +210,13 @@ Authors: %prep [ "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" != "/" -a -d "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" ] && rm -rf "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" -%setup -q -n %{pkg_name}-%{pkg_vers} +%setup -n %{pkg_name}-%{pkg_vers} #%setup -n %{pkg_name}-%{version} -T -D -a1 -a50 -%setup -q -n %{pkg_name}-%{pkg_vers} -T -D -a1 +%setup -n %{pkg_name}-%{pkg_vers} -T -D -a1 %patch -p1 %patch1 -p1 %patch2 -p0 %patch4 -p1 -%patch5 -p0 #%patch50 %if 0%{?suse_version} >= 1000 %patch51 @@ -567,7 +565,7 @@ fi; %insserv_cleanup %post utils -/sbin/ldconfig +%run_ldconfig # Create a key if lwresd is installed. if [ -x usr/sbin/lwresd -a ! -f etc/rndc.key ]; then usr/sbin/rndc-confgen -a -b 512 -r dev/urandom @@ -637,7 +635,7 @@ fi %attr(0666, root, root) %dev(c, 1, 8) %{_var}/lib/named/dev/random %{_var}/lib/named/var/lib/named %{_var}/lib/named/var/log -%ghost %{_var}/run/named +%{_var}/run/named %{_var}/adm/fillup-templates/sysconfig.named-common %{_var}/adm/fillup-templates/sysconfig.syslog-named diff --git a/tmpfs.patch b/tmpfs.patch deleted file mode 100644 index edd37f4..0000000 --- a/tmpfs.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: vendor-files/init/lwresd -=================================================================== ---- vendor-files/init/lwresd.orig -+++ vendor-files/init/lwresd -@@ -118,6 +118,10 @@ function checkAndCopyConfigFiles - case "$1" in - start) - echo -n "Starting Lightweight resolver daemon " -+ # Create link if needed, /var/run might be on tmpfs -+ if [ ! -L /var/run/named ] ; then -+ ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named -+ fi - checkAndCopyConfigFiles - startproc ${LWRESD_BIN} ${NAMED_ARGS} -u named - rc_status -v -Index: vendor-files/init/named -=================================================================== ---- vendor-files/init/named.orig -+++ vendor-files/init/named -@@ -231,6 +231,11 @@ case "$1" in - if [ ! -e /etc/named.d/forwarders.conf ]; then - touch /etc/named.d/forwarders.conf - fi -+ # Create link if needed, /var/run might be on tmpfs -+ if [ ! -L /var/run/named ] ; then -+ ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named -+ fi -+ - checkproc -p ${NAMED_PID} ${NAMED_BIN} - case $? in - 0) echo -n "- Warning: named already running! " ;; From bf771fc6d810c74f645bdb6d873c780730d12dea9ee360dda3636016e2cd19b3 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 3 May 2010 19:15:33 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/bind revision 46.0 OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=85136d9e75b817aec198006beb045e7f --- bind.changes | 6 ++++++ bind.spec | 12 +++++++----- tmpfs.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 tmpfs.patch diff --git a/bind.changes b/bind.changes index bd0770f..045257a 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 1 12:18:57 UTC 2010 - aj@suse.de + +- Handle /var/run on tmpfs. +- do not use run_ldconfig. + ------------------------------------------------------------------- Wed Feb 24 18:30:08 UTC 2010 - jengelh@medozas.de diff --git a/bind.spec b/bind.spec index 0a262f7..8988720 100644 --- a/bind.spec +++ b/bind.spec @@ -25,7 +25,7 @@ BuildRequires: openldap2-devel BuildRequires: libcap libcap-devel libmysqlclient-devel libxml2-devel openssl openssl-devel Summary: Domain Name System (DNS) Server (named) Version: 9.7.0 -Release: 2 +Release: 3 License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/DNS/Servers Provides: dns_daemon bind8 bind9 @@ -43,6 +43,7 @@ Patch: configure.in.diff Patch1: Makefile.in.diff Patch2: pid-path.diff Patch4: perl-path.diff +Patch5: tmpfs.patch Patch51: pie_compile.diff Patch52: named-bootconf.diff Patch60: dlz-dollarvar.patch @@ -210,13 +211,14 @@ Authors: %prep [ "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" != "/" -a -d "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" ] && rm -rf "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" -%setup -n %{pkg_name}-%{pkg_vers} +%setup -q -n %{pkg_name}-%{pkg_vers} #%setup -n %{pkg_name}-%{version} -T -D -a1 -a50 -%setup -n %{pkg_name}-%{pkg_vers} -T -D -a1 +%setup -q -n %{pkg_name}-%{pkg_vers} -T -D -a1 %patch -p1 %patch1 -p1 %patch2 -p0 %patch4 -p1 +%patch5 -p0 #%patch50 %if 0%{?suse_version} >= 1000 %patch51 @@ -565,7 +567,7 @@ fi; %insserv_cleanup %post utils -%run_ldconfig +/sbin/ldconfig # Create a key if lwresd is installed. if [ -x usr/sbin/lwresd -a ! -f etc/rndc.key ]; then usr/sbin/rndc-confgen -a -b 512 -r dev/urandom @@ -635,7 +637,7 @@ fi %attr(0666, root, root) %dev(c, 1, 8) %{_var}/lib/named/dev/random %{_var}/lib/named/var/lib/named %{_var}/lib/named/var/log -%{_var}/run/named +%ghost %{_var}/run/named %{_var}/adm/fillup-templates/sysconfig.named-common %{_var}/adm/fillup-templates/sysconfig.syslog-named diff --git a/tmpfs.patch b/tmpfs.patch new file mode 100644 index 0000000..edd37f4 --- /dev/null +++ b/tmpfs.patch @@ -0,0 +1,31 @@ +Index: vendor-files/init/lwresd +=================================================================== +--- vendor-files/init/lwresd.orig ++++ vendor-files/init/lwresd +@@ -118,6 +118,10 @@ function checkAndCopyConfigFiles + case "$1" in + start) + echo -n "Starting Lightweight resolver daemon " ++ # Create link if needed, /var/run might be on tmpfs ++ if [ ! -L /var/run/named ] ; then ++ ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named ++ fi + checkAndCopyConfigFiles + startproc ${LWRESD_BIN} ${NAMED_ARGS} -u named + rc_status -v +Index: vendor-files/init/named +=================================================================== +--- vendor-files/init/named.orig ++++ vendor-files/init/named +@@ -231,6 +231,11 @@ case "$1" in + if [ ! -e /etc/named.d/forwarders.conf ]; then + touch /etc/named.d/forwarders.conf + fi ++ # Create link if needed, /var/run might be on tmpfs ++ if [ ! -L /var/run/named ] ; then ++ ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named ++ fi ++ + checkproc -p ${NAMED_PID} ${NAMED_BIN} + case $? in + 0) echo -n "- Warning: named already running! " ;;