OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 22-Jul-2003 15:18:04
Branch: HEAD Handle: 2003072214180202
Modified files:
openpkg-src/dhcp-agent dhcp-agent.spec rc.dhcp-agent
openpkg-web news.txt
Log:
snapshot, junk because fails to work under FreeBSD
Summary:
Revision Changes Path
1.25 +11 -5 openpkg-src/dhcp-agent/dhcp-agent.spec
1.7 +36 -4 openpkg-src/dhcp-agent/rc.dhcp-agent
1.5716 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/dhcp-agent.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 dhcp-agent.spec
--- openpkg-src/dhcp-agent/dhcp-agent.spec 21 Jul 2003 08:12:30 -0000 1.24
+++ openpkg-src/dhcp-agent/dhcp-agent.spec 22 Jul 2003 13:18:04 -0000 1.25
@@ -23,17 +23,19 @@
## SUCH DAMAGE.
##
+# FIXME: mlelstv -- fails to configure interfaces on FreeBSD
+
# package information
Name: dhcp-agent
Summary: DHCP Client Suite
URL: http://dhcp-agent.sourceforge.net/
Vendor: Thamer Alharbash
Packager: The OpenPKG Project
-Distribution: OpenPKG [EVAL]
+Distribution: OpenPKG [JUNK]
Group: Converter
License: MIT-style
Version: 0.41
-Release: 20030721
+Release: 20030722
# package options
%option with_fsl yes
@@ -107,10 +109,14 @@
$RPM_BUILD_ROOT%{l_prefix}/var/dhcp-agent
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ # drop underdocumented underimplemented server
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/dhcp-agent/dhcp-server
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/dhcp-agent/dhcp-server
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/sbin/dhcp-server
+
# post-adjust installation
- mv $RPM_BUILD_ROOT%{l_prefix}/etc/dhcp-agent/dhcp-server/lease.conf.example \
- $RPM_BUILD_ROOT%{l_prefix}/etc/dhcp-agent/dhcp-server/lease.conf
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/dhclient-server
+ strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/rc.dhcp-agent
============================================================================
$ cvs diff -u -r1.6 -r1.7 rc.dhcp-agent
--- openpkg-src/dhcp-agent/rc.dhcp-agent 21 Jul 2003 08:12:30 -0000 1.6
+++ openpkg-src/dhcp-agent/rc.dhcp-agent 22 Jul 2003 13:18:04 -0000 1.7
@@ -5,19 +5,51 @@
%config
dhcp_agent_enable="$openpkg_rc_def"
+ dhcp_agent_interface=""
dhcp_agent_log_prolog="true"
dhcp_agent_log_epilog="true"
dhcp_agent_log_numfiles="10"
dhcp_agent_log_minsize="1M"
dhcp_agent_log_complevel="9"
-%start
+%common
+
dhcp_agent_pidfile="@l_prefix@/var/dhcp-agent/dhcp-client/$dhcp_agent_interface.pid"
+ dhcp_agent_signal () {
+ [ -f $dhcp_agent_pidfile ] && kill -$1 `cat $dhcp_agent_pidfile`
+ }
+
+%status -u @l_susr@ -o
+ dhcp_agent_usable="no"
+ dhcp_agent_active="no"
+ rcService dhcp_agent enable yes && \
+ [ ".$dhcp_agent_interface" != . ] && dhcp_agent_usable="yes"
+ rcService dhcp_agent enable yes && \
+ rcVarIsYes dhcp_agent_usable && \
+ dhcp_agent_signal 0 && dhcp_agent_active="yes"
+ echo "dhcp_agent_enable=\"$dhcp_agent_enable\""
+ echo "dhcp_agent_usable=\"$dhcp_agent_usable\""
+ echo "dhcp_agent_active=\"$dhcp_agent_active\""
+
+%start -p 90 -u @l_susr@
+ rcService dhcp_agent enable yes || exit 0
+ rcVarIsYes dhcp_agent_usable && \
+ @l_prefix@/sbin/dhcp-client 2>/dev/null -i $dhcp_agent_interface
+
+%stop -p 90 -u @l_susr@
+ rcService dhcp_agent enable yes || exit 0
+ rcVarIsYes dhcp_agent_usable && \
+ @l_prefix@/sbin/dhcp-client 2>/dev/null -k -i $dhcp_agent_interface
+
+%restart -p 90 -u @l_susr@
rcService dhcp_agent enable yes || exit 0
- # FIXME: missing operation
+ rc dhcp-agent stop
+ sleep 2
+ rc dhcp-agent start
-%stop
+%reload -p 90 -u @l_susr@
rcService dhcp_agent enable yes || exit 0
- # FIXME: missing operation
+ rcVarIsYes dhcp_agent_usable && \
+ @l_prefix@/sbin/dhcp-client 2>/dev/null -c -i $dhcp_agent_interface
%daily -u @l_susr@
rcService dhcp_agent enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5715 -r1.5716 news.txt
--- openpkg-web/news.txt 22 Jul 2003 12:51:31 -0000 1.5715
+++ openpkg-web/news.txt 22 Jul 2003 13:18:02 -0000 1.5716
@@ -1,3 +1,4 @@
+22-Jul-2003: Upgraded package: P<dhcp-agent-0.41-20030722>
22-Jul-2003: Upgraded package: P<openpkg-20030722-20030722>
22-Jul-2003: Upgraded package: P<spread-3.17.1-20030722>
22-Jul-2003: Upgraded package: P<sgmlfmt-1.7-20030722>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
