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
This commit is contained in:
OBS User buildservice-autocommit 2010-05-03 19:15:33 +00:00 committed by Git OBS Bridge
parent 8e492a2c84
commit bf771fc6d8
3 changed files with 44 additions and 5 deletions

View File

@ -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

View File

@ -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

31
tmpfs.patch Normal file
View File

@ -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! " ;;