diff --git a/pureftpd/fsl.pureftpd b/pureftpd/fsl.pureftpd new file mode 100644 index 0000000000..a1d816866c --- /dev/null +++ b/pureftpd/fsl.pureftpd @@ -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 + ) + } +}; diff --git a/pureftpd/pureftpd.spec b/pureftpd/pureftpd.spec index 106ff61831..588f869594 100644 --- a/pureftpd/pureftpd.spec +++ b/pureftpd/pureftpd.spec @@ -33,20 +33,26 @@ Distribution: OpenPKG [BASE] 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 @@ AutoReqProv: no %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 @@ AutoReqProv: no %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 diff --git a/pureftpd/rc.pureftpd b/pureftpd/rc.pureftpd index c5072b902f..b4c4a45901 100644 --- a/pureftpd/rc.pureftpd +++ b/pureftpd/rc.pureftpd @@ -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} -o@l_rusr@ -g@l_rgrp@ -m644 \ + -P "${pureftpd_log_prolog}" \ + -E "${pureftpd_log_epilog}" \ + @l_prefix@/var/pureftpd/pureftpd.log