OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Jul-2003 21:18:27
Branch: HEAD Handle: 2003072620182700
Added files:
openpkg-src/dhcpd fsl.dhcpd
Modified files:
openpkg-src/dhcpd dhcpd.spec
Log:
add fsl support
Summary:
Revision Changes Path
1.48 +27 -4 openpkg-src/dhcpd/dhcpd.spec
1.1 +16 -0 openpkg-src/dhcpd/fsl.dhcpd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 25 Jul 2003 21:45:11 -0000 1.47
+++ openpkg-src/dhcpd/dhcpd.spec 26 Jul 2003 19:18:27 -0000 1.48
@@ -33,12 +33,16 @@
Group: DNS
License: ISC/BSD
Version: 3.0.1rc11
-Release: 20030725
+Release: 20030726
+
+# package options
+%option with_fsl yes
# list of sources
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
Source1: dhcpd.conf
Source2: rc.dhcpd
+Source3: fsl.dhcpd
Patch0: dhcpd.patch
# build information
@@ -46,6 +50,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030718
PreReq: OpenPKG, openpkg >= 20030718
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl >= 1.2.0
+PreReq: fsl >= 1.2.0
+%endif
AutoReq: no
AutoReqProv: no
@@ -59,6 +67,8 @@
%build
( echo 'CC = %{l_cc}'
echo 'CFLAGS = %{l_cflags -O}'
+ echo 'LDFLAGS = %{l_fsl_ldflags}'
+ echo 'LIBS = %{l_fsl_libs}'
echo 'USERBINDIR = %{l_prefix}/bin'
echo 'BINDIR = %{l_prefix}/sbin'
echo 'CLIENTBINDIR = %{l_prefix}/sbin'
@@ -91,7 +101,8 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/etc/dhcpd \
$RPM_BUILD_ROOT%{l_prefix}/man/man5 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
%{l_shtool} install -c -m 644 \
%{SOURCE dhcpd.conf} \
@@ -103,14 +114,26 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ %{l_shtool} install -c -m 644 /dev/null \
+ $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/dhcpd.leases
+
+ # 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 %{l_value -s -a} \
%{SOURCE rc.dhcpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- %{l_shtool} install -c -m 644 /dev/null \
- $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/dhcpd.leases
+
+ # install OSSP fsl configuration
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE fsl.dhcpd} \
+ $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.dhcpd' \
'%config %{l_prefix}/etc/dhcpd/dhcpd.conf'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/fsl.dhcpd
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.dhcpd
--- /dev/null 2003-07-26 21:18:27.000000000 +0200
+++ fsl.dhcpd 2003-07-26 21:18:27.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.dhcpd -- OSSP fsl configuration
+##
+
+ident (dhcpd.*)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/dhcpd/dhcpd.log",
+ perm=0644
+ )
+ }
+};
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
