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: 03-Jul-2003 17:01:08
Branch: HEAD Handle: 2003070316010402
Added files:
openpkg-src/tftp fsl.tftp
Modified files:
openpkg-src/tftp rc.tftp tftp.spec
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.1 +15 -0 openpkg-src/tftp/fsl.tftp
1.4 +15 -0 openpkg-src/tftp/rc.tftp
1.16 +37 -11 openpkg-src/tftp/tftp.spec
1.5190 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/fsl.tftp
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.tftp
--- /dev/null 2003-07-03 17:01:07.000000000 +0200
+++ fsl.tftp 2003-07-03 17:01:07.000000000 +0200
@@ -0,0 +1,15 @@
+##
+## fsl.tftp -- OSSP fsl configuration
+##
+
+ident (tftpd)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/tftp/tftp.log",
+ append=1, perm=0644
+ )
+ }
+};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/rc.tftp
============================================================================
$ cvs diff -u -r1.3 -r1.4 rc.tftp
--- openpkg-src/tftp/rc.tftp 24 Jun 2003 12:08:12 -0000 1.3
+++ openpkg-src/tftp/rc.tftp 3 Jul 2003 15:01:06 -0000 1.4
@@ -8,6 +8,11 @@
tftp_listen="127.0.0.1:69"
tftp_flags=""
tftp_rootdir="@l_prefix@/pub"
+ tftp_log_prolog="true"
+ tftp_log_epilog="true"
+ tftp_log_numfiles="10"
+ tftp_log_minsize="1M"
+ tftp_log_complevel="9"
%start -p 100 -u @l_susr@
opServiceEnabled tftp || exit 0
@@ -27,3 +32,13 @@
rm -f @l_prefix@/var/tftp/tftpd.pid >/dev/null 2>&1 || true
fi
+%daily -u @l_susr@
+ opServiceEnabled tftp || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${tftp_log_numfiles} -s${tftp_log_minsize} -d \
+ -z${tftp_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${tftp_log_prolog}" \
+ -E "${tftp_log_epilog}" \
+ @l_prefix@/var/tftp/tftp.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/tftp.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 tftp.spec
--- openpkg-src/tftp/tftp.spec 14 May 2003 18:56:55 -0000 1.15
+++ openpkg-src/tftp/tftp.spec 3 Jul 2003 15:01:06 -0000 1.16
@@ -33,19 +33,27 @@
Group: Networtk
License: GPL
Version: 0.34
-Release: 20030514
+Release: 20030703
+
+# package options
+%option with_fsl yes
# list of sources
Source0:
http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.gz
Source1: tftpd.remap
Source2: rc.tftp
+Source3: fsl.tftp
Patch0: tftp.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, make, gcc
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030415, make, gcc
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -61,7 +69,8 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} -DPID_FILE='\"%{l_prefix}/var/tftp/tftpd.pid\"'" \
CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
--without-tcpwrappers \
@@ -71,17 +80,12 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
+ $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
$RPM_BUILD_ROOT%{l_prefix}/etc/tftp \
$RPM_BUILD_ROOT%{l_prefix}/var/tftp
%{l_make} %{l_mflags} install \
INSTALL="%{l_shtool} install -c" \
INSTALLROOT=$RPM_BUILD_ROOT
- %{l_shtool} install -c -m 755 \
- -e 's;@l_prefix@;%{l_prefix};g' \
- -e 's;@l_susr@;%{l_susr};g' \
- -e 's;@l_nusr@;%{l_nusr};g' \
- %{SOURCE rc.tftp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE tftpd.remap} $RPM_BUILD_ROOT%{l_prefix}/etc/tftp/
@@ -91,7 +95,29 @@
$RPM_BUILD_ROOT%{l_prefix}/sbin/tftpd
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+
+ # Creating 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.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # OSSP fake syslog library
+ %{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.%{name}} \
+ $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.%{name}' \
'%config %{l_prefix}/etc/tftp/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5189 -r1.5190 news.txt
--- openpkg-web/news.txt 3 Jul 2003 14:43:37 -0000 1.5189
+++ openpkg-web/news.txt 3 Jul 2003 15:01:04 -0000 1.5190
@@ -1,3 +1,4 @@
+03-Jul-2003: Upgraded package: P<tftp-0.34-20030703>
03-Jul-2003: Upgraded package: P<sysmon-0.91.19-20030703>
03-Jul-2003: Upgraded package: P<snmp-5.0.8-20030703>
03-Jul-2003: Upgraded package: P<scponly-3.8-20030703>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
