From badf355a6e30c987e0cb83a58c349ae2d77fdd91 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Wed, 7 May 2008 15:12:23 +0000
Subject: [PATCH] =?utf8?q?-=20update=20to=202.6.0=20by=20Eero=20H=C3=A4nni?=
 =?utf8?q?nen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Changed files:
    amavisd-new-tools-dbdir.patch -> 1.3
    amavisd-new.spec -> 1.116
---
 amavisd-new-tools-dbdir.patch | 41 ++++++++++++++++++-----------------
 amavisd-new.spec              |  7 +++---
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/amavisd-new-tools-dbdir.patch b/amavisd-new-tools-dbdir.patch
index 82f2151..b60072a 100644
--- a/amavisd-new-tools-dbdir.patch
+++ b/amavisd-new-tools-dbdir.patch
@@ -1,22 +1,23 @@
---- amavisd-new-2.1.2/amavisd-agent	2004-09-06 17:56:26.000000000 +0000
-+++ amavisd-new-2.1.2.new/amavisd-agent	2004-09-07 21:09:49.980116920 +0000
-@@ -107,7 +107,7 @@
- # main program starts here
-   $SIG{INT} = sub { die "\n" };  # do the END code block
-   my($env) = BerkeleyDB::Env->new(
--    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
-+    '-Home'=>'/var/spool/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
-   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
-   my($db) = BerkeleyDB::Hash->new(
-     '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env );
---- amavisd-new-2.1.2/amavisd-nanny	2004-09-06 17:56:31.000000000 +0000
-+++ amavisd-new-2.1.2.new/amavisd-nanny	2004-09-07 21:10:29.346132376 +0000
-@@ -51,7 +51,7 @@
- my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this
-                         # many seconds
+--- amavisd-new-2.6.0/amavisd-agent.orig    2008-04-10 21:47:12.000000000 +0300
++++ amavisd-new-2.6.0/amavisd-agent    2008-05-07 13:48:25.000000000 +0300
+@@ -50,7 +50,7 @@
  
--my($db_home) = '/var/amavis/db';  # DB databases directory
-+my($db_home) = '/var/spool/amavis/db';  # DB databases directory
- my($dbfile)  = 'nanny.db';
- my($wakeuptime) = 2;  # seconds
+ my($dbfile) = 'snmp.db';
+ my($db_home) =  # DB databases directory
+-  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db';
++  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/spool/amavis/db';
  
+ my($wakeuptime) = 10;  # -w, sleep time in seconds, may be fractional
+ my($repeatcount);      # -c, repeat count (when defined)
+--- amavisd-new-2.6.0/amavisd-nanny.orig    2008-03-29 00:55:02.000000000 +0200
++++ amavisd-new-2.6.0/amavisd-nanny    2008-05-07 13:49:19.000000000 +0300
+@@ -58,7 +58,7 @@
+ 
+ my($dbfile) = 'nanny.db';
+ my($db_home) =  # DB databases directory
+-  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db';
++  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/spool/amavis/db';
+ my($wakeuptime) = 2;  # -w, sleep time in seconds, may be fractional
+ my($repeatcount);     # -c, repeat count (when defined)
+ 
+
diff --git a/amavisd-new.spec b/amavisd-new.spec
index ea07096..7daa4b7 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.5.4
-Release:	2
+Version:	2.6.0
+Release:	1
 Epoch:		1
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
-# Source0-md5:	9d482cb555e1e8c0834db6b90843b4a4
+# Source0-md5:	71761c55054095279bda559177682164
 Source1:	%{name}.init
 Source2:	%{name}-milter.init
 Source3:	%{name}.tmpwatch
@@ -41,6 +41,7 @@ Requires:	perl-Net-Server >= 0.93
 Requires:	perl-Time-HiRes >= 1.49
 Requires:	perl-Unix-Syslog
 Requires:	perl-libnet
+Requires:	perl-Mail-DKIM >= 0.31
 Requires:	sh-utils
 Provides:	group(amavis)
 Provides:	user(amavis)
-- 
2.44.0