upgrading package: clamav 0.93.3 -> 0.94

clamav/clamav.patch

@@ -1,7 +1,7 @@
 Index: clamav-milter/clamav-milter.c
---- 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 @@
+--- 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 <sys/un.h>
  #include <stdarg.h>
  #include <errno.h>
@@ -11,8 +11,8 @@ Index: clamav-milter/clamav-milter.c
 +#include "milter/mfapi.h"
  #include <pthread.h>
  #include <sys/time.h>
- #include <signal.h>
-@@ -109,6 +107,8 @@
+ #include <sys/resource.h>
+@@ -110,6 +108,8 @@
  
  #ifdef	C_LINUX
  #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
@@ -21,7 +21,7 @@ Index: clamav-milter/clamav-milter.c
  #include <libintl.h>
  #include <locale.h>
  
-@@ -419,6 +419,10 @@
+@@ -432,6 +432,10 @@
  				 * Send a 550 rejection when a virus is
  				 * found
  				 */
@@ -32,7 +32,7 @@ Index: clamav-milter/clamav-milter.c
  static	int	hflag = 0;	/*
  				 * Include original message headers in
  				 * report
-@@ -607,6 +611,7 @@
+@@ -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."));
@@ -40,7 +40,7 @@ Index: clamav-milter/clamav-milter.c
  	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]."));
-@@ -701,7 +706,7 @@
+@@ -771,7 +776,7 @@
  	else
  		progname = "clamav-milter";
  
@@ -49,7 +49,7 @@ Index: clamav-milter/clamav-milter.c
  	setlocale(LC_ALL, "");
  	bindtextdomain(progname, DATADIR"/clamav-milter/locale");
  	textdomain(progname);
-@@ -787,6 +792,9 @@
+@@ -860,6 +865,9 @@
  				"noreject", 0, NULL, 'N'
  			},
  			{
@@ -59,7 +59,7 @@ Index: clamav-milter/clamav-milter.c
  				"noxheader", 0, NULL, 'n'
  			},
  			{
-@@ -955,6 +963,9 @@
+@@ -1034,6 +1042,9 @@
  			case 'N':	/* Do we reject mail or silently drop it */
  				rejectmail = 0;
  				break;
@@ -69,13 +69,13 @@ Index: clamav-milter/clamav-milter.c
  			case 'o':	/* scan outgoing mail */
  				oflag++;
  				break;
-@@ -1054,11 +1065,13 @@
+@@ -1139,11 +1150,13 @@
  	}
  	port = argv[optind];
  
 +#if 0
  	if(rootdir == NULL)	/* FIXME: Handle CHROOT */
- 		if(verifyIncomingSocketName(port) < 0) {
+ 		if(checkCF && verifyIncomingSocketName(port) < 0) {
  			fprintf(stderr, _("%s: socket-addr (%s) doesn't agree with sendmail.cf\n"), argv[0], port);
  			return EX_CONFIG;
  		}
@@ -83,7 +83,7 @@ Index: clamav-milter/clamav-milter.c
  
  	if(strncasecmp(port, "inet:", 5) == 0)
  		if(!lflag) {
-@@ -5037,6 +5050,7 @@
+@@ -5242,6 +5255,7 @@
  	struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx);
  	char subject[128];
  
@@ -91,7 +91,7 @@ Index: clamav-milter/clamav-milter.c
  	if(privdata->subject)
  		smfi_addheader(ctx, "X-Original-Subject", privdata->subject);
  
-@@ -5045,6 +5059,7 @@
+@@ -5250,6 +5264,7 @@
  		smfi_chgheader(ctx, "Subject", 1, subject);
  	else
  		smfi_addheader(ctx, "Subject", subject);
@@ -100,9 +100,9 @@ Index: clamav-milter/clamav-milter.c
  
  #if	0
 Index: configure
---- configure.orig	2007-08-21 00:58:23 +0200
-+++ configure	2007-09-07 17:16:12 +0200
-@@ -23684,9 +23684,6 @@
+--- configure.orig	2008-09-01 20:41:18 +0200
++++ configure	2008-09-05 20:42:16 +0200
+@@ -16932,9 +16932,6 @@
  
          save_LDFLAGS="$LDFLAGS"
  	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
@@ -112,7 +112,7 @@ Index: configure
      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; }
-@@ -23914,7 +23911,7 @@
+@@ -17162,7 +17159,7 @@
  
      LDFLAGS="$save_LDFLAGS"
  
@@ -122,9 +122,9 @@ Index: configure
  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	2007-03-31 21:27:56 +0200
-+++ shared/output.c	2007-09-07 17:15:06 +0200
-@@ -60,7 +60,7 @@
+--- 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 @@
  pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
  #endif
  

clamav/clamav.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        AntiVirus
 License:      GPL
-Version:      0.93.3
-Release:      20080708
+Version:      0.94
+Release:      20080905
 
 #   package options
 %option       with_milter  no