From 0265411f8ad94ad1f5dbf1760faede24261ebfae Mon Sep 17 00:00:00 2001 From: Thomas Lotterer Date: Tue, 8 Jul 2003 12:52:05 +0000 Subject: [PATCH] add fsl support --- dhcp-agent/dhcp-agent.spec | 43 ++++++++++++++++++++++++++++++++++---- dhcp-agent/fsl.dhcp-agent | 16 ++++++++++++++ dhcp-agent/rc.dhcp-agent | 24 +++++++++++++++++++++ 3 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 dhcp-agent/fsl.dhcp-agent create mode 100644 dhcp-agent/rc.dhcp-agent diff --git a/dhcp-agent/dhcp-agent.spec b/dhcp-agent/dhcp-agent.spec index a5b41abe59..9bf3515f0c 100644 --- a/dhcp-agent/dhcp-agent.spec +++ b/dhcp-agent/dhcp-agent.spec @@ -33,18 +33,27 @@ Distribution: OpenPKG [EVAL] 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 @@ AutoReqProv: no %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 diff --git a/dhcp-agent/fsl.dhcp-agent b/dhcp-agent/fsl.dhcp-agent new file mode 100644 index 0000000000..e030469c7d --- /dev/null +++ b/dhcp-agent/fsl.dhcp-agent @@ -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 + ) + } +}; + diff --git a/dhcp-agent/rc.dhcp-agent b/dhcp-agent/rc.dhcp-agent new file mode 100644 index 0000000000..34d34a4c74 --- /dev/null +++ b/dhcp-agent/rc.dhcp-agent @@ -0,0 +1,24 @@ +#!@l_prefix@/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} -o@l_rusr@ -g@l_rgrp@ -m644 \ + -P "${dhcp_agent_log_prolog}" \ + -E "${dhcp_agent_log_epilog}" \ + @l_prefix@/var/dhcp-agent/dhcp-agent.log +