X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dhcp.spec;h=788cce347451a8ee81c16f608b66daa0dd8a41b2;hb=39cd54ba3c88bfcd99bce00c7c2ddf4b1539ce15;hp=ff01000befa1e040c9061f6dcf28e571669d608b;hpb=2676ba81c329d1f2addd3bb113adc3e92b884e50;p=packages%2Fdhcp.git diff --git a/dhcp.spec b/dhcp.spec index ff01000..788cce3 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,18 +1,19 @@ -%bcond_with ldap # added support for ldap storage +# +# Conditional build: +%bcond_with ldap # with support for ldap storage +# 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) +Summary(es.UTF-8): Servidor DHCP +Summary(pl.UTF-8): Serwer DHCP +Summary(pt_BR.UTF-8): Servidor DHCP (Protocolo de configuração dinâmica de hosts) Name: dhcp -Version: 3.0.1rc14 -Release: 1.1 -Epoch: 2 -Vendor: ISC +Version: 3.1.0a3 +Release: 0.1 +Epoch: 4 License: distributable Group: Networking/Daemons -#Source0: ftp://ftp.freenet.de/pub/ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz Source0: ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz -# Source0-md5: a68074d9ebdeb355c293d9b3645b3c2c +# Source0-md5: d09be1a80982b78482e8fbd416924468 Source1: %{name}.init Source2: %{name}-relay.init Source3: %{name}-relay.sysconfig @@ -21,12 +22,17 @@ Source5: %{name}.sysconfig Patch0: %{name}-if_buffer_size.patch Patch1: %{name}-ldap.patch Patch2: %{name}-ldap1.patch +Patch3: %{name}-client-script-redhat.patch +Patch4: %{name}-3.0.3-x-option.patch +Patch5: %{name}-typo.patch +Patch6: %{name}-arg-concat.patch URL: http://www.isc.org/sw/dhcp/ BuildRequires: groff %{?with_ldap:BuildRequires: openldap-devel} -PreReq: rc-scripts >= 0.2.0 -Requires(post,preun): /sbin/chkconfig +BuildRequires: rpmbuild(macros) >= 1.268 Requires(post): fileutils +Requires(post,preun): /sbin/chkconfig +Requires: rc-scripts >= 0.2.0 Provides: dhcpd BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -37,50 +43,50 @@ 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 +%description -l es.UTF-8 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 +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. +también las atiende. -%description -l pl +%description -l pl.UTF-8 Serwer DHCP (Dynamic Host Configuration Protocol). -DHCP to protokó³ pozwalaj±cy urz±dzeniom pracuj±cym w sieci IP na +DHCP to protokół pozwalający urządzeniom pracującym w sieci IP na pobieranie ich konfiguracji IP (adresu, maski podsieci, adresu -rozg³oszeniowego itp.) z serwera DHCP. U³atwia on administrowanie -du¿ymi sieciami IP. +rozgłoszeniowego itp.) z serwera DHCP. Ułatwia on administrowanie +dużymi sieciami IP. -%description -l pt_BR +%description -l pt_BR.UTF-8 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 +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 +Summary(pl.UTF-8): Klient DHCP Group: Networking/Daemons Requires(post): fileutils +Obsoletes: dhclient Obsoletes: pump %description client Dynamic Host Configuration Protocol Client. -%description client -l pl +%description client -l pl.UTF-8 Klient DHCP (Dynamic Host Configuration Protocol). %package relay Summary: DHCP Relay Agent -Summary(pl): Agent przekazywania informacji DHCP +Summary(pl.UTF-8): Agent przekazywania informacji DHCP Group: Networking/Daemons -PreReq: rc-scripts >= 0.2.0 -Requires(post,preun): /sbin/chkconfig Requires(post): fileutils +Requires(post,preun): /sbin/chkconfig +Requires: rc-scripts >= 0.2.0 %description relay Dhcp relay is a relay agent for DHCP packets. It is used on a subnet @@ -89,15 +95,15 @@ DHCP server on it. Because DHCP packets can be broadcast, they will not be routed off of the local subnet. The DHCP relay takes care of this for the client. -%description relay -l pl -Agent przekazywania DHCP (Dynamic Host Configuration Protocol) miêdzy -podsieciami. Poniewa¿ komunikaty DHCP mog± byæ przekazywane w formie -rozg³oszeniowej, bez tego agenta nie zostan± przerutowane do innej +%description relay -l pl.UTF-8 +Agent przekazywania DHCP (Dynamic Host Configuration Protocol) między +podsieciami. Ponieważ komunikaty DHCP mogą być przekazywane w formie +rozgłoszeniowej, bez tego agenta nie zostaną przerutowane do innej podsieci. %package devel Summary: DHCP development includes and libs -Summary(pl): Pliki nag³ówkowe i biblioteki dla oprogramowania DHCP +Summary(pl.UTF-8): Pliki nagłówkowe i biblioteki dla oprogramowania DHCP Group: Development/Libraries %description devel @@ -110,14 +116,14 @@ used by the ISC DHCP server. The dhcpctl set of functions provide an API that can be used to communicate with and manipulate a running ISC DHCP server. -%description devel -l pl +%description devel -l pl.UTF-8 Zawiera biblioteki OMAPI oraz dhcpctl. OMAPI to warstwa programowa stworzona do kontroli zdalnych aplikacji i -odpytywania o ich stan. Aktualnie jest u¿ywana przez serwer ISC DHCP. +odpytywania o ich stan. Aktualnie jest używana przez serwer ISC DHCP. -dhcpctl to zbiór funkcji tworz±cych API, które mo¿e byæ u¿ywane do -komunikacji z dzia³aj±cym serwerem ISC DHCP i jego kontroli. +dhcpctl to zbiór funkcji tworzących API, które może być używane do +komunikacji z działającym serwerem ISC DHCP i jego kontroli. %prep %setup -q @@ -125,22 +131,26 @@ install %{SOURCE4} . %patch0 -p1 %{?with_ldap:%patch1 -p1} %{?with_ldap:%patch2 -p1} - -cd doc -echo "dhcpd complies with the following RFCs:" > rfc-compliance -ls rfc*.txt >> rfc-compliance -rm -f rfc*.txt -cd .. +%patch3 -p1 +# This patch is required for dhcdbd to function +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build -# Notice: this is not autoconf configure!!!!!!! -# do not change it to %%configure +# NOTE: this is not autoconf configure - do not change it to %%configure ./configure -%{__make} COPTS="%{rpmcflags} \ - -D_PATH_DHCPD_DB=\\\"/var/lib/%{name}/dhcpd.leases\\\" \ - -D_PATH_DHCLIENT_DB=\\\"/var/lib/%{name}/dhclient.leases\\\"" \ - DEBUG="" VARDB="/var/lib/%{name}" +%{__make} \ + CC="%{__cc}" \ + CC_OPTIONS="%{rpmcflags} \ + -D_PATH_DHCPD_DB=\\\"/var/lib/%{name}/dhcpd.leases\\\" \ + -DEXTENDED_NEW_OPTION_INFO \ + -D_PATH_DHCLIENT_DB=\\\"/var/lib/%{name}/dhclient.leases\\\" \ + " + LFLAGS="%{rpmldflags}" \ + DEBUG="" \ + VARDB="/var/lib/%{name}" %install rm -rf $RPM_BUILD_ROOT @@ -166,6 +176,7 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_bindir},%{_mandir}/man{5,8}} \ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcpd install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcp-relay install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/dhcp-relay +install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/dhcpd.conf install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/dhcpd mv $RPM_BUILD_ROOT%{_mandir}/man3/omshell.3 \ @@ -181,51 +192,35 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add dhcpd touch /var/lib/%{name}/dhcpd.leases - -if [ ! -d /var/lib/dhcp ]; then - install -d /var/lib/dhcp -fi - -if [ -f /var/lock/subsys/dhcpd ]; then - /etc/rc.d/init.d/dhcpd restart >&2 -else - echo "Run \"/etc/rc.d/init.d/dhcpd start\" to start dhcpd daemon." -fi +%service dhcpd restart "dhcpd daemon" %preun if [ "$1" = "0" ];then - if [ -f /var/lock/subsys/dhcpd ]; then - /etc/rc.d/init.d/dhcpd stop >&2 - fi + %service dhcpd stop /sbin/chkconfig --del dhcpd fi %post client -if [ -d /var/lib/dhcp ]; then +# TODO: fix this +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 -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 -else - echo "Run \"/etc/rc.d/init.d/dhcp-relay start\" to start dhcrelay daemon." + mv -f /var/lock/subsys/{dhcrelay,dhcp-relay} fi +%service dhcp-relay restart "dhcrelay daemon" %preun relay if [ "$1" = "0" ];then - if [ -f /var/lock/subsys/dhcp-relay ]; then - /etc/rc.d/init.d/dhcp-relay stop >&2 - fi + %service dhcp-relay stop /sbin/chkconfig --del dhcp-relay fi %triggerpostun -- dhcp < 3.0 -if [ `grep ddns-update-style /etc/dhcpd.conf` = "" ]; then +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 @@ -240,7 +235,8 @@ fi %{_mandir}/man1/* %{_mandir}/man5/dhcp* %{_mandir}/man8/dhcp* -%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/dhcpd +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcpd +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcpd.conf %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_sbindir}/dhcpd %attr(754,root,root) /etc/rc.d/init.d/dhcpd @@ -257,7 +253,7 @@ fi %files relay %defattr(644,root,root,755) %{_mandir}/man8/dhcrelay* -%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/dhcp-relay +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcp-relay %attr(755,root,root) %{_sbindir}/dhcrelay %attr(754,root,root) /etc/rc.d/init.d/dhcp-relay