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 17:19:19
Branch: HEAD Handle: 2007090716191900
Modified files:
openpkg-src/clamav clamav.patch
Log:
next attempt in trying to get the MILTER stuff building
Summary:
Revision Changes Path
1.12 +36 -12 openpkg-src/clamav/clamav.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 clamav.patch
--- openpkg-src/clamav/clamav.patch 7 Sep 2007 10:04:19 -0000 1.11
+++ openpkg-src/clamav/clamav.patch 7 Sep 2007 15:19:19 -0000 1.12
@@ -1,16 +1,18 @@
Index: clamav-milter/clamav-milter.c
--- 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 @@
++++ clamav-milter/clamav-milter.c 2007-09-07 17:16:44 +0200
+@@ -75,9 +75,7 @@
+ #include <sys/un.h>
#include <stdarg.h>
#include <errno.h>
- #if HAVE_LIBMILTER_MFAPI_H
+-#if HAVE_LIBMILTER_MFAPI_H
-#include <libmilter/mfapi.h>
+-#endif
+#include "milter/mfapi.h"
- #endif
#include <pthread.h>
#include <sys/time.h>
-@@ -419,6 +419,10 @@
+ #include <signal.h>
+@@ -419,6 +417,10 @@
* Send a 550 rejection when a virus is
* found
*/
@@ -21,7 +23,7 @@
static int hflag = 0; /*
* Include original message headers in
* report
-@@ -607,6 +611,7 @@
+@@ -607,6 +609,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."));
@@ -29,7 +31,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]."));
-@@ -787,6 +792,9 @@
+@@ -787,6 +790,9 @@
"noreject", 0, NULL, 'N'
},
{
@@ -39,7 +41,7 @@
"noxheader", 0, NULL, 'n'
},
{
-@@ -955,6 +963,9 @@
+@@ -955,6 +961,9 @@
case 'N': /* Do we reject mail or silently drop
it */
rejectmail = 0;
break;
@@ -49,7 +51,7 @@
case 'o': /* scan outgoing mail */
oflag++;
break;
-@@ -1054,11 +1065,13 @@
+@@ -1054,11 +1063,13 @@
}
port = argv[optind];
@@ -63,7 +65,7 @@
if(strncasecmp(port, "inet:", 5) == 0)
if(!lflag) {
-@@ -5037,6 +5050,7 @@
+@@ -5037,6 +5048,7 @@
struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx);
char subject[128];
@@ -71,7 +73,7 @@
if(privdata->subject)
smfi_addheader(ctx, "X-Original-Subject", privdata->subject);
-@@ -5045,6 +5059,7 @@
+@@ -5045,6 +5057,7 @@
smfi_chgheader(ctx, "Subject", 1, subject);
else
smfi_addheader(ctx, "Subject", subject);
@@ -79,9 +81,31 @@
}
#if 0
+Index: configure
+--- configure.orig 2007-08-21 00:58:23 +0200
++++ configure 2007-09-07 17:16:12 +0200
+@@ -23684,9 +23684,6 @@
+
+ save_LDFLAGS="$LDFLAGS"
+ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+- if test -d /usr/lib/libmilter ; then
+- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
+- fi
+ LDFLAGS="$LDFLAGS -lmilter $CLAMAV_MILTER_LIBS"
+ { echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
+ echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6; }
+@@ -23914,7 +23911,7 @@
+
+ LDFLAGS="$save_LDFLAGS"
+
+-for ac_header in libmilter/mfapi.h
++for ac_header in milter/mfapi.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
Index: shared/output.c
--- shared/output.c.orig 2007-03-31 21:27:56 +0200
-+++ shared/output.c 2007-09-07 12:01:18 +0200
++++ shared/output.c 2007-09-07 17:15:06 +0200
@@ -60,7 +60,7 @@
pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
