thomas: server/clamav clamav.patch,1.1,1.2 clamav.spec,1.1,1.2
cvs at kolab.org
cvs at kolab.org
Tue Dec 2 15:59:17 CET 2008
Author: thomas
Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv26979
Modified Files:
clamav.patch clamav.spec
Log Message:
Updated for clamav 0.94.1
Index: clamav.patch
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- clamav.patch 2 Dec 2008 14:56:34 -0000 1.1
+++ clamav.patch 2 Dec 2008 14:59:15 -0000 1.2
@@ -1,7 +1,7 @@
-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 @@
+diff -urN clamav-0.94.1.orig/clamav-milter/clamav-milter.c clamav-0.94.1/clamav-milter/clamav-milter.c
+--- clamav-0.94.1.orig/clamav-milter/clamav-milter.c 2008-10-16 10:29:55.000000000 +0200
++++ clamav-0.94.1/clamav-milter/clamav-milter.c 2008-11-17 12:29:53.149435000 +0100
+@@ -77,9 +77,7 @@
#include <sys/un.h>
#include <stdarg.h>
#include <errno.h>
@@ -12,7 +12,7 @@
#include <pthread.h>
#include <sys/time.h>
#include <sys/resource.h>
-@@ -110,6 +108,8 @@
+@@ -113,6 +111,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>
-@@ -432,6 +432,10 @@
+@@ -435,6 +435,10 @@
* Send a 550 rejection when a virus is
* found
*/
@@ -32,7 +32,7 @@
static int hflag = 0; /*
* Include original message headers in
* report
-@@ -676,6 +680,7 @@
+@@ -679,6 +683,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]."));
-@@ -771,7 +776,7 @@
+@@ -774,7 +779,7 @@
else
progname = "clamav-milter";
@@ -49,7 +49,7 @@
setlocale(LC_ALL, "");
bindtextdomain(progname, DATADIR"/clamav-milter/locale");
textdomain(progname);
-@@ -860,6 +865,9 @@
+@@ -863,6 +868,9 @@
"noreject", 0, NULL, 'N'
},
{
@@ -59,7 +59,7 @@
"noxheader", 0, NULL, 'n'
},
{
-@@ -1034,6 +1042,9 @@
+@@ -1037,6 +1045,9 @@
case 'N': /* Do we reject mail or silently drop it */
rejectmail = 0;
break;
@@ -69,7 +69,7 @@
case 'o': /* scan outgoing mail */
oflag++;
break;
-@@ -1139,11 +1150,13 @@
+@@ -1142,11 +1153,13 @@
}
port = argv[optind];
@@ -83,7 +83,7 @@
if(strncasecmp(port, "inet:", 5) == 0)
if(!lflag) {
-@@ -5242,6 +5255,7 @@
+@@ -5260,6 +5273,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);
-@@ -5250,6 +5264,7 @@
+@@ -5268,6 +5282,7 @@
smfi_chgheader(ctx, "Subject", 1, subject);
else
smfi_addheader(ctx, "Subject", subject);
@@ -99,31 +99,31 @@
}
#if 0
-Index: configure
---- configure.orig 2008-09-01 20:41:18 +0200
-+++ configure 2008-09-05 20:42:16 +0200
-@@ -16932,9 +16932,6 @@
+diff -urN clamav-0.94.1.orig/configure clamav-0.94.1/configure
+--- clamav-0.94.1.orig/configure 2008-10-30 17:12:07.000000000 +0100
++++ clamav-0.94.1/configure 2008-11-17 12:32:01.499435000 +0100
+@@ -18454,9 +18454,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"
+ LIBS="$LIBS -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 @@
+@@ -18684,7 +18681,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`
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
+diff -urN clamav-0.94.1.orig/shared/output.c clamav-0.94.1/shared/output.c
+--- clamav-0.94.1.orig/shared/output.c 2008-08-16 19:18:00.000000000 +0200
++++ clamav-0.94.1/shared/output.c 2008-11-17 12:29:53.169435000 +0100
@@ -61,7 +61,7 @@
pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
Index: clamav.spec
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- clamav.spec 2 Dec 2008 14:56:34 -0000 1.1
+++ clamav.spec 2 Dec 2008 14:59:15 -0000 1.2
@@ -31,8 +31,8 @@
Class: EVAL
Group: AntiVirus
License: GPL
-Version: 0.94
-Release: 20080905
+Version: 0.94.1
+Release: 20081117_kolab
# package options
%option with_milter no
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, gcc, bzip2, pkgconfig, bc
-PreReq: OpenPKG, openpkg >= 20060823
+BuildPreReq: OpenPKG, openpkg >= 2.4.3, gcc, bzip2
+PreReq: OpenPKG, openpkg >= 2.4.3
BuildPreReq: zlib, bzip2, curl, gmp, libiconv, openssl
PreReq: zlib, bzip2, curl, gmp, libiconv, openssl
%if "%{with_milter}" == "yes"
@@ -75,12 +75,12 @@
%prep
%setup -q
- %patch -p0
+ %patch -p1
%build
# configure package
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
+ CFLAGS="%{l_cflags}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
GREP="grep" \
More information about the commits
mailing list