OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 23-Mar-2009 22:02:20
Branch: HEAD Handle: 2009032321021900
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
upgrading package: clamav 0.94 -> 0.95
Summary:
Revision Changes Path
1.15 +43 -108 openpkg-src/clamav/clamav.patch
1.98 +2 -2 openpkg-src/clamav/clamav.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 clamav.patch
--- openpkg-src/clamav/clamav.patch 5 Sep 2008 18:48:24 -0000 1.14
+++ openpkg-src/clamav/clamav.patch 23 Mar 2009 21:02:19 -0000 1.15
@@ -1,130 +1,65 @@
Index: clamav-milter/clamav-milter.c
---- clamav-milter/clamav-milter.c.orig 2008-09-01 19:19:44 +0200
-+++ clamav-milter/clamav-milter.c 2008-09-05 20:43:00 +0200
-@@ -74,9 +74,7 @@
- #include <sys/un.h>
- #include <stdarg.h>
- #include <errno.h>
--#if HAVE_LIBMILTER_MFAPI_H
+--- clamav-milter/clamav-milter.c.orig 2009-03-16 19:37:26 +0100
++++ clamav-milter/clamav-milter.c 2009-03-23 21:50:53 +0100
+@@ -32,7 +32,7 @@
+ #include <syslog.h>
+ #endif
+ #include <time.h>
-#include <libmilter/mfapi.h>
--#endif
+#include "milter/mfapi.h"
- #include <pthread.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-@@ -110,6 +108,8 @@
-
- #ifdef C_LINUX
- #include <sys/sendfile.h> /* FIXME: use sendfile on BSD not Linux */
-+#endif
-+#if 0
- #include <libintl.h>
- #include <locale.h>
-@@ -432,6 +432,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
-@@ -676,6 +680,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]."));
-@@ -771,7 +776,7 @@
- else
- progname = "clamav-milter";
+ #include "clamav.h"
--#ifdef C_LINUX
-+#if 0
- setlocale(LC_ALL, "");
- bindtextdomain(progname, DATADIR"/clamav-milter/locale");
- textdomain(progname);
-@@ -860,6 +865,9 @@
- "noreject", 0, NULL, 'N'
- },
- {
-+ "nosubject", 0, NULL, 'Z'
-+ },
-+ {
- "noxheader", 0, NULL, 'n'
- },
- {
-@@ -1034,6 +1042,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;
-@@ -1139,11 +1150,13 @@
- }
- port = argv[optind];
+Index: clamav-milter/clamfi.c
+--- clamav-milter/clamfi.c.orig 2009-03-20 22:15:38 +0100
++++ clamav-milter/clamfi.c 2009-03-23 21:52:24 +0100
+@@ -29,7 +29,7 @@
+ #include <unistd.h>
+ #include <ctype.h>
-+#if 0
- if(rootdir == NULL) /* FIXME: Handle CHROOT */
- if(checkCF && verifyIncomingSocketName(port) < 0) {
- fprintf(stderr, _("%s: socket-addr (%s) doesn't agree
with sendmail.cf\n"), argv[0], port);
- return EX_CONFIG;
- }
-+#endif
-
- if(strncasecmp(port, "inet:", 5) == 0)
- if(!lflag) {
-@@ -5242,6 +5255,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);
-
-@@ -5250,6 +5264,7 @@
- smfi_chgheader(ctx, "Subject", 1, subject);
- else
- smfi_addheader(ctx, "Subject", subject);
-+ }
- }
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
+
+ #include "shared/optparser.h"
+ #include "shared/output.h"
+Index: clamav-milter/clamfi.h
+--- clamav-milter/clamfi.h.orig 2009-03-16 19:37:26 +0100
++++ clamav-milter/clamfi.h 2009-03-23 21:52:57 +0100
+@@ -22,7 +22,7 @@
+ #define _CLAMFI_H
+
+ #include "shared/optparser.h"
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
- #if 0
+ extern uint64_t maxfilesize;
+ extern int addxvirus;
Index: configure
---- configure.orig 2008-09-01 20:41:18 +0200
-+++ configure 2008-09-05 20:42:16 +0200
-@@ -16932,9 +16932,6 @@
+--- configure.orig 2009-03-23 18:10:11 +0100
++++ configure 2009-03-23 21:49:35 +0100
+@@ -20946,9 +20946,6 @@
- save_LDFLAGS="$LDFLAGS"
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+ save_LIBS="$LIBS"
+ 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; }
-@@ -17162,7 +17159,7 @@
+ LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
+ { $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
+ $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
+@@ -21188,7 +21185,7 @@
- LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
-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`
+ as_ac_Header=`$as_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 2008-08-16 19:18:00 +0200
-+++ shared/output.c 2008-09-05 20:42:16 +0200
-@@ -61,7 +61,7 @@
+--- shared/output.c.orig 2009-03-16 19:37:26 +0100
++++ shared/output.c 2009-03-23 21:47:48 +0100
+@@ -67,7 +67,7 @@
pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.spec
============================================================================
$ cvs diff -u -r1.97 -r1.98 clamav.spec
--- openpkg-src/clamav/clamav.spec 5 Sep 2008 18:48:24 -0000 1.97
+++ openpkg-src/clamav/clamav.spec 23 Mar 2009 21:02:19 -0000 1.98
@@ -31,8 +31,8 @@
Class: EVAL
Group: AntiVirus
License: GPL
-Version: 0.94
-Release: 20080905
+Version: 0.95
+Release: 20090323
# package options
%option with_milter no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
