OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 22-Apr-2009 19:55:17
Branch: HEAD Handle: 2009042218551700
Modified files:
openpkg-src/amavisd amavisd.patch amavisd.spec
Log:
upgrading package: amavisd 2.6.2 -> 2.6.3
Summary:
Revision Changes Path
1.8 +11 -11 openpkg-src/amavisd/amavisd.patch
1.87 +2 -2 openpkg-src/amavisd/amavisd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 amavisd.patch
--- openpkg-src/amavisd/amavisd.patch 15 Dec 2008 16:36:21 -0000 1.7
+++ openpkg-src/amavisd/amavisd.patch 22 Apr 2009 17:55:17 -0000 1.8
@@ -1,25 +1,25 @@
Index: amavisd.conf
---- amavisd.conf.orig 2008-12-15 01:50:03 +0100
-+++ amavisd.conf 2008-12-15 17:34:25 +0100
+--- amavisd.conf.orig 2009-04-22 02:24:04 +0200
++++ amavisd.conf 2009-04-22 19:46:28 +0200
@@ -360,10 +360,10 @@
# ['Sophos SAVI', \&sophos_savi ],
# ### http://www.clamav.net/
-# ['ClamAV-clamd',
-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
--# qr/\bOK$/, qr/\bFOUND$/,
+-# qr/\bOK$/m, qr/\bFOUND$/m,
-# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+['ClamAV-clamd',
+ \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
-+ qr/\bOK$/, qr/\bFOUND$/,
++ qr/\bOK$/m, qr/\bFOUND$/m,
+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
# # NOTE: run clamd under the same user as amavisd, or run it under its own
# # uid such as clamav, add user clamav to the amavis group, and then add
# # AllowSupplementaryGroups to clamd.conf;
Index: amavisd
---- amavisd.orig 2008-12-15 01:50:09 +0100
-+++ amavisd 2008-12-15 17:32:00 +0100
-@@ -11840,7 +11840,10 @@
+--- amavisd.orig 2009-04-22 02:24:12 +0200
++++ amavisd 2009-04-22 19:36:50 +0200
+@@ -12048,7 +12048,10 @@
if ($subject_tag ne '') {
if (defined $msginfo->get_header_field('subject')) {
$hdr_edits->edit_header('Subject',
@@ -32,8 +32,8 @@
$subject_tag =~ s/[ \t]+\z//; # trim
$hdr_edits->add_header('Subject', $subject_tag);
Index: amavislogsumm
---- amavislogsumm.orig 2008-12-15 17:32:00 +0100
-+++ amavislogsumm 2008-12-15 17:32:00 +0100
+--- amavislogsumm.orig 2009-04-22 19:36:50 +0200
++++ amavislogsumm 2009-04-22 19:36:50 +0200
@@ -309,7 +309,7 @@
if ($spamCount > 0) {
printf "\tSPAM : %5.2f\n", ($spamHitSum / $spamCount);
@@ -45,7 +45,7 @@
}
Index: helper-progs/Makefile.in
--- helper-progs/Makefile.in.orig 2004-04-11 01:51:52 +0200
-+++ helper-progs/Makefile.in 2008-12-15 17:32:00 +0100
++++ helper-progs/Makefile.in 2009-04-22 19:36:50 +0200
@@ -2,7 +2,8 @@
# Makefile.in for amavisd-new helper-progs
@@ -67,7 +67,7 @@
Index: helper-progs/amavis-milter.c
--- helper-progs/amavis-milter.c.orig 2008-06-27 15:31:45 +0200
-+++ helper-progs/amavis-milter.c 2008-12-15 17:32:00 +0100
++++ helper-progs/amavis-milter.c 2009-04-22 19:36:50 +0200
@@ -52,7 +52,7 @@
#ifdef HAVE_SM_GEN_H
# include "sm/gen.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.86 -r1.87 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 18 Apr 2009 13:08:25 -0000 1.86
+++ openpkg-src/amavisd/amavisd.spec 22 Apr 2009 17:55:17 -0000 1.87
@@ -22,7 +22,7 @@
##
# package versions
-%define V_amavis 2.6.2
+%define V_amavis 2.6.3
%define V_logsumm 0.6
# package information
@@ -36,7 +36,7 @@
Group: Mail
License: GPL
Version: %{V_amavis}
-Release: 20081215
+Release: 20090422
# package options
%option with_milter no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
