- converted to UTF-8

[packages/dhcp.git] / dhcp.spec

diff --git a/dhcp.spec b/dhcp.spec
index e39951a7ee85b58cb67970a8603747e8bd7804fd..788cce347451a8ee81c16f608b66daa0dd8a41b2 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -1,24 +1,40 @@
-Summary:       DHCP Server 
-Summary(pl):   Serwer DHCP 
+#
+# Conditional build:
+%bcond_with    ldap    # with support for ldap storage
+#
+Summary:       DHCP Server
+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
 Name:          dhcp

-Version:       3.0b2pl16
-Release:       1
-Epoch:         1
+Version:       3.1.0a3
+Release:       0.1
+Epoch:         4
+License:       distributable

 Group:         Networking/Daemons
 Group:         Networking/Daemons

-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
-Copyright:     distributable
-Vendor:                ISC

 Source0:       ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
 Source0:       ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz

+# Source0-md5: d09be1a80982b78482e8fbd416924468

 Source1:       %{name}.init
 Source2:       %{name}-relay.init
 Source3:       %{name}-relay.sysconfig
 Source4:       %{name}d.conf.sample
 Source5:       %{name}.sysconfig
 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}-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
 BuildRequires: groff

+%{?with_ldap:BuildRequires:    openldap-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)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

-Prereq:                /sbin/chkconfig
-Prereq:                        rc-scripts >= 0.2.0

 
 %description
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
 
 %description
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows


@@ -27,29 +43,49 @@ 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.
 
 etc.) from a DHCP server. The overall purpose of DHCP is to make it
 easier to administer a large network.
 

-%description -l pl
+%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
+funcionalidad similar, con ciertas restricciones. Este servidor
+también las atiende.
+
+%description -l pl.UTF-8

 Serwer DHCP (Dynamic Host Configuration Protocol).
 
 Serwer DHCP (Dynamic Host Configuration Protocol).
 

+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.
+
+%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
+software BETA.
+

 %package client
 Summary:       DHCP Client
 %package client
 Summary:       DHCP Client

-Summary(pl):   Klient DHCP 
+Summary(pl.UTF-8):   Klient DHCP

 Group:         Networking/Daemons
 Group:         Networking/Daemons

-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
+Requires(post):        fileutils
+Obsoletes:     dhclient

 Obsoletes:     pump
 
 %description client
 Dynamic Host Configuration Protocol Client.
 
 Obsoletes:     pump
 
 %description client
 Dynamic Host Configuration Protocol Client.
 

-%description -l pl client
+%description client -l pl.UTF-8

 Klient DHCP (Dynamic Host Configuration Protocol).
 
 %package relay
 Summary:       DHCP Relay Agent
 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
 Group:         Networking/Daemons

-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
+Requires(post):        fileutils
+Requires(post,preun):  /sbin/chkconfig

 Requires:      rc-scripts >= 0.2.0
 
 %description relay
 Requires:      rc-scripts >= 0.2.0
 
 %description relay


@@ -59,103 +95,149 @@ 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.
 
 not be routed off of the local subnet. The DHCP relay takes care of
 this for the client.
 

-%description -l pl relay
-Agent przekazywania DHCP (Dynamic Host Configuration Protocol) miêdzy
-podsieciami.
+%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.UTF-8):   Pliki nagłówkowe i biblioteki dla oprogramowania DHCP
+Group:         Development/Libraries
+
+%description devel
+Includes OMAPI and dhcptl libraries.
+
+OMAPI is an programming layer designed for controlling remote
+applications, and for querying them for their state. It is currently
+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.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.
+
+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
 install %{SOURCE4} .
 
 %prep
 %setup -q
 install %{SOURCE4} .

+%patch0 -p1
+%{?with_ldap:%patch1 -p1}
+%{?with_ldap:%patch2 -p1}
+%patch3 -p1
+# This patch is required for dhcdbd to function
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1

 
 %build
 
 %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
 
 ./configure
 

-%{__make} COPTS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} \
-       -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
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_mandir}/man{5,8}} \
+install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_bindir},%{_mandir}/man{5,8}} \

        $RPM_BUILD_ROOT{/var/lib/%{name},%{_sysconfdir}/{rc.d/init.d,sysconfig}}
 
 %{__make} install \
        $RPM_BUILD_ROOT{/var/lib/%{name},%{_sysconfdir}/{rc.d/init.d,sysconfig}}
 
 %{__make} install \

-       DESTDIR="$RPM_BUILD_ROOT" \
-       CLIENTBINDIR="/sbin" \
-       BINDIR="%{_sbindir}" \
-       ADMMANDIR="%{_mandir}/man8" \
+       DESTDIR=$RPM_BUILD_ROOT \
+       CLIENTBINDIR=/sbin \
+       BINDIR=%{_sbindir} \
+       LIBDIR=%{_libdir} \
+       INCDIR=%{_includedir} \
+       ADMMANDIR=%{_mandir}/man8 \

        ADMMANEXT=.8 \
        ADMMANEXT=.8 \

-       FFMANDIR="%{_mandir}/man5" \
-       VARDB="/var/lib/%{name}" \
+       FFMANDIR=%{_mandir}/man5 \
+       LIBMANDIR=%{_mandir}/man3 \
+       LIBMANEXT=.3 \
+       USRMANDIR=%{_mandir}/man1 \
+       USRMANEXT=.1 \
+       VARDB=/var/lib/%{name} \

        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
        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%{_sysconfdir}/dhcpd.conf

 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/dhcpd
 
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/dhcpd
 

-install client/scripts/linux $RPM_BUILD_ROOT%{_sysconfdir}/dhclient-script
+mv $RPM_BUILD_ROOT%{_mandir}/man3/omshell.3 \
+       $RPM_BUILD_ROOT%{_mandir}/man1/omshell.1

 
 

-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
 
 
 touch $RPM_BUILD_ROOT/var/lib/%{name}/{dhcpd,dhclient}.leases
 

+%clean
+rm -rf $RPM_BUILD_ROOT
+

 %post
 /sbin/chkconfig --add dhcpd
 touch /var/lib/%{name}/dhcpd.leases
 %post
 /sbin/chkconfig --add dhcpd
 touch /var/lib/%{name}/dhcpd.leases

+%service dhcpd restart "dhcpd daemon"

 
 

-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
-
-%post relay
-/sbin/chkconfig --add dhcrelay
-
-if [ -f /var/lock/subsys/dhcrelay ]; then
-       /etc/rc.d/init.d/dhcrelay restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/dhcrelay start\" to start dhcrelay daemon."
+%preun
+if [ "$1" = "0" ];then
+       %service dhcpd stop
+       /sbin/chkconfig --del dhcpd

 fi
 
 %post client
 fi
 
 %post client

-if [ -d /var/lib/dhcp ]; then
+# TODO: fix this
+if [ ! -d /var/lib/dhcp ]; then

        install -d /var/lib/dhcp
 fi
 
        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
+%post relay
+/sbin/chkconfig --add dhcp-relay
+if [ -f /var/lock/subsys/dhcrelay ]; then
+       mv -f /var/lock/subsys/{dhcrelay,dhcp-relay}

 fi
 fi

+%service dhcp-relay restart "dhcrelay daemon"

 
 %preun relay
 if [ "$1" = "0" ];then
 
 %preun relay
 if [ "$1" = "0" ];then

-       if [ -f /var/lock/subsys/dhcrelay ]; then
-               /etc/rc.d/init.d/dhrelay stop >&2
-       fi
-       /sbin/chkconfig --del dhcrelay
+       %service dhcp-relay stop
+       /sbin/chkconfig --del dhcp-relay

 fi
 
 fi
 

-%clean
-rm -rf $RPM_BUILD_ROOT
+%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
+       mv -f /etc/dhcpd.conf.tmp /etc/dhcpd.conf
+fi

 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc doc/* README.gz RELNOTES.gz dhcpd.conf.sample
+%doc doc/* README RELNOTES dhcpd.conf.sample
+%{?with_ldap:%doc contrib/*}
+%{_mandir}/man1/*

 %{_mandir}/man5/dhcp*
 %{_mandir}/man8/dhcp*
 %{_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
 %attr(750,root,root) %dir /var/lib/%{name}
 %attr(755,root,root) %{_sbindir}/dhcpd
 %attr(754,root,root) /etc/rc.d/init.d/dhcpd
 %attr(750,root,root) %dir /var/lib/%{name}


@@ -164,13 +246,19 @@ rm -rf $RPM_BUILD_ROOT
 %files client
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/dhclient
 %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
 
 %files relay
 %defattr(644,root,root,755)
 %{_mandir}/man8/dhcrelay*
 %{_mandir}/man[58]/dhclient*
 %ghost /var/lib/%{name}/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
 %attr(755,root,root) %{_sbindir}/dhcrelay
 %attr(754,root,root) /etc/rc.d/init.d/dhcp-relay

+
+%files devel
+%defattr(644,root,root,755)
+%{_mandir}/man3/*
+%{_libdir}/*.a
+%{_includedir}/*