changeset
Update version, correct milter run command logic, adapt build conf patch.
Mon, 02 Nov 2009 22:31:34 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 02 Nov 2009 22:31:34 +0100
- changeset 234
- b0dde56e4a08
- parent 233
- f5f6e93f3dc6
- child 235
- 8b7e29d77c37
Update version, correct milter run command logic, adapt build conf patch.
| clamav/clamav.patch | file | annotate | diff | comparison | revisions | |
| clamav/clamav.spec | file | annotate | diff | comparison | revisions | |
| clamav/rc.clamav | file | annotate | diff | comparison | revisions |
1.1 --- a/clamav/clamav.patch Mon Nov 02 22:29:58 2009 +0100 1.2 +++ b/clamav/clamav.patch Mon Nov 02 22:31:34 2009 +0100 1.3 @@ -1,6 +1,7 @@ 1.4 +diff -Nau clamav-milter/clamav-milter.c.orig clamav-milter/clamav-milter.c 1.5 Index: clamav-milter/clamav-milter.c 1.6 ---- clamav-milter/clamav-milter.c.orig 2009-04-01 13:48:54 +0200 1.7 -+++ clamav-milter/clamav-milter.c 2009-04-09 17:25:12 +0200 1.8 +--- clamav-milter/clamav-milter.c.orig 2009-10-28 16:34:13.000000000 +0100 1.9 ++++ clamav-milter/clamav-milter.c 2009-11-01 15:26:46.212861448 +0100 1.10 @@ -32,7 +32,7 @@ 1.11 #include <syslog.h> 1.12 #endif 1.13 @@ -10,9 +11,10 @@ 1.14 1.15 #include "clamav.h" 1.16 1.17 +diff -Nau clamav-milter/clamfi.c.orig clamav-milter/clamfi.c 1.18 Index: clamav-milter/clamfi.c 1.19 ---- clamav-milter/clamfi.c.orig 2009-04-02 18:36:34 +0200 1.20 -+++ clamav-milter/clamfi.c 2009-04-09 17:25:12 +0200 1.21 +--- clamav-milter/clamfi.c.orig 2009-10-28 16:34:13.000000000 +0100 1.22 ++++ clamav-milter/clamfi.c 2009-11-01 15:26:46.214251049 +0100 1.23 @@ -29,7 +29,7 @@ 1.24 #include <unistd.h> 1.25 #include <ctype.h> 1.26 @@ -22,9 +24,10 @@ 1.27 1.28 #include "shared/optparser.h" 1.29 #include "shared/output.h" 1.30 +diff -Nau clamav-milter/clamfi.h.orig clamav-milter/clamfi.h 1.31 Index: clamav-milter/clamfi.h 1.32 ---- clamav-milter/clamfi.h.orig 2009-03-16 19:37:26 +0100 1.33 -+++ clamav-milter/clamfi.h 2009-04-09 17:25:12 +0200 1.34 +--- clamav-milter/clamfi.h.orig 2009-07-06 15:21:58.000000000 +0200 1.35 ++++ clamav-milter/clamfi.h 2009-11-01 15:26:46.214882752 +0100 1.36 @@ -22,7 +22,7 @@ 1.37 #define _CLAMFI_H 1.38 1.39 @@ -34,10 +37,11 @@ 1.40 1.41 extern uint64_t maxfilesize; 1.42 extern int addxvirus; 1.43 +diff -Nau configure.orig configure 1.44 Index: configure 1.45 ---- configure.orig 2009-04-08 16:38:23 +0200 1.46 -+++ configure 2009-04-09 17:25:12 +0200 1.47 -@@ -20949,9 +20949,6 @@ 1.48 +--- configure.orig 2009-10-28 16:34:13.000000000 +0100 1.49 ++++ configure 2009-11-01 15:29:06.145022137 +0100 1.50 +@@ -16692,9 +16692,6 @@ 1.51 1.52 save_LIBS="$LIBS" 1.53 CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" 1.54 @@ -45,21 +49,25 @@ 1.55 - CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter" 1.56 - fi 1.57 LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS" 1.58 - { $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5 1.59 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5 1.60 $as_echo_n "checking for mi_stop in -lmilter... " >&6; } 1.61 -@@ -21191,7 +21188,7 @@ 1.62 +@@ -16842,9 +16839,9 @@ 1.63 + fi 1.64 1.65 LIBS="$save_LIBS" 1.66 - 1.67 --for ac_header in libmilter/mfapi.h 1.68 -+for ac_header in milter/mfapi.h 1.69 - do 1.70 - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 1.71 - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 1.72 +- for ac_header in libmilter/mfapi.h 1.73 ++ for ac_header in milter/mfapi.h 1.74 + do : 1.75 +- ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default" 1.76 ++ ac_fn_c_check_header_mongrel "$LINENO" "milter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default" 1.77 + if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then : 1.78 + cat >>confdefs.h <<_ACEOF 1.79 + #define HAVE_LIBMILTER_MFAPI_H 1 1.80 +diff -Nau libclamav/others.c.orig libclamav/others.c 1.81 Index: libclamav/others.c 1.82 ---- libclamav/others.c.orig 2009-04-03 10:33:24 +0200 1.83 -+++ libclamav/others.c 2009-04-09 17:29:05 +0200 1.84 -@@ -176,8 +176,10 @@ 1.85 +--- libclamav/others.c.orig 2009-10-28 16:34:13.000000000 +0100 1.86 ++++ libclamav/others.c 2009-11-01 15:26:46.257883269 +0100 1.87 +@@ -177,8 +177,10 @@ 1.88 if(is_rar_initd) return; 1.89 is_rar_initd = 1; 1.90 1.91 @@ -70,9 +78,10 @@ 1.92 return; 1.93 1.94 if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) || 1.95 +diff -Nau shared/output.c.orig shared/output.c 1.96 Index: shared/output.c 1.97 ---- shared/output.c.orig 2009-03-16 19:37:26 +0100 1.98 -+++ shared/output.c 2009-04-09 17:25:12 +0200 1.99 +--- shared/output.c.orig 2009-10-28 16:34:13.000000000 +0100 1.100 ++++ shared/output.c 2009-11-01 15:26:46.259056039 +0100 1.101 @@ -67,7 +67,7 @@ 1.102 pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER; 1.103 #endif
2.1 --- a/clamav/clamav.spec Mon Nov 02 22:29:58 2009 +0100 2.2 +++ b/clamav/clamav.spec Mon Nov 02 22:31:34 2009 +0100 2.3 @@ -31,8 +31,8 @@ 2.4 Class: EVAL 2.5 Group: AntiVirus 2.6 License: GPL 2.7 -Version: 0.95.2 2.8 -Release: 20090702 2.9 +Version: 0.95.3 2.10 +Release: 20091102 2.11 2.12 # package options 2.13 %option with_milter no
3.1 --- a/clamav/rc.clamav Mon Nov 02 22:29:58 2009 +0100 3.2 +++ b/clamav/rc.clamav Mon Nov 02 22:31:34 2009 +0100 3.3 @@ -17,6 +17,7 @@ 3.4 3.5 %common 3.6 clamav_cfgfile="@l_prefix@/etc/clamav/clamd.conf" 3.7 + clamav_milter_cfgfile="@l_prefix@/etc/clamav/clamav-milter.conf" 3.8 clamav_pidfile_clamd="@l_prefix@/var/clamav/clamd.pid" 3.9 clamav_pidfile_clamav_milter="@l_prefix@/var/clamav/clamav-milter.pid" 3.10 clamav_signal () { 3.11 @@ -50,12 +51,8 @@ 3.12 elif [ ".$daemon" = ".clamav-milter" -a -x @l_prefix@/sbin/clamav-milter ]; then 3.13 ( umask 002 3.14 @l_prefix@/sbin/clamav-milter \ 3.15 - --config-file=$clamav_cfgfile \ 3.16 - --max-children=4 --outgoing --local \ 3.17 - --pidfile=$clamav_pidfile_clamav_milter \ 3.18 - --sendmail-cf=/dev/null \ 3.19 - $clamav_clamav_milter_flags \ 3.20 - local:@l_prefix@/var/milter/socket/clamav-milter 3.21 + --config-file=$clamav_milter_cfgfile \ 3.22 + $clamav_clamav_milter_flags 3.23 ) || exit $? 3.24 fi 3.25 done
