rpms/amavisd-new/devel amavisd-db.patch, 1.1, 1.2 amavisd-new.spec, 1.19, 1.20

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32545

Modified Files:
	amavisd-db.patch amavisd-new.spec 
Log Message:
fix license tag

amavisd-db.patch:

Index: amavisd-db.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-db.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amavisd-db.patch	26 Jan 2006 22:11:54 -0000	1.1
+++ amavisd-db.patch	14 Jul 2008 17:32:16 -0000	1.2
@@ -1,22 +1,24 @@
---- ./amavisd-nanny.org	2005-09-19 15:26:59.000000000 +0200
-+++ ./amavisd-nanny	2005-09-19 15:27:37.000000000 +0200
-@@ -51,7 +51,7 @@
- my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this
-                         # many seconds
- 
--my($db_home) = '/var/amavis/db';  # DB databases directory
-+my($db_home) = '/var/spool/amavisd/db';  # DB databases directory
- my($dbfile)  = 'nanny.db';
- my($wakeuptime) = 2;  # seconds
- 
---- ./amavisd-agent.org	2005-09-19 15:28:15.000000000 +0200
-+++ ./amavisd-agent	2005-09-19 15:20:24.000000000 +0200
-@@ -107,7 +107,7 @@
- # main program starts here
-   $SIG{INT} = sub { die "\n" };  # do the END code block
+diff -up amavisd-agent.org amavisd-agent
+--- amavisd-agent.org	2008-07-14 13:24:20.000000000 -0400
++++ amavisd-agent	2008-07-14 13:25:00.000000000 -0400
+@@ -146,7 +146,7 @@ sub fmt_ticks($) {
+       { die "Usage: $0 [ -w <wait-interval> ]\n" }
+   }
    my($env) = BerkeleyDB::Env->new(
 -    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
 +    '-Home'=>'/var/spool/amavisd/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 );
+diff -up amavisd-nanny.org amavisd-nanny
+--- amavisd-nanny.org	2008-07-14 13:23:54.000000000 -0400
++++ amavisd-nanny	2008-07-14 13:24:13.000000000 -0400
+@@ -56,7 +56,7 @@ my($idlettl) = 3*60*60; # idle children 
+ my($activettl) = 10*60; # stuck active children are sent a SIGTERM
+                         #   after this many seconds
+ 
+-my($db_home) = '/var/amavis/db';  # DB databases directory
++my($db_home) = '/var/spool/amavisd/db';  # DB databases directory
+ my($dbfile)  = 'nanny.db';
+ my($wakeuptime) = 2;  # sleep time in seconds, may be fractional
+ 


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- amavisd-new.spec	12 Aug 2007 19:15:41 -0000	1.19
+++ amavisd-new.spec	14 Jul 2008 17:32:16 -0000	1.20
@@ -3,8 +3,9 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.5.2
-Release:        2%{?prerelease:.%{prerelease}}%{?dist}
-License:        GPL
+Release:        3%{?prerelease:.%{prerelease}}%{?dist}
+# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
+License:        GPLv2+ and BSD and GFDL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
 Source0:        http://www.ijs.si/software/amavisd/amavisd-new-%{version}%{?prerelease:-%{prerelease}}.tar.gz
@@ -166,6 +167,10 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.2-3
+- fix license tag
+- fix db patch to apply with fuzz=0
+
 * Sun Aug 12 2007 Steven Pritchard <steve at kspei.com> 2.5.2-2
 - Fix pre/preun/post dependencies and improve scriptlets a bit.
 - Drop dependencies on DBD::mysql and Mail::SPF::Query.