OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 15-Dec-2008 17:36:22 Branch: HEAD Handle: 2008121516362100 Modified files: openpkg-src/amavisd amavisd.patch amavisd.spec Log: upgrading package: amavisd 2.6.1 -> 2.6.2 Summary: Revision Changes Path 1.7 +23 -35 openpkg-src/amavisd/amavisd.patch 1.85 +2 -2 openpkg-src/amavisd/amavisd.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/amavisd/amavisd.patch ============================================================================ $ cvs diff -u -r1.6 -r1.7 amavisd.patch --- openpkg-src/amavisd/amavisd.patch 7 Sep 2007 10:47:54 -0000 1.6 +++ openpkg-src/amavisd/amavisd.patch 15 Dec 2008 16:36:21 -0000 1.7 @@ -1,39 +1,27 @@ Index: amavisd.conf ---- amavisd.conf.orig 2007-06-27 12:42:55 +0200 -+++ amavisd.conf 2007-09-07 12:46:26 +0200 -@@ -352,16 +352,16 @@ - # ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/ +--- amavisd.conf.orig 2008-12-15 01:50:03 +0100 ++++ amavisd.conf 2008-12-15 17:34:25 +0100 +@@ -360,10 +360,10 @@ # ['Sophos SAVI', \&sophos_savi ], --# ### http://www.clamav.net/ + # ### http://www.clamav.net/ -# ['ClamAV-clamd', -# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], -# qr/\bOK$/, qr/\bFOUND$/, --# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], --# # 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; --# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in --# # this entry; when running chrooted one may prefer socket "$MYHOME/clamd". -+### http://www.clamav.net/ +-# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], +['ClamAV-clamd', + \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], + qr/\bOK$/, qr/\bFOUND$/, -+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], -+# 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; -+# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in -+# this entry; when running chrooted one may prefer socket "$MYHOME/clamd". - - # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred) - # # note that Mail::ClamAV requires perl to be build with threading! ++ 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 2007-06-27 12:43:00 +0200 -+++ amavisd 2007-09-07 12:46:26 +0200 -@@ -9922,7 +9922,10 @@ +--- amavisd.orig 2008-12-15 01:50:09 +0100 ++++ amavisd 2008-12-15 17:32:00 +0100 +@@ -11840,7 +11840,10 @@ if ($subject_tag ne '') { - if (defined $msginfo->orig_header_fields->{'subject'}) { + if (defined $msginfo->get_header_field('subject')) { $hdr_edits->edit_header('Subject', - sub { $_[1]=~/^([ \t]?)(.*)\z/s; ' '.$subject_tag.$2 }); + sub { $_[1]=~/^([ \t]?)(.*)\z/s; @@ -42,10 +30,10 @@ + ' '.$subject_tag.$subj }); } else { # no Subject header field present, insert one $subject_tag =~ s/[ \t]+\z//; # trim - $hdr_edits->append_header('Subject', $subject_tag); + $hdr_edits->add_header('Subject', $subject_tag); Index: amavislogsumm ---- amavislogsumm.orig 2007-09-07 12:46:26 +0200 -+++ amavislogsumm 2007-09-07 12:46:26 +0200 +--- amavislogsumm.orig 2008-12-15 17:32:00 +0100 ++++ amavislogsumm 2008-12-15 17:32:00 +0100 @@ -309,7 +309,7 @@ if ($spamCount > 0) { printf "\tSPAM : %5.2f\n", ($spamHitSum / $spamCount); @@ -57,7 +45,7 @@ } Index: helper-progs/Makefile.in --- helper-progs/Makefile.in.orig 2004-04-11 01:51:52 +0200 -+++ helper-progs/Makefile.in 2007-09-07 12:46:26 +0200 ++++ helper-progs/Makefile.in 2008-12-15 17:32:00 +0100 @@ -2,7 +2,8 @@ # Makefile.in for amavisd-new helper-progs @@ -78,8 +66,8 @@ all: amavis-milter amavis Index: helper-progs/amavis-milter.c ---- helper-progs/amavis-milter.c.orig 2004-07-02 16:44:26 +0200 -+++ helper-progs/amavis-milter.c 2007-09-07 12:46:43 +0200 +--- 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 @@ -52,7 +52,7 @@ #ifdef HAVE_SM_GEN_H # include "sm/gen.h" @@ -89,7 +77,7 @@ typedef int mybool; -@@ -928,13 +928,14 @@ +@@ -929,13 +929,14 @@ int main(int argc, char *argv[]) { @@ -106,7 +94,7 @@ int devnull; #if !defined(HAVE_MKDTEMP) && !defined(HAVE_MKTEMP) -@@ -969,6 +970,9 @@ +@@ -970,6 +971,9 @@ } milter_socket = strdup(optarg); break; @@ -116,7 +104,7 @@ case 'v': verbosity++; break; -@@ -998,23 +1002,20 @@ +@@ -999,23 +1003,20 @@ uname(&amavis_uts); /* check user and group */ @@ -154,7 +142,7 @@ if (!milter_socket) { fprintf(stderr, "%s: no milter socket specified (missing option -p)\n\n", argv[0]); usage(); -@@ -1115,11 +1116,22 @@ +@@ -1116,11 +1117,22 @@ } } @@ . patch -p0 <<'@@ .' Index: openpkg-src/amavisd/amavisd.spec ============================================================================ $ cvs diff -u -r1.84 -r1.85 amavisd.spec --- openpkg-src/amavisd/amavisd.spec 29 Jun 2008 08:10:31 -0000 1.84 +++ openpkg-src/amavisd/amavisd.spec 15 Dec 2008 16:36:21 -0000 1.85 @@ -22,7 +22,7 @@ ## # package versions -%define V_amavis 2.6.1 +%define V_amavis 2.6.2 %define V_logsumm 0.6 # package information @@ -36,7 +36,7 @@ Group: Mail License: GPL Version: %{V_amavis} -Release: 20080629 +Release: 20081215 # package options %option with_milter no @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
