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

auto-import changelog data from bind-9.2.4rc7-10.src.rpm

Browse Source 
9.2.7-rc7-10
- Fix bug 130121: add '%ghost' entries for files included in previous
- bind-chroot & not in current - ie. named.conf, rndc.key, dev/* -
- that RPM removed after upgrade .
Thu Aug 26 2004 Jason Vas Dias <jvdias@redhat.com>
- Fix bug 130981: add '-t' option to named-checkconf invocation in
- named.init if chroot installed.
This commit is contained in:
cvsdist 2004-09-09 03:40:14 +00:00
parent db43ccdc5a
commit 1d13f1358f
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bind.spec
View File

@ -25,7 +25,7 @@ Patch9: bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-root Buildroot: %{_tmppath}/%{name}-root
Version: 9.2.4rc7 Version: 9.2.4rc7
Release: 9 Release: 10
Epoch: 10 Epoch: 10
BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar
Requires(pre,preun): shadow-utils Requires(pre,preun): shadow-utils
@ -98,6 +98,10 @@ based off code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
%attr(750,root,named) %prefix/var/named %attr(750,root,named) %prefix/var/named
%attr(770,named,named) %prefix/var/named/slaves %attr(770,named,named) %prefix/var/named/slaves
%attr(770,named,named) %prefix/var/named/data %attr(770,named,named) %prefix/var/named/data
%ghost %prefix/etc/named.conf
%ghost %prefix/etc/rndc.key
%ghost %prefix/dev/null
%ghost %prefix/dev/random
%post chroot %post chroot
safe_replace() safe_replace()
@ -248,7 +252,13 @@ mkdir -p ${RPM_BUILD_ROOT}/var/run/named
#chroot #chroot
mkdir -p ${RPM_BUILD_ROOT}/%{prefix} mkdir -p ${RPM_BUILD_ROOT}/%{prefix}
tar --no-same-owner -zxvf %{SOURCE7} --directory ${RPM_BUILD_ROOT}/%{prefix} tar --no-same-owner -zxvf %{SOURCE7} --directory ${RPM_BUILD_ROOT}/%{prefix}
# these are required to prevent them being erased during upgrade of previous
# versions that included them (bug #130121):
touch ${RPM_BUILD_ROOT}/%{prefix}/etc/named.conf
touch ${RPM_BUILD_ROOT}/%{prefix}/etc/rndc.key
touch ${RPM_BUILD_ROOT}/%{prefix}/dev/null
touch ${RPM_BUILD_ROOT}/%{prefix}/dev/random
#end chroot
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
install -c -m 640 bin/rndc/rndc.conf $RPM_BUILD_ROOT%{_sysconfdir} install -c -m 640 bin/rndc/rndc.conf $RPM_BUILD_ROOT%{_sysconfdir}
install -c -m 755 contrib/named-bootconf/named-bootconf.sh $RPM_BUILD_ROOT/usr/sbin/named-bootconf install -c -m 755 contrib/named-bootconf/named-bootconf.sh $RPM_BUILD_ROOT/usr/sbin/named-bootconf
@ -392,6 +402,15 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
%doc doc/draft doc/rfc %doc doc/draft doc/rfc
%changelog %changelog
* Mon Aug 30 2004 Jason Vas Dias <jvdias@redhat.com> - 10:9.2.7-rc7-10
- Fix bug 130121: add '%ghost' entries for files included in previous
- bind-chroot & not in current - ie. named.conf, rndc.key, dev/* -
- that RPM removed after upgrade .
* Thu Aug 26 2004 Jason Vas Dias <jvdias@redhat.com>
- Fix bug 130981: add '-t' option to named-checkconf invocation in
- named.init if chroot installed.
* Wed Aug 25 2004 Jason Vas Dias <jvdias@redhat.com> * Wed Aug 25 2004 Jason Vas Dias <jvdias@redhat.com>
- Remove resolver(5) manpage now in man-pages (bug 130792); - Remove resolver(5) manpage now in man-pages (bug 130792);
- Don't create /dev/ entries in bind-chroot if already there (bug 127556); - Don't create /dev/ entries in bind-chroot if already there (bug 127556);

4
named.init
View File

@ -34,11 +34,13 @@ start() {
return 1 return 1
fi fi
echo -n $"Starting $prog: " echo -n $"Starting $prog: "
ckcf_options='';
if [ -n "${ROOTDIR}" -a "x${ROOTDIR}" != "x/" ]; then if [ -n "${ROOTDIR}" -a "x${ROOTDIR}" != "x/" ]; then
OPTIONS="${OPTIONS} -t ${ROOTDIR}" OPTIONS="${OPTIONS} -t ${ROOTDIR}"
ckcf_options="-t ${ROOTDIR}";
fi fi
conf_ok=0; conf_ok=0;
if [ -x /usr/sbin/named-checkconf ] && /usr/sbin/named-checkconf; then if [ -x /usr/sbin/named-checkconf ] && /usr/sbin/named-checkconf $ckcf_options; then
conf_ok=1; conf_ok=1;
else else
RETVAL=$?; RETVAL=$?;