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 10:59:48
Branch: HEAD Handle: 2003070309594701
Added files:
openpkg-src/pureftpd fsl.pureftpd
Modified files:
openpkg-src/pureftpd pureftpd.spec rc.pureftpd
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.1 +15 -0 openpkg-src/pureftpd/fsl.pureftpd
1.43 +38 -8 openpkg-src/pureftpd/pureftpd.spec
1.6 +15 -0 openpkg-src/pureftpd/rc.pureftpd
1.5176 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pureftpd/fsl.pureftpd
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.pureftpd
--- /dev/null 2003-07-03 10:59:48.000000000 +0200
+++ fsl.pureftpd 2003-07-03 10:59:48.000000000 +0200
@@ -0,0 +1,15 @@
+##
+## fsl.pureftpd -- OSSP fsl configuration
+##
+
+ident (pure-ftpd)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/pureftpd/pureftpd.log",
+ append=1, perm=0644
+ )
+ }
+};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pureftpd/pureftpd.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 pureftpd.spec
--- openpkg-src/pureftpd/pureftpd.spec 3 Jan 2003 11:36:36 -0000 1.42
+++ openpkg-src/pureftpd/pureftpd.spec 3 Jul 2003 08:59:48 -0000 1.43
@@ -33,20 +33,26 @@
Group: FTP
License: GPL
Version: 1.1.0
-Release: 20030103
+Release: 20030703
# package options
+%option with_fsl yes
%option with_pam no
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/pureftpd/pure-ftpd-%{version}.tar.gz
Source1: rc.pureftpd
+Source2: fsl.pureftpd
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, make
-PreReq: OpenPKG, openpkg >= 20030103
+BuildPreReq: OpenPKG, openpkg >= 20030415, make
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
@@ -71,9 +77,11 @@
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
%if "%{with_pam}" == "yes"
CPPFLAGS="-I`%{l_prefix}/etc/rc --query pam_incdir`" \
- LDFLAGS="-L`%{l_prefix}/etc/rc --query pam_libdir`" \
+ LDFLAGS="-L`%{l_prefix}/etc/rc --query pam_libdir` ${LDFLAGS}" \
%endif
./configure \
--prefix=%{l_prefix} \
@@ -92,13 +100,35 @@
%install
rm -rf $RPM_BUILD_ROOT
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- %{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' \
- %{SOURCE rc.pureftpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
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}'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pureftpd/rc.pureftpd
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.pureftpd
--- openpkg-src/pureftpd/rc.pureftpd 24 Jun 2003 12:17:38 -0000 1.5
+++ openpkg-src/pureftpd/rc.pureftpd 3 Jul 2003 08:59:48 -0000 1.6
@@ -5,6 +5,11 @@
%config
pureftpd_enable="yes"
+ pureftpd_log_prolog="true"
+ pureftpd_log_epilog="true"
+ pureftpd_log_numfiles="10"
+ pureftpd_log_minsize="1M"
+ pureftpd_log_complevel="9"
%start -p 200 -u @l_susr@
if opServiceEnabled pureftpd; then
@@ -25,3 +30,13 @@
echo "$!" >@l_prefix@/var/pureftpd/pureftpd.pid
fi
+%daily -u @l_susr@
+ opServiceEnabled pureftpd || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${pureftpd_log_numfiles} -s${pureftpd_log_minsize} -d \
+ -z${pureftpd_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${pureftpd_log_prolog}" \
+ -E "${pureftpd_log_epilog}" \
+ @l_prefix@/var/pureftpd/pureftpd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5175 -r1.5176 news.txt
--- openpkg-web/news.txt 3 Jul 2003 08:29:52 -0000 1.5175
+++ openpkg-web/news.txt 3 Jul 2003 08:59:47 -0000 1.5176
@@ -1,3 +1,4 @@
+03-Jul-2003: Upgraded package: P<pureftpd-1.1.0-20030703>
03-Jul-2003: Upgraded package: P<procmail-3.22-20030703>
02-Jul-2003: Upgraded package: P<pv-0.5.3-20030702>
02-Jul-2003: Upgraded package: P<xmlto-0.0.14-20030702>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
