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: 07-Sep-2007 12:47:55
Branch: HEAD Handle: 2007090711475400
Modified files:
openpkg-src/amavisd amavisd.patch amavisd.spec
Log:
fix building under with_milter=yes
Summary:
Revision Changes Path
1.6 +32 -26 openpkg-src/amavisd/amavisd.patch
1.79 +1 -1 openpkg-src/amavisd/amavisd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 amavisd.patch
--- openpkg-src/amavisd/amavisd.patch 6 Jun 2007 21:36:01 -0000 1.5
+++ openpkg-src/amavisd/amavisd.patch 7 Sep 2007 10:47:54 -0000 1.6
@@ -1,7 +1,7 @@
Index: amavisd.conf
---- amavisd.conf.orig 2006-11-20 18:35:32 +0100
-+++ amavisd.conf 2006-12-30 17:09:37 +0100
-@@ -317,16 +317,16 @@
+--- 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/
# ['Sophos SAVI', \&sophos_savi ],
@@ -27,10 +27,25 @@
+# this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
# ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
- # ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/],
+ # # note that Mail::ClamAV requires perl to be build with threading!
+Index: amavisd
+--- amavisd.orig 2007-06-27 12:43:00 +0200
++++ amavisd 2007-09-07 12:46:26 +0200
+@@ -9922,7 +9922,10 @@
+ if ($subject_tag ne '') {
+ if (defined $msginfo->orig_header_fields->{'subject'}) {
+ $hdr_edits->edit_header('Subject',
+- sub { $_[1]=~/^([ \t]?)(.*)\z/s; ' '.$subject_tag.$2 });
++ sub { $_[1]=~/^([ \t]?)(.*)\z/s;
++ my $subj = $2;
++ $subj=~s/\Q$subject_tag\E//sg;
++ ' '.$subject_tag.$subj });
+ } else { # no Subject header field present, insert one
+ $subject_tag =~ s/[ \t]+\z//; # trim
+ $hdr_edits->append_header('Subject', $subject_tag);
Index: amavislogsumm
---- amavislogsumm.orig 2006-12-30 17:09:37 +0100
-+++ amavislogsumm 2006-12-30 17:09:37 +0100
+--- amavislogsumm.orig 2007-09-07 12:46:26 +0200
++++ amavislogsumm 2007-09-07 12:46:26 +0200
@@ -309,7 +309,7 @@
if ($spamCount > 0) {
printf "\tSPAM : %5.2f\n", ($spamHitSum / $spamCount);
@@ -42,7 +57,7 @@
}
Index: helper-progs/Makefile.in
--- helper-progs/Makefile.in.orig 2004-04-11 01:51:52 +0200
-+++ helper-progs/Makefile.in 2006-12-30 17:09:37 +0100
++++ helper-progs/Makefile.in 2007-09-07 12:46:26 +0200
@@ -2,7 +2,8 @@
# Makefile.in for amavisd-new helper-progs
@@ -64,7 +79,16 @@
Index: helper-progs/amavis-milter.c
--- helper-progs/amavis-milter.c.orig 2004-07-02 16:44:26 +0200
-+++ helper-progs/amavis-milter.c 2006-12-30 17:11:24 +0100
++++ helper-progs/amavis-milter.c 2007-09-07 12:46:43 +0200
+@@ -52,7 +52,7 @@
+ #ifdef HAVE_SM_GEN_H
+ # include "sm/gen.h"
+ #endif
+-#include "libmilter/mfapi.h"
++#include "milter/mfapi.h"
+
+ typedef int mybool;
+
@@ -928,13 +928,14 @@
int
main(int argc, char *argv[])
@@ -153,21 +177,3 @@
/* smfi_settimeout(1800); */ /* defaults to 7210 seconds */
-https://intevation.de/roundup/kolab/merge32 "amavisd inserts subject tag
more than once"
-https://intevation.de/roundup/kolab/file543/amavisd-new-2.5.1-last_subject_tag_only.patch
-diff -urN amavisd.orig amavisd
---- amavisd.orig 2007-05-31 14:10:01.000000000 +0200
-+++ amavisd 2007-06-06 16:33:54.000000000 +0200
-@@ -9854,7 +9854,10 @@
- if ($subject_tag ne '') {
- if (defined $msginfo->orig_header_fields->{'subject'}) {
- $hdr_edits->edit_header('Subject',
-- sub { $_[1]=~/^([ \t]?)(.*)\z/s; ' '.$subject_tag.$2 });
-+ sub { $_[1]=~/^([ \t]?)(.*)\z/s;
-+ my $subj = $2;
-+ $subj=~s/\Q$subject_tag\E//sg;
-+ ' '.$subject_tag.$subj });
- } else { # no Subject header field present, insert one
- $subject_tag =~ s/[ \t]+\z//; # trim
- $hdr_edits->append_header('Subject', $subject_tag);
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.78 -r1.79 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 27 Jun 2007 15:34:43 -0000 1.78
+++ openpkg-src/amavisd/amavisd.spec 7 Sep 2007 10:47:54 -0000 1.79
@@ -37,7 +37,7 @@
Group: Mail
License: GPL
Version: %{V_amavis}
-Release: 20070627
+Release: 20070907
# package options
%option with_milter no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
