diff --git a/bind.spec b/bind.spec index 9f2859d..47654d2 100644 --- a/bind.spec +++ b/bind.spec @@ -1,4 +1,4 @@ -%define server 1 + %define posix_threads 0 Summary: A DNS (Domain Name System) server. Name: bind @@ -25,7 +25,7 @@ Patch9: bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root Version: 9.2.4rc7 -Release: 8 +Release: 9 Epoch: 10 BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar Requires(pre,preun): shadow-utils @@ -67,7 +67,7 @@ servers. %package devel Summary: Include files and libraries needed for bind DNS development. Group: Development/Libraries -Requires: bind = %{epoch}:%{name}-%{version}-%{release} +Requires: bind = %{epoch}:%{version}-%{release} %description devel The bind-devel package contains all the include files and the library @@ -78,7 +78,7 @@ required for DNS (Domain Name System) development for BIND versions Summary: A chrooted tree for the BIND nameserver Group: System Environment/Daemons Prefix: /var/named/chroot -Requires: bind = %{version} +Requires: bind = %{epoch}:%{version}-%{release} %description chroot This package contains a tree of files which can be used as a @@ -95,8 +95,9 @@ based off code from Jan "Yenya" Kasprzak %attr(770,root,named) %prefix/var/run %attr(770,named,named) %prefix/var/tmp %attr(770,named,named) %prefix/var/run/named -%attr(750,named,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/data %post chroot safe_replace() @@ -171,9 +172,9 @@ do fi; safe_replace $f "%{prefix}$f" named named 644 '' || :; done -mknod "%{prefix}/dev/random" c 1 8 -mknod "%{prefix}/dev/zero" c 1 5 -mknod "%{prefix}/dev/null" c 1 3 +[ ! -e "%{prefix}/dev/random" ] && mknod "%{prefix}/dev/random" c 1 8 +[ ! -e "%{prefix}/dev/zero" ] && mknod "%{prefix}/dev/zero" c 1 5 +[ ! -e "%{prefix}/dev/null" ] && mknod "%{prefix}/dev/null" c 1 3 chmod a+r "%{prefix}/dev/random" "%{prefix}/dev/null" "%{prefix}/dev/" chown named:named "%{prefix}/var/named" chown named:named "%{prefix}/var/named/slaves" @@ -241,6 +242,7 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d} mkdir -p ${RPM_BUILD_ROOT}/usr/{bin,lib,sbin,include} mkdir -p ${RPM_BUILD_ROOT}/var/named mkdir -p ${RPM_BUILD_ROOT}/var/named/slaves +mkdir -p ${RPM_BUILD_ROOT}/var/named/data mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8} mkdir -p ${RPM_BUILD_ROOT}/var/run/named #chroot @@ -265,7 +267,6 @@ tar xjf %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/named -%if %server %pre /usr/sbin/groupadd -g 25 named >/dev/null 2>&1 || :; /usr/sbin/useradd -c "Named" -u 25 -g named \ @@ -274,30 +275,37 @@ cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/named %post if [ $1 = 1 ]; then /sbin/chkconfig --add named - if [ -f etc/named.boot -a ! -f etc/named.conf ]; then + if [ -f /etc/named.boot -a ! -f /etc/named.conf ]; then if [ -x /usr/sbin/named-bootconf ]; then - cat etc/named.boot | /usr/sbin/named-bootconf > etc/named.conf - chmod 644 etc/named.conf + cat /etc/named.boot | /usr/sbin/named-bootconf > /etc/named.conf + chmod 644 /etc/named.conf fi fi if [ ! -e /etc/rndc.key.rpmnew ]; then sed -e "s/@KEY@/`/usr/sbin/dns-keygen`/" /etc/rndc.key >/etc/rndc.key.tmp mv -f /etc/rndc.key.tmp /etc/rndc.key fi + if [ ! -s /etc/named.conf ]; then + echo ' +// Default named.conf generated by install of bind-'%{version}'-'%{release}' +options { + directory "/var/named"; + dump-file "/var/named/data/cache_dump.db"; + statistics-file "/var/named/data/named_stats.txt"; + }; +include "/etc/rndc.key"; +' > /etc/named.conf; + fi; if [ -x /sbin/restorecon ]; then # # Restore selinux file_context # /sbin/restorecon /etc/rndc.key /etc/rndc.conf fi - chmod 0640 /etc/rndc.conf etc/rndc.key - chown root:named /etc/rndc.conf etc/rndc.key + chmod 0640 /etc/rndc.conf /etc/rndc.key + chown root:named /etc/rndc.conf /etc/rndc.key /sbin/ldconfig fi -# -# Restore ownership of named.ca if caching-nameserver was previously installed: -# -[ -f /var/named/named.ca ] && chown named:named /var/named/named.ca exit 0 %preun @@ -318,7 +326,6 @@ fi %triggerpostun -- bind < 8.2.2_P5-15 /sbin/chkconfig --add named /sbin/ldconfig -%endif %clean rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version} @@ -327,7 +334,6 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version} %postun libs -p /sbin/ldconfig -%if %server %files %defattr(-,root,root) %doc CHANGES COPYRIGHT README @@ -348,7 +354,6 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version} %{_mandir}/man5/named.conf.5* %{_mandir}/man5/rndc.conf.5* -%{_mandir}/man5/resolver.5* %{_mandir}/man8/rndc.8* %{_mandir}/man8/named.8* %{_mandir}/man8/lwresd.8* @@ -359,8 +364,8 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version} %attr(750,root,named) %dir /var/named %attr(770,named,named) %dir /var/named/slaves +%attr(770,named,named) %dir /var/named/data %attr(770,named,named) %dir /var/run/named -%endif %files libs %defattr(-,root,root) @@ -378,7 +383,6 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version} %{_mandir}/man1/dig.1* %{_mandir}/man8/nslookup.8* -%if %server %files devel %defattr(-,root,root) %{_libdir}/*.a @@ -386,12 +390,21 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version} %{_mandir}/man3/* %{_bindir}/isc-config.sh %doc doc/draft doc/rfc -%endif %changelog +* Wed Aug 25 2004 Jason Vas Dias +- Remove resolver(5) manpage now in man-pages (bug 130792); +- Don't create /dev/ entries in bind-chroot if already there (bug 127556); +- fix bind-devel Requires (bug 130919) +- Set default location for dumpdb & stats files to /var/named/data + * Tue Aug 24 2004 Jason Vas Dias - Fix devel Requires for bug 130738 & fix version - + +* Tue Aug 24 2004 Jason Vas Dias +- Fix errors on clean install if named group does not exist +- (bug 130777) + * Thu Aug 19 2004 Jason Vas Dias - Upgrade to bind-9.2.4rc7; applied initscript fix - for bug 102035. diff --git a/sources b/sources index 63775f8..3589be3 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ f1266fa636426e2f3ce6771f09ce787f bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 79775b7afb05f62fa891eab8196b59d1 bind-9.2.4rc7.tar.gz -af38102dea2db4375bc6bf1fcb087d8f bind-chroot.tar.gz -dc12e280ee60c85dce46c501ba992f9b bind-manpages-2.tar.bz2 +3567c35a24cb83a8a69443a399bbb6c8 bind-chroot.tar.gz +3c3c3d412bf073c4f0008eff852683c5 bind-manpages-2.tar.bz2 1ae2dcc356623ef5fd130893e95a9b94 bind-manpages.patch.bz2