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:50:33
Branch: HEAD Handle: 2007090716503200
Modified files:
openpkg-src/clamav clamav.patch
Log:
I really hate the hard-coders in this world... try the even larger
hammer to get clamav-milter building under Linux, too
Summary:
Revision Changes Path
1.13 +26 -8 openpkg-src/clamav/clamav.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 clamav.patch
--- openpkg-src/clamav/clamav.patch 7 Sep 2007 15:19:19 -0000 1.12
+++ openpkg-src/clamav/clamav.patch 7 Sep 2007 15:50:32 -0000 1.13
@@ -1,6 +1,6 @@
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 17:16:44 +0200
++++ clamav-milter/clamav-milter.c 2007-09-07 17:46:13 +0200
@@ -75,9 +75,7 @@
#include <sys/un.h>
#include <stdarg.h>
@@ -12,7 +12,16 @@
#include <pthread.h>
#include <sys/time.h>
#include <signal.h>
-@@ -419,6 +417,10 @@
+@@ -109,6 +107,8 @@
+
+ #ifdef C_LINUX
+ #include <sys/sendfile.h> /* FIXME: use sendfile on BSD not Linux */
++#endif
++#if 0
+ #include <libintl.h>
+ #include <locale.h>
+
+@@ -419,6 +419,10 @@
* Send a 550 rejection when a virus is
* found
*/
@@ -23,7 +32,7 @@
static int hflag = 0; /*
* Include original message headers in
* report
-@@ -607,6 +609,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."));
@@ -31,7 +40,16 @@
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 +790,9 @@
+@@ -701,7 +706,7 @@
+ else
+ progname = "clamav-milter";
+
+-#ifdef C_LINUX
++#if 0
+ setlocale(LC_ALL, "");
+ bindtextdomain(progname, DATADIR"/clamav-milter/locale");
+ textdomain(progname);
+@@ -787,6 +792,9 @@
"noreject", 0, NULL, 'N'
},
{
@@ -41,7 +59,7 @@
"noxheader", 0, NULL, 'n'
},
{
-@@ -955,6 +961,9 @@
+@@ -955,6 +963,9 @@
case 'N': /* Do we reject mail or silently drop
it */
rejectmail = 0;
break;
@@ -51,7 +69,7 @@
case 'o': /* scan outgoing mail */
oflag++;
break;
-@@ -1054,11 +1063,13 @@
+@@ -1054,11 +1065,13 @@
}
port = argv[optind];
@@ -65,7 +83,7 @@
if(strncasecmp(port, "inet:", 5) == 0)
if(!lflag) {
-@@ -5037,6 +5048,7 @@
+@@ -5037,6 +5050,7 @@
struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx);
char subject[128];
@@ -73,7 +91,7 @@
if(privdata->subject)
smfi_addheader(ctx, "X-Original-Subject", privdata->subject);
-@@ -5045,6 +5057,7 @@
+@@ -5045,6 +5059,7 @@
smfi_chgheader(ctx, "Subject", 1, subject);
else
smfi_addheader(ctx, "Subject", subject);
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
