- made not conflict, so that using djbdns-dnscache + pdns is possible

[packages/djbdns.git] / djbdns.spec

diff --git a/djbdns.spec b/djbdns.spec
index 57bf65b57de9484c2d9275776db6246cabbe5e82..ec89c04c6c4297a0443b90222cac60eeb67d0f1e 100644 (file)
--- a/djbdns.spec
+++ b/djbdns.spec
@@ -2,7 +2,7 @@ Summary:        DJB DNS
 Summary(pl):   DJB DNS
 Name:          djbdns
 Version:       1.05
-Release:       13
+Release:       17
 License:       http://cr.yp.to/distributors.html (free to use)
 Group:         Networking/Daemons
 Source0:       http://cr.yp.to/djbdns/%{name}-%{version}.tar.gz
@@ -11,6 +11,8 @@ Source1:      %{name}-doc.tar.gz
 # Source1-md5: 1d6aed1a5d3d3eda3958fa3e7d808fc8
 Source2:       ftp://ftp.innominate.org/gpa/djb/%{name}-%{version}-man.tar.gz
 # Source2-md5: 2b4e71fa4592858e4508538f78d50f61
+Source3:       http://www.sericyb.com.au/tinydns-notify
+# NoSource3-md5:       2213bdc8c58c10cb8770b7e5b0d67aea
 Patch0:                dnscache-1.05-multiple-ip.patch
 Patch1:                http://www.fefe.de/dns/%{name}-1.05-ipv6.diff
 #              based on http://www.ohse.de/uwe/patches/djbdns-1.05-multiip.diff
@@ -18,7 +20,12 @@ Patch2:              %{name}-1.05-multiip.diff
 Patch3:                http://iksz.hu/package/djbdns-conf/djbdns-1.05-multi_tinydns_data.patch
 Patch4:                %{name}-srv.patch
 Patch5:                %{name}-glibc.patch
+# http://www.iecc.com/rbldns-patch.txt
+Patch6:         %{name}-rbldns_a.patch
+# http://tinydns.org/djbdns-1.05-ignoreip.patch
+Patch7:         %{name}-ignoreip.patch
 URL:           http://cr.yp.to/djbdns.html
+BuildRequires: rpm-perlprov
 Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
@@ -27,7 +34,6 @@ Requires(postun):     /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
 Provides:      nameserver
 Obsoletes:     caching-nameserver
-Obsoletes:     nameserver
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,6 +46,7 @@ packages:
 
  - djbdns-dnscache - a local DNS cache
  - djbdns-tinydns - a DNS server
+ - djbdns-tinydns-notify - a tool to send NOTIFY requests
  - djbdns-pickdns - a DNS load-balancing server
  - djbdns-walldns - a reverse DNS wall
  - djbdns-rbldns - an IP-address-listing DNS server
@@ -71,6 +78,7 @@ nast
 
  - djbdns-dnscache - lokalny cache DNS
  - djbdns-tinydns - serwer DNS
+ - djbdns-tinydns-notify - narzêdzie do wysy³ania komunikatów NOTIFY
  - djbdns-pickdns - serwer DNS do równowa¿enia obci±¿eñ
  - djbdns-walldns - ¶ciana dla odwrotnych zapytañ DNS
  - djbdns-rbldns - serwer DNS list adresów IP
@@ -82,7 +90,6 @@ Summary(de):  DJBs lokaler DNS-Cache
 Summary(pl):   Lokalny cache DNS od DJB
 Group:         Networking/Daemons
 PreReq:                %{name} = %{version}
-Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
@@ -120,7 +127,6 @@ Summary(de):        DJBs DNS-Server
 Summary(pl):   Serwer DNS od DJB
 Group:         Networking/Daemons
 PreReq:                %{name} = %{version}
-Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
@@ -147,13 +153,34 @@ tinydns jest serwerem DNS z pakietu djbdns. Przyjmuje on iteracyjne
 zapytania DNS od komputerów z ca³ego Internetu i odpowiada przy u¿yciu
 lokalnie skonfigurowanych informacji.
 
+%package tinydns-notify
+Summary:       DNS NOTIFY sending tool
+Summary(pl):   Narzêdzie do wysy³ania komunikatów DNS NOTIFY
+Group:         Networking/Daemons
+License:       Free to use
+URL:           http://www.sericyb.com.au/tinydns-notify
+PreReq:                %{name} = %{version}
+Requires:      perl-modules
+Requires:      perl-Net-DNS
+Obsoletes:     tinydns-notify
+
+%description tinydns-notify
+tinydns-notify is a tool written in Perl, which extracts zones
+and their nameservers from tinydns-data files and sends DNS NOTIFY
+requests to nameservers listed in notify-list file.
+
+%description tinydns-notify -l pl
+tinydns-notify jest napisanym w Perlu narzêdziem, które czyta pliki
+stref i odpowiadaj±ce im serwery nazw z plików tinydns-data, a
+nastêpnie wysy³a ¿±dania NOTIFY do serwerów wyspecyfikowanych w pliku
+notify-list.
+
 %package pickdns
 Summary:       DJB's load-balancing DNS server
 Summary(de):   DJBs Belastung ausgleichender DNS-Server
 Summary(pl):   Serwer DNS równowa¿±cy obci±¿enie od DJB
 Group:         Networking/Daemons
 PreReq:                %{name} = %{version}
-Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
@@ -189,7 +216,6 @@ Summary(de):        DJBs Wand r
 Summary(pl):   ¦ciana dla odwrotnych zapytañ DNS od DJB
 Group:         Networking/Daemons
 PreReq:                %{name} = %{version}
-Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
@@ -224,7 +250,6 @@ Summary(de):        DJBs IP-Adressen-Listen-DNS-Server
 Summary(pl):   Serwer DNS list adresów IP od DJB
 Group:         Networking/Daemons
 PreReq:                %{name} = %{version}
-Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
@@ -261,7 +286,6 @@ Summary(de):        DJBs DNS-Zonen-Transfer-Server
 Summary(pl):   Serwer transferów stref DNS od DJB
 Group:         Networking/Daemons
 PreReq:                %{name} = %{version}
-Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
@@ -300,6 +324,8 @@ informacji.
 %patch3 -p1
 %patch4 -p1
 %patch5
+%patch6 -p1
+%patch7 -p1
 cd doc
 ln -s merge/djbdns/* .
 
@@ -313,6 +339,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_sysconfdir}}
 install -d $RPM_BUILD_ROOT%{_mandir}/{man1,man5,man8}
 
+install %{SOURCE3}     $RPM_BUILD_ROOT%{_bindir}
+
 install dnsroots.global $RPM_BUILD_ROOT%{_sysconfdir}
 install        axfr-get        $RPM_BUILD_ROOT%{_bindir}
 install axfrdns                $RPM_BUILD_ROOT%{_bindir}
@@ -361,6 +389,7 @@ echo 127.0.0.1                   >env/IP
 echo 0.0.0.0                     >env/IPSEND
 echo 1000000                     >env/CACHESIZE
 echo 3000000                     >env/DATALIMIT
+touch env/IGNOREIP
 cat>run<<___
 #!/bin/sh
 exec 2>&1
@@ -508,6 +537,7 @@ data.cdb: data
 ___
 cat>data<<___
 # example
+# !10.11.12.13:See http://bad.example.com
 # :127.0.0.2:blacklisted"
 # 1.2.3.0/24
 ___
@@ -861,6 +891,10 @@ fi
 %{_mandir}/man8/tinydns*
 /service/tinydns
 
+%files tinydns-notify
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/tinydns-notify
+
 %files pickdns
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pickdns*