Parcourir la source

add missing patch file and upgrade to newer version

Ralf S. Engelschall il y a 21 ans
Parent
commit
b9397115b6
2 fichiers modifiés avec 28 ajouts et 2 suppressions
  1. 26 0
      amavisd/amavisd.patch
  2. 2 2
      amavisd/amavisd.spec

+ 26 - 0
amavisd/amavisd.patch

@@ -0,0 +1,26 @@
+Index: amavisd.conf
+--- amavisd.conf.orig	2005-06-29 12:26:05.000000000 +0200
++++ amavisd.conf	2005-08-17 16:51:05.325957000 +0200
+@@ -285,14 +285,14 @@
+ # ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
+ # ['Sophos SAVI', \&sophos_savi ],
+ 
+-# ### http://www.clamav.net/
+-# ['ClamAV-clamd',
+-#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
+-#   qr/\bOK$/, qr/\bFOUND$/,
+-#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
+-# # NOTE: the easiest is to run clamd under the same user as amavisd; match the
+-# # socket name (LocalSocket) in clamav.conf to the socket name in this entry
+-# # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],
++### http://www.clamav.net/
++['ClamAV-clamd',
++  \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
++  qr/\bOK$/, qr/\bFOUND$/,
++  qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
++# NOTE: the easiest is to run clamd under the same user as amavisd; match the
++# socket name (LocalSocket) in clamav.conf to the socket name in this entry
++# When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],
+ 
+ # ### http://www.clamav.net/ and CPAN  (memory-hungry! clamd is preferred)
+ # ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/],

+ 2 - 2
amavisd/amavisd.spec

@@ -22,7 +22,7 @@
 ##  SUCH DAMAGE.
 ##
 
-%define       V_amavis  2.3.2
+%define       V_amavis  2.3.3
 %define       V_logsumm 0.6
 
 #   package information
@@ -36,7 +36,7 @@ Class:        PLUS
 Group:        Mail
 License:      GPL
 Version:      %{V_amavis}
-Release:      20050818
+Release:      20050822
 
 #   package options
 %option       with_milter no