OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Dec-2007 13:27:52
Branch: HEAD Handle: 2007122012275001
Modified files:
openpkg-src/dhcpd dhcpd.spec fsl.dhcpd rc.dhcpd
Removed files:
openpkg-src/dhcpd dhcpd.patch
Log:
upgrade to ISC DHCPd 4.0
Summary:
Revision Changes Path
1.8 +0 -12 openpkg-src/dhcpd/dhcpd.patch
1.101 +29 -47 openpkg-src/dhcpd/dhcpd.spec
1.2 +37 -1 openpkg-src/dhcpd/fsl.dhcpd
1.21 +16 -8 openpkg-src/dhcpd/rc.dhcpd
____________________________________________________________________________
rm -f openpkg-src/dhcpd/dhcpd.patch <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.100 -r1.101 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 27 Oct 2007 11:59:21 -0000 1.100
+++ openpkg-src/dhcpd/dhcpd.spec 20 Dec 2007 12:27:51 -0000 1.101
@@ -32,8 +32,8 @@
Class: BASE
Group: DHCP
License: ISC/BSD
-Version: 3.1.0
-Release: 20071027
+Version: 4.0.0
+Release: 20071220
# package options
%option with_fsl yes
@@ -43,7 +43,6 @@
Source1: dhcpd.conf
Source2: rc.dhcpd
Source3: fsl.dhcpd
-Patch0: dhcpd.patch
# build information
Prefix: %{l_prefix}
@@ -69,51 +68,29 @@
%prep
%setup -q -n dhcp-%{version}
- %patch -p0
- %{l_shtool} subst \
- -e 's;^\(MANCAT.*\)[a-zA-Z0-9\.\-\/]*;\1man;' \
- Makefile.conf
- %{l_shtool} subst \
- -e 's;nroff;true;g' \
- `find . -name "Makefile.dist" -print`
%build
# configure program
- ( echo 'CC = %{l_cc}'
- echo 'CFLAGS = %{l_cflags -O}'
-%if "%{with_fsl}" == "yes"
- echo 'LDFLAGS = %{l_fsl_ldflags}'
- echo 'LIBS = %{l_fsl_ldflags} %{l_fsl_libs}'
-%endif
- echo 'USERBINDIR = %{l_prefix}/bin'
- echo 'BINDIR = %{l_prefix}/sbin'
- echo 'CLIENTBINDIR = %{l_prefix}/sbin'
- echo 'ADMMANDIR = %{l_prefix}/man/man8'
- echo 'ADMMANEXT = .8'
- echo 'FFMANDIR = %{l_prefix}/man/man5'
- echo 'FFMANEXT = .5'
- echo 'LIBMANDIR = %{l_prefix}/man/man3'
- echo 'LIBMANEXT = .3'
- echo 'USRMANDIR = %{l_prefix}/man/man1'
- echo 'USRMANEXT = .1'
- echo 'MANCAT = man'
- echo 'ETC = %{l_prefix}/etc/dhcpd'
- echo 'VARRUN = %{l_prefix}/var/dhcpd'
- echo 'VARDB = %{l_prefix}/var/dhcpd'
- echo 'LIBDIR = %{l_prefix}/lib'
- echo 'INCDIR = %{l_prefix}/include/dhcpd'
- echo 'INSTALL = %{l_shtool} install -c'
- echo 'MANINSTALL = %{l_shtool} install -c'
- ) >>site.conf
%{l_shtool} subst \
- -e 's; -Werror; ;' \
- Makefile.conf
- ./configure
- %{l_shtool} subst \
- -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_PID[^"]*\).*;\1
"%{l_prefix}/var/dhcpd/dhcpd.pid";' \
- -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_DB[^"]*\).*;\1
"%{l_prefix}/var/dhcpd/dhcpd.leases";' \
+ -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_PID[^"]*\).*;\1
"%{l_prefix}/var/dhcpd/run/dhcpd.pid";' \
+ -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_DB[^"]*\).*;\1
"%{l_prefix}/var/dhcpd/db/dhcpd.leases";' \
-e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_CONF[^"]*\).*;\1
"%{l_prefix}/etc/dhcpd/dhcpd.conf";' \
includes/site.h
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags} -DNOMINUM" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --sysconfdir=%{l_prefix}/etc/dhcpd \
+ --localstatedir=%{l_prefix}/var/dhcpd \
+ --with-srv-lease-file=%{l_prefix}/var/dhcpd/db/dhcpd.leases \
+ --with-cli-lease-file=%{l_prefix}/var/dhcpd/db/dhclient.leases \
+ --with-srv-pid-file=%{l_prefix}/var/dhcpd/run/dhcpd.pid \
+ --with-cli-pid-file=%{l_prefix}/var/dhcpd/run/dhclient.pid \
+ --with-relay-pid-file=%{l_prefix}/var/dhcpd/run/dhrelay.pid
# build program
%{l_make} %{l_mflags}
@@ -129,7 +106,6 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/dhcpd/dhcpd.conf
# post-adjust and strip down installation
- chmod a-x $RPM_BUILD_ROOT%{l_prefix}/man/man*/*
rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/dhclient-script
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/dhclient-script.8
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
@@ -147,16 +123,22 @@
%{SOURCE fsl.dhcpd} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ # create run-time directories
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/db \
+ $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/run \
+ $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/log
+
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/fsl/fsl.dhcpd' \
- '%config %{l_prefix}/etc/dhcpd/dhcpd.conf'
+ '%config %{l_prefix}/etc/dhcpd/*'
%files -f files
%clean
- rm -rf $RPM_BUILD_ROOT
+ rm -rf $RPM_BUILD_ROOT
%post
if [ $1 -eq 1 ]; then
@@ -177,7 +159,7 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} dhcpd stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/dhcpd/dhcpd.log* >/dev/null 2>&1 || true
- rm -f $RPM_INSTALL_PREFIX/var/dhcpd/dhcpd.leases~ >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/dhcpd/db/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/dhcpd/run/* >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/fsl.dhcpd
============================================================================
$ cvs diff -u -r1.1 -r1.2 fsl.dhcpd
--- openpkg-src/dhcpd/fsl.dhcpd 26 Jul 2003 19:18:27 -0000 1.1
+++ openpkg-src/dhcpd/fsl.dhcpd 20 Dec 2007 12:27:51 -0000 1.2
@@ -8,7 +8,43 @@
)
-> {
debug: file(
- path="@l_prefix@/var/dhcpd/dhcpd.log",
+ path="@l_prefix@/var/dhcpd/log/dhcpd.log",
+ perm=0644
+ )
+ }
+};
+
+ident (dhclient.*)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/dhcpd/log/dhclient.log",
+ perm=0644
+ )
+ }
+};
+
+ident (dhrelay.*)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/dhcpd/log/dhrelay.log",
+ perm=0644
+ )
+ }
+};
+
+ident (omshell.*)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/dhcpd/log/omshell.log",
perm=0644
)
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/rc.dhcpd
============================================================================
$ cvs diff -u -r1.20 -r1.21 rc.dhcpd
--- openpkg-src/dhcpd/rc.dhcpd 25 Aug 2006 19:16:14 -0000 1.20
+++ openpkg-src/dhcpd/rc.dhcpd 20 Dec 2007 12:27:51 -0000 1.21
@@ -15,8 +15,8 @@
dhcpd_log_complevel="9"
%common
- dhcpd_pidfile="@l_prefix@/var/dhcpd/dhcpd.pid"
- dhcpd_leases="@l_prefix@/var/dhcpd/dhcpd.leases"
+ dhcpd_pidfile="@l_prefix@/var/dhcpd/run/dhcpd.pid"
+ dhcpd_leases="@l_prefix@/var/dhcpd/db/dhcpd.leases"
dhcpd_signal () {
[ -f $dhcpd_pidfile ] && kill -$1 `cat $dhcpd_pidfile`
}
@@ -74,10 +74,18 @@
%daily -u @l_susr@
rcService dhcpd enable yes || exit 0
- shtool rotate -f \
- -n ${dhcpd_log_numfiles} -s ${dhcpd_log_minsize} -d \
- -z ${dhcpd_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
- -P "${dhcpd_log_prolog}" \
- -E "${dhcpd_log_epilog}; rc dhcpd restart" \
- @l_prefix@/var/dhcpd/dhcpd.log
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
+ for tool in dhcpd dhclient dhrelay omshell; do
+ shtool rotate -f \
+ -n $dhcpd_log_numfiles -s $dhcpd_log_minsize -d \
+ -z $dhcpd_log_complevel -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -P "$dhcpd_log_prolog" \
+ -E "$dhcpd_log_epilog; echo 1 >$hintfile" \
+ @l_prefix@/var/dhcpd/log/$tool.log
+ done
+ if [ -s $hintfile ]; then
+ rc dhcpd restart
+ fi
+ rcTmp -k
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
