gunnar: server/clamav .cvsignore, 1.3, 1.4 Makefile, 1.8, 1.9 clamav.patch, 1.2, 1.3 clamav.spec, 1.6, 1.7

cvs at kolab.org cvs at kolab.org
Tue Jan 5 13:58:45 CET 2010


Author: gunnar

Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv17600/clamav

Modified Files:
	.cvsignore Makefile clamav.patch clamav.spec 
Log Message:
MFB: kolab/issue3513 (Clamav - new upstream version 0.95.3). In addition the Makefile was adapted to the make helper scripts.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/clamav/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	5 Dec 2008 16:01:11 -0000	1.3
+++ .cvsignore	5 Jan 2010 12:58:43 -0000	1.4
@@ -1 +1,2 @@
 *.src.rpm
+*.tar.gz

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	5 Jan 2010 07:54:02 -0000	1.8
+++ Makefile	5 Jan 2010 12:58:43 -0000	1.9
@@ -1,32 +1,12 @@
 include ../make-helper/kolab.mk
 
-NAME = clamav
-PACKAGE = $(NAME)
+PACKAGE = $(shell grep "^Name:" *.spec | sed -e "s/^Name:\s*\([a-z-]*\).*/\1/")
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 
-SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz
+SOURCE_URL=http://files.kolab.org/server/development-2.2/externals
+SOURCE_0=$(PACKAGE)-$(VERSION).tar.gz
 EXTRA=clamav.patch rc.clamav
 
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
-
-.PHONY: clean
-clean:
-	rm -rf $(KOLABRPMTMP)/$(NAME)*
-	rm -rf $(KOLABRPMTMP)/$(PACKAGE)
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf *~
-
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	rsync -tvz "$(SOURCE_0)" $(KOLABRPMSRC)/$(PACKAGE)/
-
-	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+include ../make-helper/package.mk
+include ../make-helper/package-new.mk

Index: clamav.patch
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- clamav.patch	2 Dec 2008 14:59:15 -0000	1.2
+++ clamav.patch	5 Jan 2010 12:58:43 -0000	1.3
@@ -1,108 +1,43 @@
-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>
--#if	HAVE_LIBMILTER_MFAPI_H
+diff -urN clamav-0.95.3.orig/clamav-milter/clamav-milter.c clamav-0.95.3/clamav-milter/clamav-milter.c
+--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/clamav-milter/clamav-milter.c	2009-10-30 17:14:50.137580674 +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>
-@@ -113,6 +111,8 @@
- 
- #ifdef	C_LINUX
- #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
-+#endif
-+#if 0
- #include <libintl.h>
- #include <locale.h>
  
-@@ -435,6 +435,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
-@@ -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."));
-+	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]."));
-@@ -774,7 +779,7 @@
- 	else
- 		progname = "clamav-milter";
- 
--#ifdef	C_LINUX
-+#if 0
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(progname, DATADIR"/clamav-milter/locale");
- 	textdomain(progname);
-@@ -863,6 +868,9 @@
- 				"noreject", 0, NULL, 'N'
- 			},
- 			{
-+				"nosubject", 0, NULL, 'Z'
-+			},
-+			{
- 				"noxheader", 0, NULL, 'n'
- 			},
- 			{
-@@ -1037,6 +1045,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;
-@@ -1142,11 +1153,13 @@
- 	}
- 	port = argv[optind];
+ #include "clamav.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
+diff -urN clamav-0.95.3.orig/clamav-milter/clamfi.c clamav-0.95.3/clamav-milter/clamfi.c
+--- clamav-0.95.3.orig/clamav-milter/clamfi.c	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/clamav-milter/clamfi.c	2009-10-30 17:14:50.137580674 +0100
+@@ -29,7 +29,7 @@
+ #include <unistd.h>
+ #include <ctype.h>
  
- 	if(strncasecmp(port, "inet:", 5) == 0)
- 		if(!lflag) {
-@@ -5260,6 +5273,7 @@
- 	struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx);
- 	char subject[128];
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
  
-+	if (!nosubject) {
- 	if(privdata->subject)
- 		smfi_addheader(ctx, "X-Original-Subject", privdata->subject);
+ #include "shared/optparser.h"
+ #include "shared/output.h"
+diff -urN clamav-0.95.3.orig/clamav-milter/clamfi.h clamav-0.95.3/clamav-milter/clamfi.h
+--- clamav-0.95.3.orig/clamav-milter/clamfi.h	2009-07-06 15:21:58.000000000 +0200
++++ clamav-0.95.3/clamav-milter/clamfi.h	2009-10-30 17:14:50.137580674 +0100
+@@ -22,7 +22,7 @@
+ #define _CLAMFI_H
  
-@@ -5268,6 +5282,7 @@
- 		smfi_chgheader(ctx, "Subject", 1, subject);
- 	else
- 		smfi_addheader(ctx, "Subject", subject);
-+	}
- }
+ #include "shared/optparser.h"
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
  
- #if	0
-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 @@
+ extern uint64_t maxfilesize;
+ extern int addxvirus;
+diff -urN clamav-0.95.3.orig/configure clamav-0.95.3/configure
+--- clamav-0.95.3.orig/configure	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/configure	2009-10-30 17:15:15.994173225 +0100
+@@ -16692,9 +16692,6 @@
  
          save_LIBS="$LIBS"
      CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
@@ -110,21 +45,49 @@
 -	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
 -    fi
      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; }
-@@ -18684,7 +18681,7 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
+ $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
+@@ -16834,7 +16831,7 @@
+   CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"
+ else
+ 
+-	    as_fn_error "Cannot find libmilter" "$LINENO" 5
++	    as_fn_error "Cannot find milter" "$LINENO" 5
+ 
+ fi
+ 
+@@ -16842,10 +16839,10 @@
+ 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 :
++  ac_fn_c_check_header_mongrel "$LINENO" "milter/mfapi.h" "ac_cv_header_milter_mfapi_h" "$ac_includes_default"
++if test "x$ac_cv_header_milter_mfapi_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBMILTER_MFAPI_H 1
+ _ACEOF
+diff -urN clamav-0.95.3.orig/libclamav/others.c clamav-0.95.3/libclamav/others.c
+--- clamav-0.95.3.orig/libclamav/others.c	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/libclamav/others.c	2009-10-30 17:14:50.141580766 +0100
+@@ -177,8 +177,10 @@
+     if(is_rar_initd) return;
+     is_rar_initd = 1;
  
--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
-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 @@
++#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")) ||
+diff -urN clamav-0.95.3.orig/shared/output.c clamav-0.95.3/shared/output.c
+--- clamav-0.95.3.orig/shared/output.c	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/shared/output.c	2009-10-30 17:14:50.141580766 +0100
+@@ -67,7 +67,7 @@
  pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
  #endif
  

Index: clamav.spec
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- clamav.spec	12 Dec 2008 14:54:49 -0000	1.6
+++ clamav.spec	5 Jan 2010 12:58:43 -0000	1.7
@@ -1,6 +1,6 @@
 ##
 ##  clamav.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -29,8 +29,8 @@
 Packager:     Intevation GmbH
 Group:        AntiVirus
 License:      GPL
-Version:      0.94.2
-Release:      20081212
+Version:      0.95.3
+Release:      20091030
 
 #   package options
 %option       with_milter  no
@@ -43,8 +43,8 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 2.4.3, gcc, bzip2
-PreReq:       OpenPKG, openpkg >= 2.4.3
+BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2, pkgconfig, bc
+PreReq:       OpenPKG, openpkg >= 20060823
 BuildPreReq:  zlib, bzip2, curl, gmp, libiconv, openssl
 PreReq:       zlib, bzip2, curl, gmp, libiconv, openssl
 %if "%{with_milter}" == "yes"
@@ -67,7 +67,7 @@
 %track
     prog clamav = {
         version   = %{version}
-        url       = http://prdownloads.sourceforge.net/clamav/
+        url       = http://sourceforge.net/projects/clamav/files/
         regex     = clamav-(\d+\.\d+(\.\d+)*)\.tar\.gz
     }
 
@@ -78,7 +78,7 @@
 %build
     #   configure package
     CC="%{l_cc}" \
-    CFLAGS="%{l_cflags}" \
+    CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
     GREP="grep" \
@@ -101,6 +101,7 @@
 %else
         --disable-milter \
 %endif
+        --disable-unrar \
         --disable-shared
 
     #   build package





More information about the commits mailing list