OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 08-Jul-2003 14:52:05
Branch: HEAD Handle: 2003070813520401
Added files:
openpkg-src/dhcp-agent fsl.dhcp-agent rc.dhcp-agent
Modified files:
openpkg-src/dhcp-agent dhcp-agent.spec
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.14 +39 -4 openpkg-src/dhcp-agent/dhcp-agent.spec
1.1 +16 -0 openpkg-src/dhcp-agent/fsl.dhcp-agent
1.1 +24 -0 openpkg-src/dhcp-agent/rc.dhcp-agent
1.5443 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/dhcp-agent.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 dhcp-agent.spec
--- openpkg-src/dhcp-agent/dhcp-agent.spec 7 Jul 2003 11:18:04 -0000 1.13
+++ openpkg-src/dhcp-agent/dhcp-agent.spec 8 Jul 2003 12:52:05 -0000 1.14
@@ -33,18 +33,27 @@
Group: Converter
License: MIT-style
Version: 0.40
-Release: 20030707
+Release: 20030708
+
+# package options
+%option with_fsl yes
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/dhcp-agent/dhcp-agent-%{version}.tar.gz
+Source1: rc.dhcp-agent
+Source2: fsl.dhcp-agent
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, gcc
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030415, gcc
+PreReq: OpenPKG, openpkg >= 20030415
BuildPreReq: libdnet, libpcap, guile
PreReq: libdnet, libpcap, guile
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -62,18 +71,44 @@
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{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_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+ %{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"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+
+ # install run-command script
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+ %{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_susr@;%{l_susr};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -e 's;@l_rgrp@;%{l_rgrp};g' \
+ %{SOURCE rc.dhcp-agent} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # install OSSP fsl configuration
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.dhcp-agent} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ # determine installation files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.dhcp-agent'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/fsl.dhcp-agent
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.dhcp-agent
--- /dev/null 2003-07-08 14:52:05.000000000 +0200
+++ fsl.dhcp-agent 2003-07-08 14:52:05.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.dhcp-agent -- OSSP fsl configuration
+##
+
+ident (dhcp-agent.*)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/dhcp-agent/dhcp-agent.log",
+ append=1, perm=0644
+ )
+ }
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/rc.dhcp-agent
============================================================================
$ cvs diff -u -r0 -r1.1 rc.dhcp-agent
--- /dev/null 2003-07-08 14:52:05.000000000 +0200
+++ rc.dhcp-agent 2003-07-08 14:52:05.000000000 +0200
@@ -0,0 +1,24 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.dhcp-agent -- Run-Commands
+##
+
+%config
+ dhcp_agent_enable="yes"
+ 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"
+
+%daily -u @l_susr@
+ opServiceEnabled dhcp_agent || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${dhcp_agent_log_numfiles} -s${dhcp_agent_log_minsize} -d \
+ -z${dhcp_agent_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${dhcp_agent_log_prolog}" \
+ -E "${dhcp_agent_log_epilog}" \
+ @l_prefix@/var/dhcp-agent/dhcp-agent.log
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5442 -r1.5443 news.txt
--- openpkg-web/news.txt 8 Jul 2003 12:19:47 -0000 1.5442
+++ openpkg-web/news.txt 8 Jul 2003 12:52:04 -0000 1.5443
@@ -1,3 +1,4 @@
+08-Jul-2003: Upgraded package: P<dhcp-agent-0.40-20030708>
08-Jul-2003: Upgraded package: P<axyftp-0.5.1-20030708>
08-Jul-2003: Upgraded package: P<gd-2.0.15-20030708>
08-Jul-2003: Upgraded package: P<openpkg-20030708-20030708>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
