diff --git a/clamav/clamav.patch b/clamav/clamav.patch index 85ccb121a5..109d6b9117 100644 --- a/clamav/clamav.patch +++ b/clamav/clamav.patch @@ -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.c 2009-04-09 17:25:12 +0200 +--- 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 @@ -11,8 +11,8 @@ Index: clamav-milter/clamav-milter.c #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 #include @@ -23,8 +23,8 @@ Index: clamav-milter/clamfi.c #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 @@ Index: clamav-milter/clamfi.h extern uint64_t maxfilesize; extern int addxvirus; Index: configure ---- configure.orig 2009-04-08 16:38:23 +0200 -+++ configure 2009-04-09 17:25:12 +0200 -@@ -20949,9 +20949,6 @@ +--- 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" @@ -45,21 +45,21 @@ Index: configure - 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" = x""yes; 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 @@ Index: libclamav/others.c 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 diff --git a/clamav/clamav.spec b/clamav/clamav.spec index 2fa2aec1ed..1b029e0dc5 100644 --- a/clamav/clamav.spec +++ b/clamav/clamav.spec @@ -31,8 +31,8 @@ Distribution: OpenPKG Community Class: EVAL Group: AntiVirus License: GPL -Version: 0.95.2 -Release: 20090702 +Version: 0.95.3 +Release: 20091108 # package options %option with_milter no