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:29:54
Branch: HEAD Handle: 2003070309295201
Added files:
openpkg-src/procmail fsl.procmail rc.procmail
Modified files:
openpkg-src/procmail procmail.spec
openpkg-web news.txt
Log:
force make to use our flags; add fsl support; avoid log duplication by
sendmail (and probably any MTA) whose fsl is catching all logs being
tagged with LOG_MAIL facility
Summary:
Revision Changes Path
1.1 +15 -0 openpkg-src/procmail/fsl.procmail
1.25 +45 -9 openpkg-src/procmail/procmail.spec
1.1 +24 -0 openpkg-src/procmail/rc.procmail
1.5175 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/procmail/fsl.procmail
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.procmail
--- /dev/null 2003-07-03 10:29:53.000000000 +0200
+++ fsl.procmail 2003-07-03 10:29:53.000000000 +0200
@@ -0,0 +1,15 @@
+##
+## fsl.procmail -- OSSP fsl configuration
+##
+
+ident (procmail)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/procmail/procmail.log",
+ append=1, perm=0644
+ )
+ }
+};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/procmail/procmail.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 procmail.spec
--- openpkg-src/procmail/procmail.spec 30 Mar 2003 19:23:32 -0000 1.24
+++ openpkg-src/procmail/procmail.spec 3 Jul 2003 08:29:53 -0000 1.25
@@ -33,18 +33,27 @@
Group: Mail
License: GPL
Version: 3.22
-Release: 20030330
+Release: 20030703
+
+# package options
+%option with_fsl yes
# list of sources
Source0: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz
Source1: procmailrc
+Source2: rc.procmail
+Source3: fsl.procmail
Patch0: procmail.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030415
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -60,10 +69,12 @@
%prep
%setup -q
%patch -p0
-
-%build
%{l_shtool} subst \
-e 's;^\(BASENAME[^=]*=\).*;\1 %{l_prefix};' \
+ -e 's;^CFLAGS0.*=.*$;CFLAGS0 = %{l_cflags -O};' \
+ -e 's;^LDFLAGS0.*=\(.*\)$;LDFLAGS0 = %{l_ldflags} %{l_fsl_ldflags};' \
+ -e 's;^LIBS.*=.*$;LIBS = %{l_fsl_libs};' \
+ -e 's;^[#]*CC.*=.*$;CC = %{l_cc};' \
Makefile
%{l_shtool} subst \
-e 's;^/\*\(#define NO_fcntl_LOCK\);\1;' \
@@ -71,6 +82,13 @@
-e
's;\(#define.*ETCRC[^"]"\)[^"]*\(".*\);\1%{l_prefix}/etc/procmail/procmailrc\2;' \
-e 's;\(#define.*ETCRCS[^"]"\)[^"]*\(".*\);\1%{l_prefix}/etc/procmail/\2;' \
config.h
+ %if "%{with_fsl}" == "yes"
+ %{l_shtool} subst \
+ -e 's;openlog(ident,logopt,facility);openlog(ident,logopt,LOG_USER);' \
+ src/includes.h
+ %endif
+
+%build
( unset LD_LIBRARY_PATH 2>/dev/null || true
dirlist=""
for dir in "$HOME/tmp" /tmp $RPM_SOURCE_DIR $RPM_BUILD_DIR; do
@@ -84,14 +102,12 @@
%{l_shtool} subst \
-e
's;\(#define.*SENDMAIL[^"]*"\)[^"]*\(".*\);\1%{l_prefix}/sbin/sendmail\2;' \
autoconf.h
- %{l_make} %{l_mflags} \
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}"
+ %{l_make} %{l_mflags}
%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}/bin \
$RPM_BUILD_ROOT%{l_prefix}/etc/procmail \
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
@@ -110,8 +126,28 @@
-e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE procmailrc} $RPM_BUILD_ROOT%{l_prefix}/etc/procmail/
+ # 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}' \
'%attr(6755,%{l_susr},mail) %{l_prefix}/bin/procmail' \
'%attr(2755,%{l_mgrp},mail) %{l_prefix}/bin/lockfile'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/procmail/rc.procmail
============================================================================
$ cvs diff -u -r0 -r1.1 rc.procmail
--- /dev/null 2003-07-03 10:29:53.000000000 +0200
+++ rc.procmail 2003-07-03 10:29:53.000000000 +0200
@@ -0,0 +1,24 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.procmail -- Run-Commands
+##
+
+%config
+ procmail_enable="yes"
+ procmail_log_epilog="true"
+ procmail_log_numfiles="10"
+ procmail_log_minsize="1M"
+ procmail_log_complevel="9"
+
+%daily -u @l_susr@
+ opServiceEnabled procmail || exit 0
+
+ # rotate logfile
+ prolog="$procmail_log_prolog"
+ epilog="$procmail_log_epilog"
+ shtool rotate -f \
+ -n${procmail_log_numfiles} -s${procmail_log_minsize} -d \
+ -z${procmail_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${prolog}" \
+ -E "${epilog}" \
+ @l_prefix@/var/procmail/procmail.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5174 -r1.5175 news.txt
--- openpkg-web/news.txt 2 Jul 2003 19:39:30 -0000 1.5174
+++ openpkg-web/news.txt 3 Jul 2003 08:29:52 -0000 1.5175
@@ -1,3 +1,4 @@
+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>
02-Jul-2003: New package: P<mktemp-1.5-20030702>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
