- Req user-named

[packages/bind.git] / bind.spec

diff --git a/bind.spec b/bind.spec
index e85853f94d8f3000430f6fae88d4bba4771047b5..03c370e33dd6b80cda0d39acbb808ca96af96deb 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -1,3 +1,8 @@
+#
+# Conditional build:
+# _without_ssl - don't build with OpenSSL support
+# _without_ipv6        - don't build IPv6 support
+#
 Summary:       BIND - DNS name server
 Summary(de):   BIND - DNS-Namenserver
 Summary(es):   BIND - Servidor de nombres DNS
@@ -7,10 +12,10 @@ Summary(pt_BR):      BIND - Servidor de nomes DNS
 Summary(ru):   BIND - cÅÒ×ÅÒ ÓÉÓÔÅÍÙ ÄÏÍÅÎÎÙÈ ÉÍÅÎ (DNS)
 Summary(tr):   DNS alan adý sunucusu
 Summary(uk):   BIND - cÅÒ×ÅÒ ÓÉÓÔÅÍÉ ÄÏÍÅÎÎÉÈ ¦ÍÅÎ (DNS)
-Summary(zh_CN):        Internet ÓòÃû·þÎñÆ÷ 
+Summary(zh_CN):        Internet ÓòÃû·þÎñÆ÷
 Name:          bind
-Version:       9.2.1
-Release:       9
+Version:       9.2.2
+Release:       1
 Epoch:         5
 License:       BSD-like
 Group:         Networking/Daemons
@@ -21,29 +26,28 @@ Source3:    named.sysconfig
 Source4:       named.logrotate
 Source5:       nslookup.8
 Source6:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
-Patch1:                %{name}-time.patch
-Patch2:                %{name}-autoconf.patch
-Patch3:                %{name}-sec-from-833.patch
+Patch0:                %{name}-time.patch
+Patch1:                %{name}-autoconf.patch
+Patch2:                %{name}-includedir-libbind.patch
+Patch3:                %{name}-link.patch
+Patch4:                %{name}-pmake.patch
 URL:           http://www.isc.org/products/BIND/bind9.html
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: libtool
-BuildRequires: openssl-devel
+%{!?_without_ssl:BuildRequires:        openssl-devel >= 0.9.7a}
 PreReq:                %{name}-libs = %{version}
 PreReq:                rc-scripts >= 0.2.0
 Requires(pre): fileutils
-Requires(pre): /usr/bin/getgid
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
+Requires(pre): user-named
 Requires(post,preun):  /sbin/chkconfig
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
 Requires:      psmisc >= 20.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides:      nameserver
 Obsoletes:     caching-nameserver
+Obsoletes:     nameserver
 Conflicts:     %{name}-chroot
 Conflicts:     kernel < 2.2.18
 
@@ -283,25 +287,27 @@ BIND.
 
 %prep
 %setup -q -a1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-cd lib/bind
-%patch3 -p3
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
-aclocal
+%{__aclocal}
 %{__autoconf}
 cd lib/bind
 %{__libtoolize}
-aclocal
+%{__aclocal}
 %{__autoconf}
 cd ../..
 %configure \
-       --with-openssl=%{_prefix} \
+       %{!?_without_ssl:--with-openssl=%{_prefix}} \
        --with-libtool \
        --enable-threads \
-       --enable-ipv6
+       %{!?_without_ipv6:--enable-ipv6} \
+       --enable-libbind
 %{__make}
 
 %install
@@ -347,24 +353,6 @@ if [ -f %{_sysconfdir}/named.boot ]; then
        mv -f %{_sysconfdir}/named.boot /etc/named.rpmsave
        echo "Warning: %{_sysconfdir}/named.boot saved as /etc/named.rpmsave." 1>&2
 fi
-if [ -n "`getgid named`" ]; then
-       if [ "`getgid named`" != "58" ]; then
-               echo "Error: group named doesn't have gid=58. Correct this before installing bind." 1>&2
-               exit 1
-       fi
-else
-       echo "Adding group named GID=58."
-       /usr/sbin/groupadd -g 58 named || exit 1
-fi
-if [ -n "`id -u named 2>/dev/null`" ]; then
-       if [ "`id -u named`" != "58" ]; then
-               echo "Error: user named doesn't have uid=58. Correct this before installing bind." 1>&2
-               exit 1
-       fi
-else
-       echo "Adding user named UID=58."
-       /usr/sbin/useradd -u 58 -g 58 -d /dev/null -s /bin/false -c "BIND user" named || exit 1
-fi
 
 %post
 /sbin/chkconfig --add named
@@ -382,14 +370,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del named
 fi
 
-%postun
-if [ "$1" = "0" ]; then
-       echo "Removing user named."
-       %{_sbindir}/userdel named
-       echo "Removing group named."
-       %{_sbindir}/groupdel named
-fi
-
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
@@ -456,7 +436,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*.sh
 %attr(755,root,root) %{_libdir}/*.so
-%attr(755,root,root) %{_libdir}/*.la
+%{_libdir}/*.la
 %{_includedir}/*
 %{_mandir}/man3/*