OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 16-Jul-2003 20:01:05
Branch: HEAD Handle: 2003071619010302
Modified files:
openpkg-src/dhcp-agent dhcp-agent.spec rc.dhcp-agent
openpkg-web news.txt
Log:
update and finish packaging a little bit more
Summary:
Revision Changes Path
1.21 +22 -8 openpkg-src/dhcp-agent/dhcp-agent.spec
1.3 +8 -0 openpkg-src/dhcp-agent/rc.dhcp-agent
1.5598 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/dhcp-agent.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 dhcp-agent.spec
--- openpkg-src/dhcp-agent/dhcp-agent.spec 14 Jul 2003 14:25:55 -0000 1.20
+++ openpkg-src/dhcp-agent/dhcp-agent.spec 16 Jul 2003 18:01:05 -0000 1.21
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Converter
License: MIT-style
-Version: 0.40
-Release: 20030714
+Version: 0.41
+Release: 20030716
# package options
%option with_fsl yes
@@ -66,36 +66,50 @@
%prep
%setup -q
%patch -p0
+
+ # add some missing $(DESTDIR) occurrences
%{l_shtool} subst \
-e 's;mkdir -p .*\(${dhcplocalstate_clientdir}\);%{l_shtool} mkdir -p
$(DESTDIR)\1;' \
+ -e 's; \(${dhcplocalstate_serverdir}\); $(DESTDIR)\1;' \
src/Makefile.in
- # API was renamed inconsistently
+
+ # fix inconsistently renamed API
%{l_shtool} subst \
-e 's;FATAL_ERROR;FATAL_MESSAGE;g' \
src/dhcp-daemon.c
%build
+ # configure package
+ defs=""
case "%{l_target}" in
- *linux2.2) defs=" -DNEED_IN_ADDR_T" ;;
- *) defs="" ;;
+ *linux2.2 ) defs=" -DNEED_IN_ADDR_T" ;;
esac
-
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}$defs" \
- LDFLAGS="%{l_fsl_ldflags}" \
+ LDFLAGS="-L. %{l_fsl_ldflags}" \
./configure \
--prefix=%{l_prefix} \
--with-libdnet-prefix=%{l_prefix} \
--with-libpcap-prefix=%{l_prefix} \
--disable-shared
- %{l_shtool} subst -e 's;^LIBS.*=.*;LIBS=%{l_fsl_libs};' src/Makefile
+ %{l_shtool} subst \
+ -e 's;^LIBS.*=.*;LIBS=%{l_fsl_libs};' \
+ src/Makefile
+
+ # build package
%{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+
+ # install package
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/dhcp-agent
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+
+ # 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
# install run-command script
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/rc.dhcp-agent
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.dhcp-agent
--- openpkg-src/dhcp-agent/rc.dhcp-agent 10 Jul 2003 07:50:22 -0000 1.2
+++ openpkg-src/dhcp-agent/rc.dhcp-agent 16 Jul 2003 18:01:05 -0000 1.3
@@ -11,6 +11,14 @@
dhcp_agent_log_minsize="1M"
dhcp_agent_log_complevel="9"
+%start
+ opServiceEnabled dhcp_agent || exit 0
+ # FIXME: missing operation
+
+%stop
+ opServiceEnabled dhcp_agent || exit 0
+ # FIXME: missing operation
+
%daily -u @l_susr@
opServiceEnabled dhcp_agent || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5597 -r1.5598 news.txt
--- openpkg-web/news.txt 16 Jul 2003 17:47:27 -0000 1.5597
+++ openpkg-web/news.txt 16 Jul 2003 18:01:03 -0000 1.5598
@@ -1,3 +1,4 @@
+16-Jul-2003: Upgraded package: P<dhcp-agent-0.41-20030716>
16-Jul-2003: Upgraded package: P<jargon-4.4.3-20030716>
16-Jul-2003: Upgraded package: P<bogofilter-0.13.7.3-20030716>
16-Jul-2003: Upgraded package: P<nsd-1.2.1-20030716>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
