%bcond_with ldap # with support for ldap storage
#
Summary: DHCP Server
-Summary(es): Servidor DHCP
-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.2
-Release: 2.1
-Epoch: 3
-Vendor: ISC
+%define _pre a3
+Version: 3.1.0
+Release: 0.%{_pre}.1
+Epoch: 4
License: distributable
Group: Networking/Daemons
-Source0: ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-# Source0-md5: 04800a111521e7442749b2ce883f962b
+Source0: ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}%{_pre}.tar.gz
+# Source0-md5: d09be1a80982b78482e8fbd416924468
Source1: %{name}.init
Source2: %{name}-relay.init
Source3: %{name}-relay.sysconfig
Source4: %{name}d.conf.sample
Source5: %{name}.sysconfig
-Patch0: %{name}-if_buffer_size.patch
-Patch1: %{name}-ldap.patch
-Patch2: %{name}-ldap1.patch
-Patch3: %{name}-gcc343-fix.patch
+Patch0: %{name}-dhclient.script.patch
+Patch1: %{name}-if_buffer_size.patch
+# http://home.ntelos.net/~masneyb/dhcp-3.0.5-ldap-patch
+Patch2: %{name}-ldap.patch
+Patch3: %{name}-client-script-redhat.patch
+Patch4: %{name}-3.0.3-x-option.patch
+Patch5: %{name}-typo.patch
+Patch6: %{name}-arg-concat.patch
+Patch7: %{name}-split-VARDB.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
+%{?with_ldap:BuildRequires: openssl-devel}
+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)
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.
+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: pump
+Requires: coreutils
+Requires: iproute2
+Requires: net-tools
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
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
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
+%setup -q -n %{name}-%{version}%{_pre}
install %{SOURCE4} .
%patch0 -p1
-%{?with_ldap:%patch1 -p1}
+%patch1 -p1
%{?with_ldap:%patch2 -p1}
+# These two patches are required for dhcdbd to function
%patch3 -p1
-
-cd doc
-echo "dhcpd complies with the following RFCs:" > rfc-compliance
-ls rfc*.txt >> rfc-compliance
-rm -f rfc*.txt
-cd ..
+%patch4 -p1
+#
+%patch5 -p1
+%patch6 -p1
+%patch7 -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\\\" \
- -DUSE_SOCKET_FALLBACK" \
- DEBUG="" VARDB="/var/lib/%{name}"
+ CC="%{__cc}" \
+ CC_OPTIONS="%{rpmcflags} \
+ -D_PATH_DHCPD_DB=\\\"/var/lib/%{name}/dhcpd.leases\\\" \
+ -DEXTENDED_NEW_OPTION_INFO \
+ -D_PATH_DHCLIENT_DB=\\\"/var/lib/dhclient/dhclient.leases\\\" \
+ "
+ LFLAGS="%{rpmldflags}" \
+ DEBUG="" \
+ VARDBS="/var/lib/%{name}"
+ VARDBC="/var/lib/dhclient"
%install
rm -rf $RPM_BUILD_ROOT
LIBMANEXT=.3 \
USRMANDIR=%{_mandir}/man1 \
USRMANEXT=.1 \
- VARDB=/var/lib/%{name} \
+ VARDBS=/var/lib/%{name} \
+ VARDBC=/var/lib/dhclient \
FFMANEXT=.5
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/etc/dhcpd.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/dhcpd.conf
install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/dhcpd
mv $RPM_BUILD_ROOT%{_mandir}/man3/omshell.3 \
install client/scripts/linux $RPM_BUILD_ROOT%{_sbindir}/dhclient-script
-touch $RPM_BUILD_ROOT/var/lib/%{name}/{dhcpd,dhclient}.leases
+touch $RPM_BUILD_ROOT/var/lib/%{name}/dhcpd.leases
+touch $RPM_BUILD_ROOT/var/lib/dhclient/dhclient.leases
%clean
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
- install -d /var/lib/dhcp
+if [ -f /var/lib/dhcp/dhclient.leases.rpmsave ]; then
+ mv /var/lib/dhcp/dhclient.leases.rpmsave /var/lib/dhclient/dhclient.leases
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
%files
%defattr(644,root,root,755)
-%doc doc/* README RELNOTES dhcpd.conf.sample
+%doc doc/* README RELNOTES dhcpd.conf.sample LICENSE
%{?with_ldap:%doc contrib/*}
%{_mandir}/man1/*
%{_mandir}/man5/dhcp*
%{_mandir}/man8/dhcp*
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/dhcpd
-%config(noreplace) %verify(not size mtime md5) /etc/dhcpd.conf
+%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
%attr(755,root,root) /sbin/dhclient
%attr(755,root,root) /sbin/dhclient-script
%{_mandir}/man[58]/dhclient*
-%ghost /var/lib/%{name}/dhclient.leases
+%attr(750,root,root) %dir /var/lib/dhclient
+%ghost /var/lib/dhclient/dhclient.leases
%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
projects / packages / dhcp.git / blobdiff