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:04:21
Branch: HEAD Handle: 2007090711041900
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
fix building against MILTER API
Summary:
Revision Changes Path
1.11 +19 -10 openpkg-src/clamav/clamav.patch
1.90 +1 -1 openpkg-src/clamav/clamav.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 clamav.patch
--- openpkg-src/clamav/clamav.patch 9 Aug 2007 10:20:42 -0000 1.10
+++ openpkg-src/clamav/clamav.patch 7 Sep 2007 10:04:19 -0000 1.11
@@ -1,7 +1,16 @@
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-08-08 16:07:47 +0200
-@@ -411,6 +411,10 @@
+--- clamav-milter/clamav-milter.c.orig 2007-08-20 23:01:19 +0200
++++ clamav-milter/clamav-milter.c 2007-09-07 12:02:17 +0200
+@@ -76,7 +76,7 @@
+ #include <stdarg.h>
+ #include <errno.h>
+ #if HAVE_LIBMILTER_MFAPI_H
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
+ #endif
+ #include <pthread.h>
+ #include <sys/time.h>
+@@ -419,6 +419,10 @@
* Send a 550 rejection when a virus is
* found
*/
@@ -12,7 +21,7 @@
static int hflag = 0; /*
* Include original message headers in
* report
-@@ -598,6 +602,7 @@
+@@ -607,6 +611,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."));
@@ -20,7 +29,7 @@
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 @@
+@@ -787,6 +792,9 @@
"noreject", 0, NULL, 'N'
},
{
@@ -30,7 +39,7 @@
"noxheader", 0, NULL, 'n'
},
{
-@@ -946,6 +954,9 @@
+@@ -955,6 +963,9 @@
case 'N': /* Do we reject mail or silently drop
it */
rejectmail = 0;
break;
@@ -40,7 +49,7 @@
case 'o': /* scan outgoing mail */
oflag++;
break;
-@@ -1045,11 +1056,13 @@
+@@ -1054,11 +1065,13 @@
}
port = argv[optind];
@@ -54,7 +63,7 @@
if(strncasecmp(port, "inet:", 5) == 0)
if(!lflag) {
-@@ -4934,6 +4947,7 @@
+@@ -5037,6 +5050,7 @@
struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx);
char subject[128];
@@ -62,7 +71,7 @@
if(privdata->subject)
smfi_addheader(ctx, "X-Original-Subject", privdata->subject);
-@@ -4942,6 +4956,7 @@
+@@ -5045,6 +5059,7 @@
smfi_chgheader(ctx, "Subject", 1, subject);
else
smfi_addheader(ctx, "Subject", subject);
@@ -72,7 +81,7 @@
#if 0
Index: shared/output.c
--- shared/output.c.orig 2007-03-31 21:27:56 +0200
-+++ shared/output.c 2007-08-08 15:53:27 +0200
++++ shared/output.c 2007-09-07 12:01:18 +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.89 -r1.90 clamav.spec
--- openpkg-src/clamav/clamav.spec 21 Aug 2007 14:45:27 -0000 1.89
+++ openpkg-src/clamav/clamav.spec 7 Sep 2007 10:04:19 -0000 1.90
@@ -33,7 +33,7 @@
Group: AntiVirus
License: GPL
Version: 0.91.2
-Release: 20070821
+Release: 20070907
# package options
%option with_milter no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
