From 23760e2a150e76e54a2ce52c71e032aa376fb202 Mon Sep 17 00:00:00 2001 From: P J P Date: Jan 20 2013 12:11:09 +0000 Subject: Update to 1.05.6 --- diff --git a/.gitignore b/.gitignore index 2958cf9..5f98deb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ndjbdns-1.05.4.tar.gz /ndjbdns-1.05.5.tar.gz +/ndjbdns-1.05.6.tar.gz diff --git a/ndjbdns.spec b/ndjbdns.spec index 6645db9..ad50711 100644 --- a/ndjbdns.spec +++ b/ndjbdns.spec @@ -1,5 +1,5 @@ Name: ndjbdns -Version: 1.05.5 +Version: 1.05.6 Release: 1%{?dist} Summary: New djbdns: usable djbdns @@ -60,6 +60,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} install -p -m 644 axfrdns.service $RPM_BUILD_ROOT/%{_unitdir}/ install -p -m 644 dnscache.service $RPM_BUILD_ROOT/%{_unitdir}/ +install -p -m 644 rbldns.service $RPM_BUILD_ROOT/%{_unitdir}/ install -p -m 644 tinydns.service $RPM_BUILD_ROOT/%{_unitdir}/ rm -r $RPM_BUILD_ROOT/%{_initrddir}/ %else @@ -84,6 +85,9 @@ if [ $1 -eq 0 ]; then /sbin/systemctl --no-reload disable dnscache.service > /dev/null 2>&1 || : /sbin/systemctl stop dnscache.service > /dev/null 2>&1 || : + /sbin/systemctl --no-reload disable rbldns.service > /dev/null 2>&1 || : + /sbin/systemctl stop rbldns.service > /dev/null 2>&1 || : + /sbin/systemctl --no-reload disable tinydns.service > /dev/null 2>&1 || : /sbin/systemctl stop tinydns.service > /dev/null 2>&1 || : fi @@ -94,6 +98,7 @@ if [ $1 -ge 1 ]; then # Package upgrade, not uninstall /bin/systemctl try-restart axfrdns.service > /dev/null 2>&1 || : /bin/systemctl try-restart dnscache.service > /dev/null 2>&1 || : + /bin/systemctl try-restart rbldns.service > /dev/null 2>&1 || : /bin/systemctl try-restart tinydns.service > /dev/null 2>&1 || : fi @@ -104,16 +109,19 @@ fi %post %systemd_post axfrdns.service %systemd_post dnscache.service +%systemd_post rbldns.service %systemd_post tinydns.service %preun %systemd_preun axfrdns.service %systemd_preun dnscache.service +%systemd_preun rbldns.service %systemd_preun tinydns.service %postun %systemd_postun_with_restart axfrdns.service %systemd_postun_with_restart dnscache.service +%systemd_postun_with_restart rbldns.service %systemd_postun_with_restart tinydns.service %endif @@ -121,27 +129,32 @@ fi %if 0%{?rhel} == 6 || 0%{?rhel} == 5 %post -#/sbin/chkconfig --add axfrdnsd -/sbin/chkconfig --add dnscached -#/sbin/chkconfig --add tinydnsd +/sbin/chkconfig --add axfrdns +/sbin/chkconfig --add dnscache +/sbin/chkconfig --add rbldns +/sbin/chkconfig --add tinydns %preun if [ "$1" = 0 ]; then - /sbin/service axfrdnsd stop > /dev/null 2>&1 || : - /sbin/chkconfig --del axfrdnsd + /sbin/service axfrdns stop > /dev/null 2>&1 || : + /sbin/chkconfig --del axfrdns + + /sbin/service dnscache stop > /dev/null 2>&1 || : + /sbin/chkconfig --del dnscache - /sbin/service dnscached stop > /dev/null 2>&1 || : - /sbin/chkconfig --del dnscached + /sbin/service rbldns stop > /dev/null 2>&1 || : + /sbin/chkconfig --del rbldns - /sbin/service tinydnsd stop > /dev/null 2>&1 || : - /sbin/chkconfig --del tinydnsd + /sbin/service tinydns stop > /dev/null 2>&1 || : + /sbin/chkconfig --del tinydns fi %postun if [ "$1" -ge "1" ]; then - /sbin/service axfrdnsd restart > /dev/null 2>&1 || : - /sbin/service dnscached restart > /dev/null 2>&1 || : - /sbin/service tinydnsd restart > /dev/null 2>&1 || : + /sbin/service axfrdns restart > /dev/null 2>&1 || : + /sbin/service dnscache restart > /dev/null 2>&1 || : + /sbin/service rbldns restart > /dev/null 2>&1 || : + /sbin/service tinydns restart > /dev/null 2>&1 || : fi %endif @@ -162,6 +175,8 @@ fi %{_bindir}/dnstracesort %{_bindir}/dnstxt %{_bindir}/randomip +%{_bindir}/rbldns +%{_bindir}/rbldns-data %{_bindir}/tcprules %{_bindir}/tinydns %{_bindir}/tinydns-data @@ -171,19 +186,23 @@ fi %if 0%{?fedora} || 0%{?rhel} >= 7 %{_unitdir}/axfrdns.service %{_unitdir}/dnscache.service +%{_unitdir}/rbldns.service %{_unitdir}/tinydns.service %else -%{_initrddir}/axfrdnsd -%{_initrddir}/dnscached -%{_initrddir}/tinydnsd +%{_initrddir}/axfrdns +%{_initrddir}/dnscache +%{_initrddir}/rbldns +%{_initrddir}/tinydns %config(noreplace) %{_sysconfdir}/logrotate.d/ndjbdns %endif %config(noreplace) %{_sysconfdir}/%{name}/ip/127.0.0.1 -%config(noreplace) %{_sysconfdir}/%{name}/tinydns.conf -%config(noreplace) %{_sysconfdir}/%{name}/axfrdns.conf %config(noreplace) %{_sysconfdir}/%{name}/servers/roots + +%config(noreplace) %{_sysconfdir}/%{name}/axfrdns.conf %config(noreplace) %{_sysconfdir}/%{name}/dnscache.conf +%config(noreplace) %{_sysconfdir}/%{name}/rbldns.conf +%config(noreplace) %{_sysconfdir}/%{name}/tinydns.conf %{_mandir}/man1/axfrdns.1.gz %{_mandir}/man1/axfr-get.1.gz @@ -197,6 +216,8 @@ fi %{_mandir}/man1/dnsqr.1.gz %{_mandir}/man1/dnstrace.1.gz %{_mandir}/man1/dnstxt.1.gz +%{_mandir}/man1/rbldns.1.gz +%{_mandir}/man1/rbldns-data.1.gz %{_mandir}/man1/randomip.1.gz %{_mandir}/man1/tcprules.1.gz %{_mandir}/man1/tinydns.1.gz @@ -206,6 +227,14 @@ fi %changelog +* Sun Jan 14 2013 pjp - 1.05.6-1 +- Updated SysV scripts according to the packaging guidelines. +- Disabled system services by default, registerd all. + patch from: Simone Caronni +- Built rbldns & rbldns-data tools. +- Added systemd unit and Sys-v init files for rbldns server. +- Few minor changes to fix regressions, define uint32 type etc. + * Wed Dec 23 2012 pjp - 1.05.5-1 - Applied patch to make SOA responses cache-able. - Applied patch to merge identical outgoing requests. @@ -213,6 +242,9 @@ fi unit files for latest fedora and RHEL-7 distributions. patch from: Simone Caronni +* Fri Jul 20 2012 Fedora Release Engineering - 1.05.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Mar 13 2012 pjp - 1.05.4-9 - added logrotate configuration file /etc/logrotate.d/ndjbdns and a systemd service unit file: axfrdns.service. diff --git a/sources b/sources index d1ecb1d..362ea4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bab673eb03ba3aa13c003176f86f4c0e ndjbdns-1.05.5.tar.gz +40c1d4306c43f24b5216f1aafdbbfb7a ndjbdns-1.05.6.tar.gz