rpms/bind
5
0
Fork 1
Code Issues Pull Requests Releases Activity

Install configuration for rwtab and fix chroot setup script

Browse Source 
Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2013-11-12 14:29:33 +01:00
parent cb97bbcb9f
commit 3267c0ac54
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bind.spec
View File

@ -27,7 +27,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: ISC License: ISC
Version: 9.9.4 Version: 9.9.4
Release: 7%{?PATCHVER}%{?PREVER}%{?dist} Release: 8%{?PATCHVER}%{?PREVER}%{?dist}
Epoch: 32 Epoch: 32
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -55,6 +55,7 @@ Source39: named-sdb.service
Source40: named-sdb-chroot.service Source40: named-sdb-chroot.service
Source41: setup-named-chroot.sh Source41: setup-named-chroot.sh
Source42: generate-rndc-key.sh Source42: generate-rndc-key.sh
Source43: named.rwtab
# Common patches # Common patches
Patch5: bind-nonexec.patch Patch5: bind-nonexec.patch
@ -523,6 +524,9 @@ done
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d
install -m 644 %{SOURCE35} ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d/named.conf install -m 644 %{SOURCE35} ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d/named.conf
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d
install -m 644 %{SOURCE43} ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d/named
%pre %pre
if [ "$1" -eq 1 ]; then if [ "$1" -eq 1 ]; then
/usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :; /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :;
@ -631,6 +635,7 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.iscdlv.key %config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.iscdlv.key
%config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.root.key %config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.root.key
%{_sysconfdir}/tmpfiles.d/named.conf %{_sysconfdir}/tmpfiles.d/named.conf
%{_sysconfdir}/rwtab.d/named
%{_unitdir}/named.service %{_unitdir}/named.service
%{_sysconfdir}/NetworkManager/dispatcher.d/13-named %{_sysconfdir}/NetworkManager/dispatcher.d/13-named
%{_sbindir}/named-journalprint %{_sbindir}/named-journalprint
@ -799,6 +804,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif %endif
%changelog %changelog
* Tue Nov 12 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.4-8
- Install configuration for rwtab and fix chroot setup script
* Thu Oct 31 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.4-7 * Thu Oct 31 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.4-7
- Correct the upstream patch for #794940 - Correct the upstream patch for #794940

6
named.rwtab Normal file
View File

@ -0,0 +1,6 @@
dirs /var/named
files /var/named/named.ca
files /var/named/named.empty
files /var/named/named.localhost
files /var/named/named.loopback

2
setup-named-chroot.sh
View File

@ -44,7 +44,7 @@ mount_chroot_conf()
# Mount source is a directory. Mount it only if directory in chroot is # Mount source is a directory. Mount it only if directory in chroot is
# empty. # empty.
if [ -e "$all" ] && [ `ls -1A $ROOTDIR$all | wc -l` -eq 0 ]; then if [ -e "$all" ] && [ `ls -1A $ROOTDIR$all | wc -l` -eq 0 ]; then
mount --bind "$all" "$ROOTDIR$all" mount --rbind "$all" "$ROOTDIR$all"
fi fi
fi fi
done done