- updated to 3.0pl2: security fix.

[packages/dhcp.git] / dhcp.spec

diff --git a/dhcp.spec b/dhcp.spec
index f835503aca72607ea5230becf89eec057d6717dc..34853c6a6619b7e1f5a85b848f9b49e7f8597620 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -1,8 +1,10 @@
 Summary:       DHCP Server
+Summary(es):   Servidor DHCP (Protocolo de configuración dinámica de hosts)
 Summary(pl):   Serwer DHCP
+Summary(pt_BR):        Servidor DHCP (Protocolo de configuração dinâmica de hosts)
 Name:          dhcp
-Version:       3.0
-Release:       3
+Version:       3.0pl2
+Release:       1
 Epoch:         2
 Vendor:                ISC
 License:       distributable
@@ -13,9 +15,11 @@ Source2:     %{name}-relay.init
 Source3:       %{name}-relay.sysconfig
 Source4:       %{name}d.conf.sample
 Source5:       %{name}.sysconfig
+Patch0:                %{name}-sh.patch
 BuildRequires: groff
-Prereq:                rc-scripts >= 0.2.0
-Prereq:                /sbin/chkconfig
+PreReq:                rc-scripts >= 0.2.0
+Requires(post,preun):  /sbin/chkconfig
+Requires(post):        fileutils
 Provides:      dhcpd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -26,6 +30,14 @@ configuration information (IP address, subnetmask, broadcast address,
 etc.) from a DHCP server. The overall purpose of DHCP is to make it
 easier to administer a large network.
 
+%description -l es
+DHCP permite que hosts en una red TCP/IP soliciten y tengan sus
+direcciones IP alocadas dinámicamente, permite también descubrir
+información sobre la red en que están conectados. BOOTP provee una
+funcionalidad similar, con ciertas restricciones. Este servidor
+también las atiende. Esta versión aún está considerada como un
+software BETA.
+
 %description -l pl
 Serwer DHCP (Dynamic Host Configuration Protocol).
 
@@ -34,10 +46,19 @@ pobieranie ich konfiguracji IP (adresu, maski podsieci, adresu
 rozg³oszeniowego itp.) z serwera DHCP. U³atwia on administrowanie
 du¿ymi sieciami IP.
 
+%description -l pt_BR
+DHCP permite que hosts numa rede TCP/IP requisitem e tenham seus
+endereços IP alocados dinamicamente, permite também descobrir
+informações sobre a rede em que estão conectados. BOOTP provê uma
+funcionalidade similar, com certas restrições. Este servidor também
+atende aquelas requisições. Esta versão é ainda considerada um
+software BETA.
+
 %package client
 Summary:       DHCP Client
 Summary(pl):   Klient DHCP
 Group:         Networking/Daemons
+Requires(post):        fileutils
 Obsoletes:     pump
 
 %description client
@@ -50,8 +71,9 @@ Klient DHCP (Dynamic Host Configuration Protocol).
 Summary:       DHCP Relay Agent
 Summary(pl):   Agent przekazywania informacji DHCP
 Group:         Networking/Daemons
-Prereq:                rc-scripts >= 0.2.0
-Prereq:                /sbin/chkconfig
+PreReq:                rc-scripts >= 0.2.0
+Requires(post,preun):  /sbin/chkconfig
+Requires(post):        fileutils
 
 %description relay
 Dhcp relay is a relay agent for DHCP packets. It is used on a subnet
@@ -92,6 +114,7 @@ komunikacji z dzia
 
 %prep
 %setup -q
+%patch0 -p1
 install %{SOURCE4} .
 
 %build
@@ -133,9 +156,7 @@ install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/dhcpd
 mv $RPM_BUILD_ROOT%{_mandir}/man3/omshell.3 \
        $RPM_BUILD_ROOT%{_mandir}/man1/omshell.1
 
-install client/scripts/linux $RPM_BUILD_ROOT%{_sysconfdir}/dhclient-script
-
-gzip -9nf doc/* README RELNOTES
+install client/scripts/linux $RPM_BUILD_ROOT%{_sbindir}/dhclient-script
 
 touch $RPM_BUILD_ROOT/var/lib/%{name}/{dhcpd,dhclient}.leases
 
@@ -156,10 +177,23 @@ else
        echo "Run \"/etc/rc.d/init.d/dhcpd start\" to start dhcpd daemon."
 fi
 
+%preun
+if [ "$1" = "0" ];then
+       if [ -f /var/lock/subsys/dhcpd ]; then
+               /etc/rc.d/init.d/dhcpd stop >&2
+       fi
+       /sbin/chkconfig --del dhcpd
+fi
+
+%post client
+if [ -d /var/lib/dhcp ]; then
+       install -d /var/lib/dhcp
+fi
+
 %post relay
 /sbin/chkconfig --add dhcp-relay
 if [ -f /var/lock/subsys/dhcrelay ]; then
-       mv /var/lock/subsys/dhcrelay /var/lock/subsys/dhcp-relay
+       mv -f /var/lock/subsys/dhcrelay /var/lock/subsys/dhcp-relay
 fi
 if [ -f /var/lock/subsys/dhcp-relay ]; then
        /etc/rc.d/init.d/dhcp-relay restart >&2
@@ -167,19 +201,6 @@ else
        echo "Run \"/etc/rc.d/init.d/dhcp-relay start\" to start dhcrelay daemon."
 fi
 
-%post client
-if [ -d /var/lib/dhcp ]; then
-       install -d /var/lib/dhcp
-fi
-
-%preun
-if [ "$1" = "0" ];then
-       if [ -f /var/lock/subsys/dhcpd ]; then
-               /etc/rc.d/init.d/dhcpd stop >&2
-       fi
-       /sbin/chkconfig --del dhcpd
-fi
-
 %preun relay
 if [ "$1" = "0" ];then
        if [ -f /var/lock/subsys/dhcp-relay ]; then
@@ -190,6 +211,7 @@ fi
 
 %triggerpostun -- dhcp < 3.0
 if [ `grep ddns-update-style /etc/dhcpd.conf` = "" ]; then
+       umask 027
        echo "ddns-update-style none;" > /etc/dhcpd.conf.tmp
        echo "" >> /etc/dhcpd.conf.tmp
        cat /etc/dhcpd.conf >>/etc/dhcpd.conf.tmp
@@ -198,7 +220,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/* README.gz RELNOTES.gz dhcpd.conf.sample
+%doc doc/* README RELNOTES dhcpd.conf.sample
 %{_mandir}/man1/*
 %{_mandir}/man5/dhcp*
 %{_mandir}/man8/dhcp*
@@ -212,7 +234,7 @@ fi
 %files client
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/dhclient
-%attr(755,root,root) %{_sysconfdir}/dhclient-script
+%attr(755,root,root) /sbin/dhclient-script
 %{_mandir}/man[58]/dhclient*
 %ghost /var/lib/%{name}/dhclient.leases