rpms/bind/F-11 named.NetworkManager, NONE, 1.1 bind.spec, 1.320, 1.321 named.init, 1.73, 1.74 named.sysconfig, 1.11, 1.12
Adam Tkac
atkac at fedoraproject.org
Tue Sep 15 15:35:28 UTC 2009
- Previous message (by thread): rpms/bind/F-12 named.NetworkManager, NONE, 1.1 bind.spec, 1.324, 1.325 named.init, 1.73, 1.74 named.sysconfig, 1.11, 1.12
- Next message (by thread): rpms/sysvinit/devel .cvsignore,1.6,1.7 sources,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atkac
Update of /cvs/pkgs/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29028
Modified Files:
bind.spec named.init named.sysconfig
Added Files:
named.NetworkManager
Log Message:
- fix libs postun section again (#514728)
- improve chroot related documentation (#507795)
- add NetworkManager dispatcher script to reload named when network interface is
activated/deactivated (#490275)
- don't set/unset named_write_master_zones SELinux boolean every time in
initscript, modify it only when it's actually needed
--- NEW FILE named.NetworkManager ---
#!/bin/bash
# Check if named is running
/sbin/service named status > /dev/null 2>&1 || exit 0
[ "$2" = 'up' -o "$2" = 'down' ] && /sbin/service named reload
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/bind.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- bind.spec 3 Sep 2009 13:03:21 -0000 1.320
+++ bind.spec 15 Sep 2009 15:35:28 -0000 1.321
@@ -20,7 +20,7 @@ Summary: The Berkeley Internet Name Dom
Name: bind
License: ISC
Version: 9.6.1
-Release: 4.%{PATCHVER}%{?dist}.1
+Release: 5.%{PATCHVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +30,7 @@ Source: ftp://ftp.isc.org/isc/bind9/%{
Source1: named.sysconfig
Source2: named.init
Source3: named.logrotate
+Source4: named.NetworkManager
Source5: rfc1912.txt
Source7: bind-9.3.1rc1-sdb_tools-Makefile.in
Source8: dnszone.schema
@@ -295,7 +296,7 @@ cp --preserve=timestamps %{SOURCE5} doc
gzip -9 doc/rfc/*
# Build directory hierarchy
-mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
+mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d,NetworkManager/dispatcher.d}
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
@@ -321,6 +322,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install
install -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf
install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named
install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
+install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}/etc/NetworkManager/dispatcher.d/13-named
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
%if %{SDB}
@@ -424,11 +426,13 @@ fi
%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
# bind-libs between 32:9.6.1-0.1.b1 and 32:9.6.1-0.4.rc1 have bigger SOnames
# than current bind - https://bugzilla.redhat.com/show_bug.cgi?id=509635.
-# Remove this trigger when SOnames get bigger.
+# Remove this trigger when SOnames get bigger and also correct the %%postun
+# section above (use %%postun libs -p /sbin/ldconfig)
%triggerpostun -n bind-libs -p /bin/bash -- bind-libs > 32:9.6.1-0.1.b1
/sbin/ldconfig
@@ -494,6 +498,7 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/bind
%config(noreplace) %{_sysconfdir}/sysconfig/named
%{_sysconfdir}/rc.d/init.d/named
+%{_sysconfdir}/NetworkManager/dispatcher.d/13-named
%{_sbindir}/dnssec*
%{_sbindir}/named-check*
%{_sbindir}/lwresd
@@ -583,6 +588,14 @@ rm -rf ${RPM_BUILD_ROOT}
%ghost %{chroot_prefix}/etc/localtime
%changelog
+* Thu Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.6.1-5.P1
+- fix libs postun section again (#514728)
+- improve chroot related documentation (#507795)
+- add NetworkManager dispatcher script to reload named when network interface is
+ activated/deactivated (#490275)
+- don't set/unset named_write_master_zones SELinux boolean every time in
+ initscript, modify it only when it's actually needed
+
* Thu Sep 03 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-4.P1.1
- update the patch for dynamic loading of database backends
Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/named.init,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- named.init 13 Jul 2009 12:57:28 -0000 1.73
+++ named.init 15 Sep 2009 15:35:28 -0000 1.74
@@ -50,12 +50,16 @@ fi
# Enable/disable debugging
if [ "x$DEBUG" = 'xyes' ]; then
chown named.named /var/named
- [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
- setsebool named_write_master_zones 1
+ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+ [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'off' ]; then
+ setsebool named_write_master_zones 1
+ fi;
else
chown root.named /var/named
- [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
- setsebool named_write_master_zones 0
+ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+ [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'on' ]; then
+ setsebool named_write_master_zones 0
+ fi;
fi
ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf
Index: named.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/named.sysconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- named.sysconfig 13 Jul 2009 12:57:28 -0000 1.11
+++ named.sysconfig 15 Sep 2009 15:35:28 -0000 1.12
@@ -22,7 +22,10 @@
# - /etc/rndc.key
# - /etc/named.rfc1912.zones
# - /etc/named.dnssec.keys
-#
+#
+# Don't forget to add "$AddUnixListenSocket /var/named/chroot/dev/log"
+# line to your /etc/rsyslog.conf file. Otherwise your logging becomes
+# broken when rsyslogd daemon is restarted (due update, for example).
#
# OPTIONS="whatever" -- These additional options will be passed to named
# at startup. Don't add -t here, use ROOTDIR instead.
- Previous message (by thread): rpms/bind/F-12 named.NetworkManager, NONE, 1.1 bind.spec, 1.324, 1.325 named.init, 1.73, 1.74 named.sysconfig, 1.11, 1.12
- Next message (by thread): rpms/sysvinit/devel .cvsignore,1.6,1.7 sources,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list