OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Sep-2006 17:38:04
Branch: HEAD Handle: 2006093016380300
Modified files:
openpkg-src/amavisd amavisd.patch amavisd.spec
Log:
upgrading package: amavisd 2.4.2 -> 2.4.3
Summary:
Revision Changes Path
1.3 +13 -9 openpkg-src/amavisd/amavisd.patch
1.66 +2 -2 openpkg-src/amavisd/amavisd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 amavisd.patch
--- openpkg-src/amavisd/amavisd.patch 4 Apr 2006 06:37:05 -0000 1.2
+++ openpkg-src/amavisd/amavisd.patch 30 Sep 2006 15:38:03 -0000 1.3
@@ -1,7 +1,7 @@
Index: amavisd.conf
---- amavisd.conf.orig 2006-04-03 16:32:25 +0200
-+++ amavisd.conf 2006-04-04 08:33:40 +0200
-@@ -295,14 +295,14 @@
+--- amavisd.conf.orig 2006-09-30 11:29:20 +0200
++++ amavisd.conf 2006-09-30 17:36:20 +0200
+@@ -317,16 +317,16 @@
# ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
# ['Sophos SAVI', \&sophos_savi ],
@@ -10,17 +10,21 @@
-# \&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"],
+-# # 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;
+-# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name
in
+-# # this entry; when running chrooted one may prefer socket
"$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"],
++# 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;
++# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
++# this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
# ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
# ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/],
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.65 -r1.66 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 25 Aug 2006 19:15:52 -0000 1.65
+++ openpkg-src/amavisd/amavisd.spec 30 Sep 2006 15:38:03 -0000 1.66
@@ -23,7 +23,7 @@
##
# package versions
-%define V_amavis 2.4.2
+%define V_amavis 2.4.3
%define V_logsumm 0.6
# package information
@@ -37,7 +37,7 @@
Group: Mail
License: GPL
Version: %{V_amavis}
-Release: 20060825
+Release: 20060930
# package options
%option with_milter no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
