- 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 f5ef21ac74f3d64f5a839b1e1858242da0ce75d3..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:       14
+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
@@ -12,7 +12,7 @@ Source1:      %{name}-doc.tar.gz
 Source2:       ftp://ftp.innominate.org/gpa/djb/%{name}-%{version}-man.tar.gz
 # Source2-md5: 2b4e71fa4592858e4508538f78d50f61
 Source3:       http://www.sericyb.com.au/tinydns-notify
-# Source3-md5: 2213bdc8c58c10cb8770b7e5b0d67aea
+# 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
@@ -20,6 +20,10 @@ 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
@@ -30,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
@@ -87,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
@@ -125,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
@@ -159,7 +160,7 @@ Group:              Networking/Daemons
 License:       Free to use
 URL:           http://www.sericyb.com.au/tinydns-notify
 PreReq:                %{name} = %{version}
-Requires:      perl-Socket
+Requires:      perl-modules
 Requires:      perl-Net-DNS
 Obsoletes:     tinydns-notify
 
@@ -180,7 +181,6 @@ 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
@@ -216,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
@@ -251,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
@@ -288,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
@@ -327,6 +324,8 @@ informacji.
 %patch3 -p1
 %patch4 -p1
 %patch5
+%patch6 -p1
+%patch7 -p1
 cd doc
 ln -s merge/djbdns/* .
 
@@ -390,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
@@ -537,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
 ___