head 1.17; access; symbols OPENPKG_E1_MP_HEAD:1.6 OPENPKG_E1_MP:1.6 OPENPKG_E1_MP_2_STABLE:1.5 OPENPKG_E1_FP:1.5 OPENPKG_2_STABLE_20061018:1.5 OPENPKG_2_STABLE:1.5.0.6 OPENPKG_2_STABLE_BP:1.5 OPENPKG_2_5_SOLID:1.5.0.4 OPENPKG_2_5_SOLID_BP:1.5 OPENPKG_2_4_RELEASE:1.5 OPENPKG_2_4_SOLID:1.5.0.2 OPENPKG_2_4_SOLID_BP:1.5 OPENPKG_CW_FP:1.4 OPENPKG_2_3_RELEASE:1.4 OPENPKG_2_3_SOLID:1.4.0.6 OPENPKG_2_3_SOLID_BP:1.4 OPENPKG_2_2_RELEASE:1.4 OPENPKG_2_2_SOLID:1.4.0.4 OPENPKG_2_2_SOLID_BP:1.4 OPENPKG_2_1_RELEASE:1.4 OPENPKG_2_1_SOLID:1.4.0.2 OPENPKG_2_1_SOLID_BP:1.4 OPENPKG_2_0_RELEASE:1.2 OPENPKG_2_0_SOLID:1.2.0.2 OPENPKG_2_0_SOLID_BP:1.2 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_MP:1.1; locks; strict; comment @# @; 1.17 date 2009.11.08.09.47.04; author rse; state Exp; branches; next 1.16; commitid 5d0Q4dcCMg5ImHau; 1.16 date 2009.04.09.16.46.57; author rse; state Exp; branches; next 1.15; commitid xDeCTFdDTxHgxmJt; 1.15 date 2009.03.23.21.02.19; author rse; state Exp; branches; next 1.14; commitid RfCJX3K370YLucHt; 1.14 date 2008.09.05.18.48.24; author rse; state Exp; branches; next 1.13; commitid PFJZYO76BV9p9Cht; 1.13 date 2007.09.07.15.50.32; author rse; state Exp; branches; next 1.12; commitid 0LrdqEvcVWJNROws; 1.12 date 2007.09.07.15.19.19; author rse; state Exp; branches; next 1.11; commitid 2reA50tU8JO4HOws; 1.11 date 2007.09.07.10.04.19; author rse; state Exp; branches; next 1.10; commitid HhJasKp0QCP1XMws; 1.10 date 2007.08.09.10.20.42; author rse; state Exp; branches; next 1.9; commitid YhU9RtEjr8VrY3ts; 1.9 date 2007.07.18.20.13.31; author rse; state Exp; branches; next 1.8; commitid Gj3upIIdQKnFXhqs; 1.8 date 2007.07.11.16.09.51; author cs; state Exp; branches; next 1.7; commitid 6dCRqU0nvIo1Qmps; 1.7 date 2007.05.31.06.16.16; author rse; state Exp; branches; next 1.6; commitid KiImQOBS8bw5S2ks; 1.6 date 2006.12.30.09.57.43; author rse; state Exp; branches; next 1.5; commitid NoCUbOnIjBtZYw0s; 1.5 date 2005.05.12.18.20.28; author rse; state dead; branches; next 1.4; 1.4 date 2004.06.15.12.06.55; author ms; state Exp; branches; next 1.3; 1.3 date 2004.04.01.18.36.16; author rse; state Exp; branches; next 1.2; 1.2 date 2004.02.07.20.49.21; author thl; state Exp; branches; next 1.1; 1.1 date 2003.07.02.15.13.00; author rse; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2003.07.24.20.49.17; author rse; state Exp; branches; next ; desc @@ 1.17 log @upgrading package: clamav 0.95.2 -> 0.95.3 @ text @Index: clamav-milter/clamav-milter.c --- clamav-milter/clamav-milter.c.orig 2009-10-28 16:34:13 +0100 +++ clamav-milter/clamav-milter.c 2009-11-08 10:27:04 +0100 @@@@ -32,7 +32,7 @@@@ #include #endif #include -#include +#include "milter/mfapi.h" #include "clamav.h" Index: clamav-milter/clamfi.c --- 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 #include -#include +#include "milter/mfapi.h" #include "shared/optparser.h" #include "shared/output.h" Index: clamav-milter/clamfi.h --- 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 #include "shared/optparser.h" -#include +#include "milter/mfapi.h" extern uint64_t maxfilesize; extern int addxvirus; Index: configure --- configure.orig 2009-10-28 16:34:13 +0100 +++ configure 2009-11-08 10:27:32 +0100 @@@@ -16692,9 +16692,6 @@@@ 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 LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5 $as_echo_n "checking for mi_stop in -lmilter... " >&6; } @@@@ -16842,7 +16839,7 @@@@ fi LIBS="$save_LIBS" - 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" = x""yes; then : Index: libclamav/others.c --- 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; +#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-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 -#ifdef C_LINUX +#if 0 #include #include @ 1.16 log @get rid of unrar stuff @ text @d2 2 a3 2 --- clamav-milter/clamav-milter.c.orig 2009-04-01 13:48:54 +0200 +++ clamav-milter/clamav-milter.c 2009-04-09 17:25:12 +0200 d14 2 a15 2 --- clamav-milter/clamfi.c.orig 2009-04-02 18:36:34 +0200 +++ clamav-milter/clamfi.c 2009-04-09 17:25:12 +0200 d26 2 a27 2 --- clamav-milter/clamfi.h.orig 2009-03-16 19:37:26 +0100 +++ clamav-milter/clamfi.h 2009-04-09 17:25:12 +0200 d38 3 a40 3 --- configure.orig 2009-04-08 16:38:23 +0200 +++ configure 2009-04-09 17:25:12 +0200 @@@@ -20949,9 +20949,6 @@@@ d48 1 a48 1 { $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5 d50 2 a51 1 @@@@ -21191,7 +21188,7 @@@@ d54 5 a58 6 -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 d60 3 a62 3 --- 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 @@@@ d74 2 a75 2 --- shared/output.c.orig 2009-03-16 19:37:26 +0100 +++ shared/output.c 2009-04-09 17:25:12 +0200 @ 1.15 log @upgrading package: clamav 0.94 -> 0.95 @ text @d2 2 a3 2 --- 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 d14 2 a15 2 --- clamav-milter/clamfi.c.orig 2009-03-20 22:15:38 +0100 +++ clamav-milter/clamfi.c 2009-03-23 21:52:24 +0100 d27 1 a27 1 +++ clamav-milter/clamfi.h 2009-03-23 21:52:57 +0100 d38 3 a40 3 --- configure.orig 2009-03-23 18:10:11 +0100 +++ configure 2009-03-23 21:49:35 +0100 @@@@ -20946,9 +20946,6 @@@@ d50 1 a50 1 @@@@ -21188,7 +21185,7 @@@@ d59 14 d75 1 a75 1 +++ shared/output.c 2009-03-23 21:47:48 +0100 @ 1.14 log @upgrading package: clamav 0.93.3 -> 0.94 @ text @d2 6 a7 7 --- 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 #include #include -#if HAVE_LIBMILTER_MFAPI_H a8 1 -#endif a9 11 #include #include #include @@@@ -110,6 +108,8 @@@@ #ifdef C_LINUX #include /* FIXME: use sendfile on BSD not Linux */ +#endif +#if 0 #include #include d11 11 a21 22 @@@@ -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"; d23 7 a29 28 -#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]; d31 3 a33 24 +#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); + } } d35 2 a36 1 #if 0 d38 3 a40 3 --- configure.orig 2008-09-01 20:41:18 +0200 +++ configure 2008-09-05 20:42:16 +0200 @@@@ -16932,9 +16932,6 @@@@ d42 2 a43 2 save_LDFLAGS="$LDFLAGS" CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" d47 4 a50 4 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 @@@@ d52 1 a52 1 LDFLAGS="$save_LDFLAGS" d57 1 a57 1 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` d60 3 a62 3 --- 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 @@@@ @ 1.13 log @I really hate the hard-coders in this world... try the even larger hammer to get clamav-milter building under Linux, too @ text @d2 3 a4 3 --- clamav-milter/clamav-milter.c.orig 2007-08-20 23:01:19 +0200 +++ clamav-milter/clamav-milter.c 2007-09-07 17:46:13 +0200 @@@@ -75,9 +75,7 @@@@ d14 2 a15 2 #include @@@@ -109,6 +107,8 @@@@ d24 1 a24 1 @@@@ -419,6 +419,10 @@@@ d35 1 a35 1 @@@@ -607,6 +611,7 @@@@ d43 1 a43 1 @@@@ -701,7 +706,7 @@@@ d52 1 a52 1 @@@@ -787,6 +792,9 @@@@ d62 1 a62 1 @@@@ -955,6 +963,9 @@@@ d72 1 a72 1 @@@@ -1054,11 +1065,13 @@@@ d78 1 a78 1 if(verifyIncomingSocketName(port) < 0) { d86 1 a86 1 @@@@ -5037,6 +5050,7 @@@@ d94 1 a94 1 @@@@ -5045,6 +5059,7 @@@@ d103 3 a105 3 --- configure.orig 2007-08-21 00:58:23 +0200 +++ configure 2007-09-07 17:16:12 +0200 @@@@ -23684,9 +23684,6 @@@@ d115 1 a115 1 @@@@ -23914,7 +23911,7 @@@@ d125 3 a127 3 --- shared/output.c.orig 2007-03-31 21:27:56 +0200 +++ shared/output.c 2007-09-07 17:15:06 +0200 @@@@ -60,7 +60,7 @@@@ @ 1.12 log @next attempt in trying to get the MILTER stuff building @ text @d3 1 a3 1 +++ clamav-milter/clamav-milter.c 2007-09-07 17:16:44 +0200 d15 10 a24 1 @@@@ -419,6 +417,10 @@@@ d35 1 a35 1 @@@@ -607,6 +609,7 @@@@ d43 10 a52 1 @@@@ -787,6 +790,9 @@@@ d62 1 a62 1 @@@@ -955,6 +961,9 @@@@ d72 1 a72 1 @@@@ -1054,11 +1063,13 @@@@ d86 1 a86 1 @@@@ -5037,6 +5048,7 @@@@ d94 1 a94 1 @@@@ -5045,6 +5057,7 @@@@ @ 1.11 log @fix building against MILTER API @ text @d3 3 a5 2 +++ clamav-milter/clamav-milter.c 2007-09-07 12:02:17 +0200 @@@@ -76,7 +76,7 @@@@ d8 1 a8 1 #if HAVE_LIBMILTER_MFAPI_H d10 1 a11 1 #endif d14 2 a15 1 @@@@ -419,6 +419,10 @@@@ d26 1 a26 1 @@@@ -607,6 +611,7 @@@@ d34 1 a34 1 @@@@ -787,6 +792,9 @@@@ d44 1 a44 1 @@@@ -955,6 +963,9 @@@@ d54 1 a54 1 @@@@ -1054,11 +1065,13 @@@@ d68 1 a68 1 @@@@ -5037,6 +5050,7 @@@@ d76 1 a76 1 @@@@ -5045,6 +5059,7 @@@@ d84 22 d108 1 a108 1 +++ shared/output.c 2007-09-07 12:01:18 +0200 @ 1.10 log @add support to ClamAV MILTER for plain tagging with extra header without replacing the Subject header @ text @d2 12 a13 3 --- 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 @@@@ d24 1 a24 1 @@@@ -598,6 +602,7 @@@@ d32 1 a32 1 @@@@ -778,6 +783,9 @@@@ d42 1 a42 1 @@@@ -946,6 +954,9 @@@@ d52 1 a52 1 @@@@ -1045,11 +1056,13 @@@@ d66 1 a66 1 @@@@ -4934,6 +4947,7 @@@@ d74 1 a74 1 @@@@ -4942,6 +4956,7 @@@@ d84 1 a84 1 +++ shared/output.c 2007-08-08 15:53:27 +0200 @ 1.9 log @upgrading package: clamav 0.91 -> 0.91.1 @ text @d3 41 a43 2 +++ clamav-milter/clamav-milter.c 2007-07-18 22:03:22 +0200 @@@@ -1045,11 +1045,13 @@@@ d57 16 d75 1 a75 1 +++ shared/output.c 2007-07-18 21:47:45 +0200 @ 1.8 log @upgrading package: clamav 0.90.3 -> 0.91 @ text @d2 7 a8 4 --- clamav-milter/clamav-milter.c.orig 2007-07-11 00:14:08 +0200 +++ clamav-milter/clamav-milter.c 2007-07-11 18:07:24 +0200 @@@@ -1054,10 +1054,12 @@@@ #ifdef CL_EXPERIMENTAL a9 2 #endif +#if 0 d19 3 a21 3 --- shared/output.c.orig 2007-03-02 01:43:18.000000000 +0100 +++ shared/output.c 2007-05-30 06:17:48.279834583 +0200 @@@@ -61,7 +61,7 @@@@ @ 1.7 log @do not hard-code gettext usage under Linux @ text @d2 6 a7 6 --- clamav-milter/clamav-milter.c.orig 2007-04-12 18:35:17.000000000 +0200 +++ clamav-milter/clamav-milter.c 2007-05-30 06:15:50.985922900 +0200 @@@@ -1018,10 +1018,12 @@@@ } port = argv[optind]; d9 4 a12 4 if(verifyIncomingSocketName(port) < 0) { fprintf(stderr, _("%s: socket-addr (%s) doesn't agree with sendmail.cf\n"), argv[0], port); return EX_CONFIG; } d14 1 a16 1 /* @ 1.6 log @provide optional MILTER support for scanning mails for viruses via the MTA MILTER API @ text @d2 3 a4 3 --- clamav-milter/clamav-milter.c.orig 2006-12-11 01:42:18 +0100 +++ clamav-milter/clamav-milter.c 2006-12-30 10:42:08 +0100 @@@@ -830,10 +830,12 @@@@ d17 12 @ 1.5 log @upgrading package: clamav 0.84 -> 0.85 @ text @d1 16 a16 10 --- libclamav/zziplib/zzip-conf.h.orig 2004-02-07 21:41:08.000000000 +0100 +++ libclamav/zziplib/zzip-conf.h 2004-02-07 21:34:18.000000000 +0100 @@@@ -69,6 +69,7 @@@@ #ifdef ZZIP_ssize_t #define _zzip_ssize_t ZZIP_ssize_t #else +#include #define _zzip_ssize_t ssize_t #endif #endif @ 1.4 log @upgrading package: clamav 0.72 -> 0.73 @ text @@ 1.3 log @upgrading package: clamav 0.66 -> 0.70 @ text @d3 1 a3 1 @@@@ -64,6 +64,7 @@@@ @ 1.2 log @FreeBSD5 failed with missing ssize_t; no platform check because all supported environments have unistd.h @ text @a0 10 --- clamd/others.c.orig Fri Jun 20 19:35:45 2003 +++ clamd/others.c Wed Jul 2 17:05:58 2003 @@@@ -26,6 +26,7 @@@@ #include #include #include +#include #if defined(CLAMD_USE_SYSLOG) && !defined(C_AIX) #include @ 1.1 log @fix building under Debian 2.2 @ text @d11 10 @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only] @ text @@