From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 8 Jan 2009 12:57:06 +0000 (+0000)
Subject: - mysql 2.6.2 by Eero Hänninen
X-Git-Tag: auto/ac/amavisd-new-2_6_2-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Famavisd-new.git;a=commitdiff_plain;h=a1ff97484619b065ea30c59e9234a4a91431bc66

- mysql 2.6.2 by Eero Hänninen

Changed files:
    amavisd-new-config.patch -> 1.27
    amavisd-new.spec -> 1.120
---

diff --git a/amavisd-new-config.patch b/amavisd-new-config.patch
index c28de92..37580e8 100644
--- a/amavisd-new-config.patch
+++ b/amavisd-new-config.patch
@@ -105,7 +105,7 @@
 -# ['ClamAV-clamd',
 -#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
 -#   qr/\bOK$/, qr/\bFOUND$/,
--#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
+-#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
 -# # NOTE: run clamd under the same user as amavisd, or run it under its own
 -# #   uid such as clamav, add user clamav to the amavis group, and then add
 -# #   AllowSupplementaryGroups to clamd.conf;
@@ -130,23 +130,23 @@
 -  ### http://mks.com.pl/english.html
 -  ['MkS_Vir for Linux (beta)', ['mks32','mks'],
 -    '-s {}/*', [0], [1,2],
--    qr/--[ \t]*(.+)/ ],
+-    qr/--[ \t]*(.+)/m ],
 +#  Moved to secondary scanner
 +#  ### http://mks.com.pl/english.html
 +#  ['MkS_Vir for Linux (beta)', ['mks32','mks'],
 +#    '-s {}/*', [0], [1,2],
-+#    qr/--[ \t]*(.+)/ ],
++#    qr/--[ \t]*(.+)/m ],
  
    ### http://mks.com.pl/english.html
    ['MkS_Vir daemon', 'mksscan',
 @@ -2298,6 +2302,10 @@
  # ],
- # # other options to consider: -mime -oe -idedir=/usr/local/sav
+ # # other options to consider: -idedir=/usr/local/sav
  
 +  ['MkS_Vir for Linux (beta)', ['mks32','mks'],
 +	'-s {}/*', [0], [1,2],
-+	qr/--[ \t]*(.+)/ ],
++	qr/--[ \t]*(.+)/m ],
 +
- # always succeeds (uncomment to consider mail clean if all other scanners fail)
- # ['always-clean', sub {0}],
+ # Always succeeds and considers mail clean.
+ # Potentially useful when all other scanners fail and it is desirable
  
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 02f69c1..a132df5 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -6,13 +6,13 @@
 Summary:	A Mail Virus Scanner with SpamAssassin support - daemon
 Summary(pl.UTF-8):	Antywirusowy skaner poczty elektronicznej z obsługą SpamAssasina - demon
 Name:		amavisd-new
-Version:	2.6.1
-Release:	2
+Version:	2.6.2
+Release:	1
 Epoch:		1
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
-# Source0-md5:	2474d4c034f96a58e5b8af91af514689
+# Source0-md5:	0b3b0ef8771af8e4a950e7381d42adbd
 Source1:	%{name}.init
 Source2:	%{name}-milter.init
 Source3:	%{name}.tmpwatch