rpms/amavisd-new/devel amavisd-conf.patch, 1.6, 1.7 amavisd-new.spec, 1.24, 1.25 amavisd-db.patch, 1.2, NONE

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/amavisd-new/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24839

Modified Files:
	amavisd-conf.patch amavisd-new.spec 
Removed Files:
	amavisd-db.patch 
Log Message:
Add the forgotten overlefts...


amavisd-conf.patch:

Index: amavisd-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-conf.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amavisd-conf.patch	1 Mar 2009 18:16:12 -0000	1.6
+++ amavisd-conf.patch	1 Mar 2009 18:38:53 -0000	1.7
@@ -1,6 +1,6 @@
 --- amavisd-new-2.6.2/amavisd.conf	2008-12-15 01:50:03.000000000 +0100
 +++ amavisd-new-2.6.2/amavisd.conf.conf	2009-03-01 19:11:48.000000000 +0100
-@@ -15,15 +15,15 @@
+@@ -15,25 +15,25 @@
  # $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
  
  $max_servers = 2;            # num of pre-forked children (2..30 is common), -m
@@ -20,9 +20,11 @@
  # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
  # $release_format = 'resend';     # 'attach', 'plain', 'resend'
  # $report_format  = 'arf';        # 'attach', 'plain', 'resend', 'arf'
-@@ -32,8 +32,8 @@
  
- # $db_home   = "$MYHOME/db";      # dir for bdb nanny/cache/snmp databases, -D
+ # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef, -R
+ 
+-# $db_home   = "$MYHOME/db";      # dir for bdb nanny/cache/snmp databases, -D
++$db_home   = "$MYHOME/db";        # dir for bdb nanny/cache/snmp databases, -D
  # $helpers_home = "$MYHOME/var";  # working directory for SpamAssassin, -S
 -# $lock_file = "$MYHOME/var/amavisd.lock";  # -L
 -# $pid_file  = "$MYHOME/var/amavisd.pid";   # -P


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- amavisd-new.spec	1 Mar 2009 18:16:12 -0000	1.24
+++ amavisd-new.spec	1 Mar 2009 18:38:53 -0000	1.25
@@ -18,7 +18,6 @@
 Patch0:         amavisd-conf.patch
 Patch1:         amavisd-init.patch
 Patch2:         amavisd-condrestart.patch
-Patch3:         amavisd-db.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root/
 Requires:       /usr/sbin/clamd, /etc/clamd.d
 Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
@@ -92,7 +91,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
-%patch3 -p0
 install -m644 %{SOURCE4} %{SOURCE5} README_FILES/
 
 sed -i -e 's,/var/amavis/amavisd.sock\>,/var/spool/amavisd/amavisd.sock,' \


--- amavisd-db.patch DELETED ---