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: 09-Aug-2007 12:20:43
Branch: HEAD Handle: 2007080911204200
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
add support to ClamAV MILTER for plain tagging with extra header
without replacing the Subject header
Summary:
Revision Changes Path
1.10 +58 -3 openpkg-src/clamav/clamav.patch
1.88 +1 -1 openpkg-src/clamav/clamav.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 clamav.patch
--- openpkg-src/clamav/clamav.patch 18 Jul 2007 20:13:31 -0000 1.9
+++ openpkg-src/clamav/clamav.patch 9 Aug 2007 10:20:42 -0000 1.10
@@ -1,7 +1,46 @@
Index: clamav-milter/clamav-milter.c
--- clamav-milter/clamav-milter.c.orig 2007-07-16 22:11:19 +0200
-+++ clamav-milter/clamav-milter.c 2007-07-18 22:03:22 +0200
-@@ -1045,11 +1045,13 @@
++++ clamav-milter/clamav-milter.c 2007-08-08 16:07:47 +0200
+@@ -411,6 +411,10 @@
+ * Send a 550 rejection when a virus is
+ * found
+ */
++static int nosubject = 0; /*
++ * Do not change the Subject header
++ * in case a virus is found.
++ */
+ static int hflag = 0; /*
+ * Include original message headers in
+ * report
+@@ -598,6 +602,7 @@
+ puts(_("\t--max-childen\t\t-m\tMaximum number of concurrent scans."));
+ puts(_("\t--outgoing\t\t-o\tScan outgoing messages from this
machine."));
+ puts(_("\t--noreject\t\t-N\tDon't reject viruses, silently throw them
away."));
++ puts(_("\t--nosubject\t\t-N\tDon't change Subject header."));
+ puts(_("\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status
headers."));
+ puts(_("\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."));
+ puts(_("\t--postmaster\t\t-p EMAIL\tPostmaster address
[default=postmaster]."));
+@@ -778,6 +783,9 @@
+ "noreject", 0, NULL, 'N'
+ },
+ {
++ "nosubject", 0, NULL, 'Z'
++ },
++ {
+ "noxheader", 0, NULL, 'n'
+ },
+ {
+@@ -946,6 +954,9 @@
+ case 'N': /* Do we reject mail or silently drop
it */
+ rejectmail = 0;
+ break;
++ case 'Z':
++ nosubject = 1;
++ break;
+ case 'o': /* scan outgoing mail */
+ oflag++;
+ break;
+@@ -1045,11 +1056,13 @@
}
port = argv[optind];
@@ -15,9 +54,25 @@
if(strncasecmp(port, "inet:", 5) == 0)
if(!lflag) {
+@@ -4934,6 +4947,7 @@
+ struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx);
+ char subject[128];
+
++ if (!nosubject) {
+ if(privdata->subject)
+ smfi_addheader(ctx, "X-Original-Subject", privdata->subject);
+
+@@ -4942,6 +4956,7 @@
+ smfi_chgheader(ctx, "Subject", 1, subject);
+ else
+ smfi_addheader(ctx, "Subject", subject);
++ }
+ }
+
+ #if 0
Index: shared/output.c
--- shared/output.c.orig 2007-03-31 21:27:56 +0200
-+++ shared/output.c 2007-07-18 21:47:45 +0200
++++ shared/output.c 2007-08-08 15:53:27 +0200
@@ -60,7 +60,7 @@
pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.spec
============================================================================
$ cvs diff -u -r1.87 -r1.88 clamav.spec
--- openpkg-src/clamav/clamav.spec 18 Jul 2007 20:13:31 -0000 1.87
+++ openpkg-src/clamav/clamav.spec 9 Aug 2007 10:20:42 -0000 1.88
@@ -33,7 +33,7 @@
Group: AntiVirus
License: GPL
Version: 0.91.1
-Release: 20070718
+Release: 20070809
# package options
%option with_milter no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
