[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
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: 08-Nov-2009 10:47:05
Branch: HEAD Handle: 2009110809470400
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
upgrading package: clamav 0.95.2 - 0.95.3
Summary:
RevisionChanges Path
1.17+22 -22 openpkg-src/clamav/clamav.patch
1.104 +2 -2 openpkg-src/clamav/clamav.spec
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.patch
$ cvs diff -u -r1.16 -r1.17 clamav.patch
--- openpkg-src/clamav/clamav.patch 9 Apr 2009 16:46:57 - 1.16
+++ openpkg-src/clamav/clamav.patch 8 Nov 2009 09:47:04 - 1.17
@@ -1,6 +1,6 @@
Index: clamav-milter/clamav-milter.c
clamav-milter/clamav-milter.c.orig 2009-04-01 13:48:54 +0200
-+++ clamav-milter/clamav-milter.c2009-04-09 17:25:12 +0200
+--- clamav-milter/clamav-milter.c.orig 2009-10-28 16:34:13 +0100
clamav-milter/clamav-milter.c2009-11-08 10:27:04 +0100
@@ -32,7 +32,7 @@
#include syslog.h
#endif
@@ -11,8 +11,8 @@
#include clamav.h
Index: clamav-milter/clamfi.c
clamav-milter/clamfi.c.orig 2009-04-02 18:36:34 +0200
-+++ clamav-milter/clamfi.c 2009-04-09 17:25:12 +0200
+--- clamav-milter/clamfi.c.orig 2009-10-28 16:34:13 +0100
clamav-milter/clamfi.c 2009-11-08 10:27:04 +0100
@@ -29,7 +29,7 @@
#include unistd.h
#include ctype.h
@@ -23,8 +23,8 @@
#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-04-09 17:25:12 +0200
+--- clamav-milter/clamfi.h.orig 2009-07-06 15:21:58 +0200
clamav-milter/clamfi.h 2009-11-08 10:27:04 +0100
@@ -22,7 +22,7 @@
#define _CLAMFI_H
@@ -35,9 +35,9 @@
extern uint64_t maxfilesize;
extern int addxvirus;
Index: configure
configure.orig 2009-04-08 16:38:23 +0200
-+++ configure2009-04-09 17:25:12 +0200
-@@ -20949,9 +20949,6 @@
+--- configure.orig 2009-10-28 16:34:13 +0100
configure2009-11-08 10:27:32 +0100
+@@ -16692,9 +16692,6 @@
save_LIBS=$LIBS
CLAMAV_MILTER_LIBS=$CLAMAV_MILTER_LIBS -lpthread
@@ -45,21 +45,21 @@
-CLAMAV_MILTER_LIBS=$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter
-fi
LIBS=$LIBS -lmilter $CLAMAV_MILTER_LIBS
- { $as_echo $as_me:$LINENO: checking for mi_stop in -lmilter 5
+ { $as_echo $as_me:${as_lineno-$LINENO}: checking for mi_stop in
-lmilter 5
$as_echo_n checking for mi_stop in -lmilter... 6; }
-@@ -21191,7 +21188,7 @@
+@@ -16842,7 +16839,7 @@
+ fi
LIBS=$save_LIBS
-
--for ac_header in libmilter/mfapi.h
-+for ac_header in milter/mfapi.h
- do
- 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
+-for ac_header in libmilter/mfapi.h
++for ac_header in milter/mfapi.h
+ do :
+ ac_fn_c_check_header_mongrel $LINENO libmilter/mfapi.h
ac_cv_header_libmilter_mfapi_h $ac_includes_default
+ if test x$ac_cv_header_libmilter_mfapi_h = xyes; then :
Index: libclamav/others.c
libclamav/others.c.orig 2009-04-03 10:33:24 +0200
-+++ libclamav/others.c 2009-04-09 17:29:05 +0200
-@@ -176,8 +176,10 @@
+--- libclamav/others.c.orig 2009-10-28 16:34:13 +0100
libclamav/others.c 2009-11-08 10:27:04 +0100
+@@ -177,8 +177,10 @@
if(is_rar_initd) return;
is_rar_initd = 1;
@@ -71,8 +71,8 @@
if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t
*))lt_dlsym(rhandle, libclamunrar_iface_LTX_unrar_open)) ||
Index: shared/output.c
shared/output.c.orig 2009-03-16 19:37:26 +0100
-+++ shared/output.c 2009-04-09 17:25:12 +0200
+--- shared/output.c.orig 2009-10-28 16:34:13 +0100
shared/output.c 2009-11-08 10:27:04 +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.103 -r1.104 clamav.spec
--- openpkg-src/clamav/clamav.spec2 Jul 2009 16:37:41 - 1.103
+++ openpkg-src/clamav/clamav.spec8 Nov 2009 09:47:04 - 1.104
@@ -31,8 +31,8 @@
Class:EVAL
Group:AntiVirus
License: GPL
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
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: 09-Apr-2009 18:46:57
Branch: HEAD Handle: 2009040917465700
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
get rid of unrar stuff
Summary:
RevisionChanges Path
1.16+24 -10 openpkg-src/clamav/clamav.patch
1.100 +1 -0 openpkg-src/clamav/clamav.spec
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.patch
$ cvs diff -u -r1.15 -r1.16 clamav.patch
--- openpkg-src/clamav/clamav.patch 23 Mar 2009 21:02:19 - 1.15
+++ openpkg-src/clamav/clamav.patch 9 Apr 2009 16:46:57 - 1.16
@@ -1,6 +1,6 @@
Index: clamav-milter/clamav-milter.c
clamav-milter/clamav-milter.c.orig 2009-03-16 19:37:26 +0100
-+++ clamav-milter/clamav-milter.c2009-03-23 21:50:53 +0100
+--- clamav-milter/clamav-milter.c.orig 2009-04-01 13:48:54 +0200
clamav-milter/clamav-milter.c2009-04-09 17:25:12 +0200
@@ -32,7 +32,7 @@
#include syslog.h
#endif
@@ -11,8 +11,8 @@
#include clamav.h
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
+--- clamav-milter/clamfi.c.orig 2009-04-02 18:36:34 +0200
clamav-milter/clamfi.c 2009-04-09 17:25:12 +0200
@@ -29,7 +29,7 @@
#include unistd.h
#include ctype.h
@@ -24,7 +24,7 @@
#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
clamav-milter/clamfi.h 2009-04-09 17:25:12 +0200
@@ -22,7 +22,7 @@
#define _CLAMFI_H
@@ -35,9 +35,9 @@
extern uint64_t maxfilesize;
extern int addxvirus;
Index: configure
configure.orig 2009-03-23 18:10:11 +0100
-+++ configure2009-03-23 21:49:35 +0100
-@@ -20946,9 +20946,6 @@
+--- configure.orig 2009-04-08 16:38:23 +0200
configure2009-04-09 17:25:12 +0200
+@@ -20949,9 +20949,6 @@
save_LIBS=$LIBS
CLAMAV_MILTER_LIBS=$CLAMAV_MILTER_LIBS -lpthread
@@ -47,7 +47,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 @@
+@@ -21191,7 +21188,7 @@
LIBS=$save_LIBS
@@ -56,9 +56,23 @@
do
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: libclamav/others.c
+--- libclamav/others.c.orig 2009-04-03 10:33:24 +0200
libclamav/others.c 2009-04-09 17:29:05 +0200
+@@ -176,8 +176,10 @@
+ if(is_rar_initd) return;
+ is_rar_initd = 1;
+
++#if 0
+ rhandle = lt_dlfind(libclamunrar_iface, unrar);
+ if (!rhandle)
++#endif
+ return;
+
+ if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t
*))lt_dlsym(rhandle, libclamunrar_iface_LTX_unrar_open)) ||
Index: shared/output.c
--- shared/output.c.orig 2009-03-16 19:37:26 +0100
-+++ shared/output.c 2009-03-23 21:47:48 +0100
shared/output.c 2009-04-09 17:25:12 +0200
@@ -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.99 -r1.100 clamav.spec
--- openpkg-src/clamav/clamav.spec9 Apr 2009 07:53:29 - 1.99
+++ openpkg-src/clamav/clamav.spec9 Apr 2009 16:46:57 - 1.100
@@ -103,6 +103,7 @@
%else
--disable-milter \
%endif
+--disable-unrar \
--disable-shared
# build package
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
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:
RevisionChanges Path
1.15+43 -108openpkg-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 - 1.14
+++ openpkg-src/clamav/clamav.patch 23 Mar 2009 21:02:19 - 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.c2008-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.c2009-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];
-
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
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: 05-Sep-2008 20:48:24
Branch: HEAD Handle: 2008090519482400
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
upgrading package: clamav 0.93.3 - 0.94
Summary:
RevisionChanges Path
1.14+21 -21 openpkg-src/clamav/clamav.patch
1.97+2 -2 openpkg-src/clamav/clamav.spec
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.patch
$ cvs diff -u -r1.13 -r1.14 clamav.patch
--- openpkg-src/clamav/clamav.patch 7 Sep 2007 15:50:32 - 1.13
+++ openpkg-src/clamav/clamav.patch 5 Sep 2008 18:48:24 - 1.14
@@ -1,7 +1,7 @@
Index: clamav-milter/clamav-milter.c
clamav-milter/clamav-milter.c.orig 2007-08-20 23:01:19 +0200
-+++ clamav-milter/clamav-milter.c2007-09-07 17:46:13 +0200
-@@ -75,9 +75,7 @@
+--- clamav-milter/clamav-milter.c.orig 2008-09-01 19:19:44 +0200
clamav-milter/clamav-milter.c2008-09-05 20:43:00 +0200
+@@ -74,9 +74,7 @@
#include sys/un.h
#include stdarg.h
#include errno.h
@@ -11,8 +11,8 @@
+#include milter/mfapi.h
#include pthread.h
#include sys/time.h
- #include signal.h
-@@ -109,6 +107,8 @@
+ #include sys/resource.h
+@@ -110,6 +108,8 @@
#ifdef C_LINUX
#include sys/sendfile.h /* FIXME: use sendfile on BSD not Linux */
@@ -21,7 +21,7 @@
#include libintl.h
#include locale.h
-@@ -419,6 +419,10 @@
+@@ -432,6 +432,10 @@
* Send a 550 rejection when a virus is
* found
*/
@@ -32,7 +32,7 @@
static int hflag = 0; /*
* Include original message headers in
* report
-@@ -607,6 +611,7 @@
+@@ -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.));
@@ -40,7 +40,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].));
-@@ -701,7 +706,7 @@
+@@ -771,7 +776,7 @@
else
progname = clamav-milter;
@@ -49,7 +49,7 @@
setlocale(LC_ALL, );
bindtextdomain(progname, DATADIR/clamav-milter/locale);
textdomain(progname);
-@@ -787,6 +792,9 @@
+@@ -860,6 +865,9 @@
noreject, 0, NULL, 'N'
},
{
@@ -59,7 +59,7 @@
noxheader, 0, NULL, 'n'
},
{
-@@ -955,6 +963,9 @@
+@@ -1034,6 +1042,9 @@
case 'N': /* Do we reject mail or silently drop
it */
rejectmail = 0;
break;
@@ -69,13 +69,13 @@
case 'o': /* scan outgoing mail */
oflag++;
break;
-@@ -1054,11 +1065,13 @@
+@@ -1139,11 +1150,13 @@
}
port = argv[optind];
+#if 0
if(rootdir == NULL) /* FIXME: Handle CHROOT */
- if(verifyIncomingSocketName(port) 0) {
+ if(checkCF verifyIncomingSocketName(port) 0) {
fprintf(stderr, _(%s: socket-addr (%s) doesn't agree
with sendmail.cf\n), argv[0], port);
return EX_CONFIG;
}
@@ -83,7 +83,7 @@
if(strncasecmp(port, inet:, 5) == 0)
if(!lflag) {
-@@ -5037,6 +5050,7 @@
+@@ -5242,6 +5255,7 @@
struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx);
char subject[128];
@@ -91,7 +91,7 @@
if(privdata-subject)
smfi_addheader(ctx, X-Original-Subject, privdata-subject);
-@@ -5045,6 +5059,7 @@
+@@ -5250,6 +5264,7 @@
smfi_chgheader(ctx, Subject, 1, subject);
else
smfi_addheader(ctx, Subject, subject);
@@ -100,9 +100,9 @@
#if 0
Index: configure
configure.orig 2007-08-21 00:58:23 +0200
-+++ configure2007-09-07 17:16:12 +0200
-@@ -23684,9 +23684,6 @@
+---
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
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:
RevisionChanges 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 - 1.10
+++ openpkg-src/clamav/clamav.patch 7 Sep 2007 10:04:19 - 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.c2007-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.c2007-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.spec21 Aug 2007 14:45:27 - 1.89
+++ openpkg-src/clamav/clamav.spec7 Sep 2007 10:04:19 - 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
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
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:
RevisionChanges 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 - 1.9
+++ openpkg-src/clamav/clamav.patch 9 Aug 2007 10:20:42 - 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.c2007-07-18 22:03:22 +0200
-@@ -1045,11 +1045,13 @@
clamav-milter/clamav-milter.c2007-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.spec18 Jul 2007 20:13:31 - 1.87
+++ openpkg-src/clamav/clamav.spec9 Aug 2007 10:20:42 - 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
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
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: 18-Jul-2007 22:13:31
Branch: HEAD Handle: 2007071821133100
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
upgrading package: clamav 0.91 - 0.91.1
Summary:
RevisionChanges Path
1.9 +10 -9 openpkg-src/clamav/clamav.patch
1.87+2 -2 openpkg-src/clamav/clamav.spec
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.patch
$ cvs diff -u -r1.8 -r1.9 clamav.patch
--- openpkg-src/clamav/clamav.patch 11 Jul 2007 16:09:51 - 1.8
+++ openpkg-src/clamav/clamav.patch 18 Jul 2007 20:13:31 - 1.9
@@ -1,11 +1,12 @@
Index: clamav-milter/clamav-milter.c
clamav-milter/clamav-milter.c.orig 2007-07-11 00:14:08 +0200
-+++ clamav-milter/clamav-milter.c2007-07-11 18:07:24 +0200
-@@ -1054,10 +1054,12 @@
- #ifdef CL_EXPERIMENTAL
- if(rootdir == NULL) /* FIXME: Handle CHROOT */
- #endif
+--- clamav-milter/clamav-milter.c.orig 2007-07-16 22:11:19 +0200
clamav-milter/clamav-milter.c2007-07-18 22:03:22 +0200
+@@ -1045,11 +1045,13 @@
+ }
+ port = argv[optind];
+
+#if 0
+ if(rootdir == NULL) /* FIXME: Handle CHROOT */
if(verifyIncomingSocketName(port) 0) {
fprintf(stderr, _(%s: socket-addr (%s) doesn't agree
with sendmail.cf\n), argv[0], port);
return EX_CONFIG;
@@ -15,9 +16,9 @@
if(strncasecmp(port, inet:, 5) == 0)
if(!lflag) {
Index: shared/output.c
shared/output.c.orig 2007-03-02 01:43:18.0 +0100
-+++ shared/output.c 2007-05-30 06:17:48.279834583 +0200
-@@ -61,7 +61,7 @@
+--- shared/output.c.orig 2007-03-31 21:27:56 +0200
shared/output.c 2007-07-18 21:47:45 +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.86 -r1.87 clamav.spec
--- openpkg-src/clamav/clamav.spec11 Jul 2007 16:09:51 - 1.86
+++ openpkg-src/clamav/clamav.spec18 Jul 2007 20:13:31 - 1.87
@@ -32,8 +32,8 @@
Class:EVAL
Group:AntiVirus
License: GPL
-Version: 0.91
-Release: 20070711
+Version: 0.91.1
+Release: 20070718
# package options
%option with_milter no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Jul-2007 18:09:51
Branch: HEAD Handle: 2007071117095100
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
upgrading package: clamav 0.90.3 - 0.91
Summary:
RevisionChanges Path
1.8 +11 -11 openpkg-src/clamav/clamav.patch
1.86+2 -2 openpkg-src/clamav/clamav.spec
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.patch
$ cvs diff -u -r1.7 -r1.8 clamav.patch
--- openpkg-src/clamav/clamav.patch 31 May 2007 06:16:16 - 1.7
+++ openpkg-src/clamav/clamav.patch 11 Jul 2007 16:09:51 - 1.8
@@ -1,19 +1,19 @@
Index: clamav-milter/clamav-milter.c
clamav-milter/clamav-milter.c.orig 2007-04-12 18:35:17.0
+0200
-+++ clamav-milter/clamav-milter.c2007-05-30 06:15:50.985922900 +0200
-@@ -1018,10 +1018,12 @@
- }
- port = argv[optind];
-
+--- clamav-milter/clamav-milter.c.orig 2007-07-11 00:14:08 +0200
clamav-milter/clamav-milter.c2007-07-11 18:07:24 +0200
+@@ -1054,10 +1054,12 @@
+ #ifdef CL_EXPERIMENTAL
+ if(rootdir == NULL) /* FIXME: Handle CHROOT */
+ #endif
+#if 0
- if(verifyIncomingSocketName(port) 0) {
- fprintf(stderr, _(%s: socket-addr (%s) doesn't agree with
sendmail.cf\n), argv[0], port);
- return EX_CONFIG;
- }
+ if(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) {
- /*
Index: shared/output.c
--- shared/output.c.orig 2007-03-02 01:43:18.0 +0100
+++ shared/output.c 2007-05-30 06:17:48.279834583 +0200
@@ .
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.spec
$ cvs diff -u -r1.85 -r1.86 clamav.spec
--- openpkg-src/clamav/clamav.spec31 May 2007 16:09:53 - 1.85
+++ openpkg-src/clamav/clamav.spec11 Jul 2007 16:09:51 - 1.86
@@ -32,8 +32,8 @@
Class:EVAL
Group:AntiVirus
License: GPL
-Version: 0.90.3
-Release: 20070531
+Version: 0.91
+Release: 20070711
# package options
%option with_milter no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
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: 31-May-2007 08:16:17
Branch: HEAD Handle: 2007053107161600
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
do not hard-code gettext usage under Linux
Summary:
RevisionChanges Path
1.7 +15 -3 openpkg-src/clamav/clamav.patch
1.84+1 -1 openpkg-src/clamav/clamav.spec
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.patch
$ cvs diff -u -r1.6 -r1.7 clamav.patch
--- openpkg-src/clamav/clamav.patch 30 Dec 2006 09:57:43 - 1.6
+++ openpkg-src/clamav/clamav.patch 31 May 2007 06:16:16 - 1.7
@@ -1,7 +1,7 @@
Index: clamav-milter/clamav-milter.c
clamav-milter/clamav-milter.c.orig 2006-12-11 01:42:18 +0100
-+++ clamav-milter/clamav-milter.c2006-12-30 10:42:08 +0100
-@@ -830,10 +830,12 @@
+--- clamav-milter/clamav-milter.c.orig 2007-04-12 18:35:17.0
+0200
clamav-milter/clamav-milter.c2007-05-30 06:15:50.985922900 +0200
+@@ -1018,10 +1018,12 @@
}
port = argv[optind];
@@ -14,3 +14,15 @@
if(strncasecmp(port, inet:, 5) == 0)
if(!lflag) {
/*
+Index: shared/output.c
+--- shared/output.c.orig 2007-03-02 01:43:18.0 +0100
shared/output.c 2007-05-30 06:17:48.279834583 +0200
+@@ -61,7 +61,7 @@
+ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
+ #endif
+
+-#ifdef C_LINUX
++#if 0
+ #include libintl.h
+ #include locale.h
+
@@ .
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.spec
$ cvs diff -u -r1.83 -r1.84 clamav.spec
--- openpkg-src/clamav/clamav.spec13 Apr 2007 07:46:55 - 1.83
+++ openpkg-src/clamav/clamav.spec31 May 2007 06:16:16 - 1.84
@@ -33,7 +33,7 @@
Group:AntiVirus
License: GPL
Version: 0.90.2
-Release: 20070413
+Release: 20070531
# package options
%option with_milter no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec rc.clamav
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: 30-Dec-2006 10:57:44
Branch: HEAD Handle: 2006123009574301
Added files:
openpkg-src/clamav clamav.patch
Modified files:
openpkg-src/clamav clamav.spec rc.clamav
Log:
provide optional MILTER support for scanning mails for viruses via the
MTA MILTER API
Summary:
RevisionChanges Path
1.6 +16 -0 openpkg-src/clamav/clamav.patch
1.76+20 -2 openpkg-src/clamav/clamav.spec
1.17+40 -16 openpkg-src/clamav/rc.clamav
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.patch
$ cvs diff -u -r0 -r1.6 clamav.patch
--- /dev/null 2006-12-30 10:57:36 +0100
+++ clamav.patch 2006-12-30 10:57:44 +0100
@@ -0,0 +1,16 @@
+Index: clamav-milter/clamav-milter.c
+--- clamav-milter/clamav-milter.c.orig 2006-12-11 01:42:18 +0100
clamav-milter/clamav-milter.c2006-12-30 10:42:08 +0100
+@@ -830,10 +830,12 @@
+ }
+ port = argv[optind];
+
++#if 0
+ if(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) {
+ /*
@@ .
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.spec
$ cvs diff -u -r1.75 -r1.76 clamav.spec
--- openpkg-src/clamav/clamav.spec11 Dec 2006 18:05:31 - 1.75
+++ openpkg-src/clamav/clamav.spec30 Dec 2006 09:57:43 - 1.76
@@ -33,11 +33,15 @@
Group:AntiVirus
License: GPL
Version: 0.88.7
-Release: 20061211
+Release: 20061230
+
+# package options
+%option with_milter no
# list of sources
Source0:
http://switch.dl.sourceforge.net/clamav/clamav-%{version}.tar.gz
Source1: rc.clamav
+Patch0: clamav.patch
# build information
Prefix: %{l_prefix}
@@ -46,6 +50,10 @@
PreReq: OpenPKG, openpkg = 20060823
BuildPreReq: zlib, curl, gmp
PreReq: zlib, curl, gmp
+%if %{with_milter} == yes
+BuildPreReq: milter
+PreReq: milter
+%endif
AutoReq: no
AutoReqProv: no
@@ -68,6 +76,7 @@
%prep
%setup -q
+%patch -p0
%build
# configure package
@@ -84,10 +93,17 @@
--with-libcurl \
--with-user=%{l_rusr} \
--with-group=%{l_rgrp} \
+--without-tcpwrappers \
--disable-clamav \
--disable-clamuko \
--disable-urandom \
--disable-cr \
+%if %{with_milter} == yes
+--enable-milter \
+--with-sendmail=/dev/null \
+%else
+--disable-milter \
+%endif
--disable-shared
# build package
@@ -130,7 +146,9 @@
# strip-down installation hierarchy
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* /dev/null 21 || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* /dev/null 21 || true
-rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/clamav-milter.1
+%if %{with_milter} == no
+rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/clamav-milter.8
+%endif
# create additional installation directory
%{l_shtool} mkdir -f -p -m 755 \
@@ .
patch -p0 '@@ .'
Index: openpkg-src/clamav/rc.clamav
$ cvs diff -u -r1.16 -r1.17 rc.clamav
--- openpkg-src/clamav/rc.clamav 20 Oct 2006 12:41:07 - 1.16
+++ openpkg-src/clamav/rc.clamav 30 Dec 2006 09:57:44 - 1.17
@@ -5,6 +5,9 @@
%config
clamav_enable=$openpkg_rc_def
+clamav_daemons=clamd clamav-milter
+clamav_clamd_flags=
+clamav_clamav_milter_flags=
clamav_update=daily
clamav_log_prolog=true
clamav_log_epilog=true
@@ -14,9 +17,17 @@
%common
clamav_cfgfile=@l_prefix@/etc/clamav/clamd.conf
-clamav_pidfile=@l_prefix@/var/clamav/clamd.pid
+clamav_pidfile_clamd=@l_prefix@/var/clamav/clamd.pid
+clamav_pidfile_clamav_milter=@l_prefix@/var/clamav/clamav-milter.pid
clamav_signal () {
-[ -f $clamav_pidfile ] kill -$1 `cat $clamav_pidfile`
+[ -f $clamav_pidfile_clamd ] \
+ kill -$1 `cat $clamav_pidfile_clamd`
+local rc_clamav_clamd=$?
+
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
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: 12-May-2005 20:20:29
Branch: HEAD Handle: 2005051219202800
Modified files:
openpkg-src/clamav clamav.spec
Removed files:
openpkg-src/clamav clamav.patch
Log:
upgrading package: clamav 0.84 - 0.85
Summary:
RevisionChanges Path
1.5 +0 -10 openpkg-src/clamav/clamav.patch
1.49+2 -4 openpkg-src/clamav/clamav.spec
rm -f openpkg-src/clamav/clamav.patch '@@ .'
Index: openpkg-src/clamav/clamav.patch
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.spec
$ cvs diff -u -r1.48 -r1.49 clamav.spec
--- openpkg-src/clamav/clamav.spec30 Apr 2005 17:13:49 - 1.48
+++ openpkg-src/clamav/clamav.spec12 May 2005 18:20:28 - 1.49
@@ -32,13 +32,12 @@
Class:PLUS
Group:Filesystem
License: GPL
-Version: 0.84
-Release: 20050430
+Version: 0.85
+Release: 20050512
# list of sources
Source0: http://osdn.dl.sourceforge.net/clamav/clamav-%{version}.tar.gz
Source1: rc.clamav
-Patch0: clamav.patch
# build information
Prefix: %{l_prefix}
@@ -69,7 +68,6 @@
%prep
%setup -q
-%patch -p0
%build
# configure package
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/clamav/ clamav.patch clamav.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Jun-2004 14:06:56
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
upgrading package: clamav 0.72 - 0.73
Summary:
RevisionChanges Path
1.4 +0 -0 openpkg-src/clamav/clamav.patch
1.28+0 -0 openpkg-src/clamav/clamav.spec
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.patch
$ cvs diff -u -r1.3 -r1.4 clamav.patch
--- openpkg-src/clamav/clamav.patch 1 Apr 2004 18:36:16 - 1.3
+++ openpkg-src/clamav/clamav.patch 15 Jun 2004 12:06:55 - 1.4
@@ -1,6 +1,6 @@
--- libclamav/zziplib/zzip-conf.h.orig 2004-02-07 21:41:08.0 +0100
+++ libclamav/zziplib/zzip-conf.h2004-02-07 21:34:18.0 +0100
-@@ -64,6 +64,7 @@
+@@ -69,6 +69,7 @@
#ifdef ZZIP_ssize_t
#define _zzip_ssize_t ZZIP_ssize_t
#else
@@ .
patch -p0 '@@ .'
Index: openpkg-src/clamav/clamav.spec
$ cvs diff -u -r1.27 -r1.28 clamav.spec
--- openpkg-src/clamav/clamav.spec4 Jun 2004 07:09:45 - 1.27
+++ openpkg-src/clamav/clamav.spec15 Jun 2004 12:06:55 - 1.28
@@ -33,8 +33,8 @@
Class:PLUS
Group:Filesystem
License: GPL
-Version: 0.72
-Release: 20040604
+Version: 0.73
+Release: 20040615
# list of sources
Source0: http://osdn.dl.sourceforge.net/clamav/clamav-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
