OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jun-2007 23:36:01
Branch: HEAD Handle: 2007060622360100
Modified files:
openpkg-src/amavisd amavisd.patch amavisd.spec
Log:
modifying package: amavisd-2.5.1 20070531 -> 20070606
Summary:
Revision Changes Path
1.5 +18 -0 openpkg-src/amavisd/amavisd.patch
1.76 +1 -1 openpkg-src/amavisd/amavisd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 amavisd.patch
--- openpkg-src/amavisd/amavisd.patch 30 Dec 2006 16:14:55 -0000 1.4
+++ openpkg-src/amavisd/amavisd.patch 6 Jun 2007 21:36:01 -0000 1.5
@@ -153,3 +153,21 @@
/* 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.75 -r1.76 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 31 May 2007 14:48:55 -0000 1.75
+++ openpkg-src/amavisd/amavisd.spec 6 Jun 2007 21:36:01 -0000 1.76
@@ -37,7 +37,7 @@
Group: Mail
License: GPL
Version: %{V_amavis}
-Release: 20070531
+Release: 20070606
# package options
%option with_milter no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
