OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Apr-2004 12:15:18
Branch: HEAD Handle: 2004042211151700
Modified files:
openpkg-src/amavisd amavisd.spec rc.amavisd
Log:
add amavislogsumm and cleanup share/ directory
Summary:
Revision Changes Path
1.32 +11 -9 openpkg-src/amavisd/amavisd.spec
1.11 +16 -0 openpkg-src/amavisd/rc.amavisd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 3 Apr 2004 07:31:32 -0000 1.31
+++ openpkg-src/amavisd/amavisd.spec 22 Apr 2004 10:15:17 -0000 1.32
@@ -38,14 +38,15 @@
Group: Mail
License: GPL
Version: %{V_major}%{V_minor}
-Release: 20040403
+Release: 20040422
# package options
%option with_milter no
# list of sources
Source0:
http://www.ijs.si/software/amavisd/amavisd-new-%{V_major}-%{V_minor}.tar.gz
-Source1: rc.amavisd
+Source1: http://homepages.hs-bremen.de/~renegat/amavislogsumm
+Source2: rc.amavisd
# build information
Prefix: %{l_prefix}
@@ -124,8 +125,7 @@
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/etc/amavisd \
- $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/test-messages \
- $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/README_FILES \
+ $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/tests \
$RPM_BUILD_ROOT%{l_prefix}/var/amavisd \
$RPM_BUILD_ROOT%{l_prefix}/var/amavisd/virusmails
@@ -139,17 +139,19 @@
%{l_shtool} install -c -m 644 \
test-messages/* \
- $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/test-messages/
+ $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/tests/
%{l_shtool} install -c -m 644 \
- README_FILES/* \
- $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/README_FILES/
- %{l_shtool} install -c -m 644 \
- RELEASE_NOTES \
+ RELEASE_NOTES README_FILES/* \
$RPM_BUILD_ROOT%{l_prefix}/share/amavisd/
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.amavisd} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ %{l_shtool} install -c -m 755 \
+ -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
+ %{SOURCE amavislogsumm} \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/amavislogsumm
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config %{l_prefix}/etc/amavisd/amavisd.conf' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/rc.amavisd
============================================================================
$ cvs diff -u -r1.10 -r1.11 rc.amavisd
--- openpkg-src/amavisd/rc.amavisd 6 Oct 2003 14:07:38 -0000 1.10
+++ openpkg-src/amavisd/rc.amavisd 22 Apr 2004 10:15:17 -0000 1.11
@@ -10,6 +10,7 @@
amavisd_log_numfiles="10"
amavisd_log_minsize="1M"
amavisd_log_complevel="9"
+ amavisd_sum_flags=""
%common
amavisd_pidfile="@l_prefix@/var/amavisd/amavisd.pid"
@@ -53,4 +54,19 @@
-P "${amavisd_log_prolog}" \
-E "${amavisd_log_epilog} && rc amavisd restart" \
@l_prefix@/var/amavisd/amavisd.log
+
+ # rotate summary logfile
+ shtool rotate -f \
+ -n ${amavisd_log_numfiles} -s 0 \
+ -z ${amavisd_log_complevel} -m 644 -o @l_muser@ -g @l_mgrp@ \
+ @l_prefix@/var/amavisd/log/amavisd.sum
+
+ # generate summary logfile
+ logfiles="@l_prefix@/var/amavisd/log/amavisd.log"
+ if [ -f "@l_prefix@/var/amavisd/log/amavisd.log.0" ]; then
+ logfiles="$logfiles @l_prefix@/var/amavisd/log/amavisd.log.0"
+ fi
+ cat ${logfiles} | @l_prefix@/sbin/amavislogsumm \
+ -d yesterday -R -B ${amavisd_sum_flags} \
+ >@l_prefix@/var/amavisd/amavisd.sum 2>/dev/null
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
