[Amavisd-new-commits] [SCM] Debian packaging for amavisd-new branch, master, updated. debian/1%2.7.1-2-10-g339e688
Alexander Wirt
formorer at debian.org
Sun Jan 13 09:08:39 UTC 2013
The following commit has been merged in the master branch:
commit 99628ab923c0473f2139613cd77953b2c933ad33
Author: Alexander Wirt <formorer at debian.org>
Date: Sun Jan 13 10:00:20 2013 +0100
Refresh 40_fix_paths.dpatch
diff --git a/debian/patches/40_fix_paths.dpatch b/debian/patches/40_fix_paths.dpatch
index f44f60a..23b91d5 100755
--- a/debian/patches/40_fix_paths.dpatch
+++ b/debian/patches/40_fix_paths.dpatch
@@ -5,9 +5,9 @@
## DP: Fix references to paths that are different in Debian
@DPATCH@
-diff -urNad pkg-amavisd-new~/README_FILES/README.chroot pkg-amavisd-new/README_FILES/README.chroot
---- pkg-amavisd-new~/README_FILES/README.chroot 2006-01-14 02:02:09.000000000 +0100
-+++ pkg-amavisd-new/README_FILES/README.chroot 2008-05-20 19:29:10.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/README_FILES/README.chroot pkg-amavisd-new/README_FILES/README.chroot
+--- pkg-amavisd-new~/README_FILES/README.chroot 2013-01-13 09:54:50.000000000 +0100
++++ pkg-amavisd-new/README_FILES/README.chroot 2013-01-13 09:58:19.795817245 +0100
@@ -23,6 +23,9 @@
If you have Postfix, check its chroot setup script for further hints:
postfix-xxx/examples/chroot-setup/<YOUR-OS> and BASIC_CONFIGURATION_README.
@@ -18,9 +18,9 @@ diff -urNad pkg-amavisd-new~/README_FILES/README.chroot pkg-amavisd-new/README_F
exit # This is NOT an automatic script!!!
# Don't execute commands without knowing what they will do!!!
-diff -urNad pkg-amavisd-new~/README_FILES/README.old.scanners pkg-amavisd-new/README_FILES/README.old.scanners
---- pkg-amavisd-new~/README_FILES/README.old.scanners 2005-04-25 01:16:20.000000000 +0200
-+++ pkg-amavisd-new/README_FILES/README.old.scanners 2008-05-20 19:29:10.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/README_FILES/README.old.scanners pkg-amavisd-new/README_FILES/README.old.scanners
+--- pkg-amavisd-new~/README_FILES/README.old.scanners 2013-01-13 09:54:50.000000000 +0100
++++ pkg-amavisd-new/README_FILES/README.old.scanners 2013-01-13 09:58:19.799817245 +0100
@@ -89,7 +89,7 @@
otherwise your logfiles don't show which file(s) is/are infected.
@@ -39,9 +39,9 @@ diff -urNad pkg-amavisd-new~/README_FILES/README.old.scanners pkg-amavisd-new/RE
# End of perl script
-diff -urNad pkg-amavisd-new~/README_FILES/README.performance pkg-amavisd-new/README_FILES/README.performance
---- pkg-amavisd-new~/README_FILES/README.performance 2005-08-12 16:15:59.000000000 +0200
-+++ pkg-amavisd-new/README_FILES/README.performance 2008-05-20 19:29:10.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/README_FILES/README.performance pkg-amavisd-new/README_FILES/README.performance
+--- pkg-amavisd-new~/README_FILES/README.performance 2013-01-13 09:54:50.000000000 +0100
++++ pkg-amavisd-new/README_FILES/README.performance 2013-01-13 09:58:19.799817245 +0100
@@ -16,7 +16,7 @@
Hopefully hardware matches expectations,
fast disks and enough memory are paramount.
@@ -51,9 +51,9 @@ diff -urNad pkg-amavisd-new~/README_FILES/README.performance pkg-amavisd-new/REA
where amavisd does mail unpacking.
| is there any suggested configuration for this
-diff -urNad pkg-amavisd-new~/README_FILES/README.sendmail pkg-amavisd-new/README_FILES/README.sendmail
---- pkg-amavisd-new~/README_FILES/README.sendmail 2005-04-25 01:16:34.000000000 +0200
-+++ pkg-amavisd-new/README_FILES/README.sendmail 2008-05-20 19:29:10.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/README_FILES/README.sendmail pkg-amavisd-new/README_FILES/README.sendmail
+--- pkg-amavisd-new~/README_FILES/README.sendmail 2013-01-13 09:54:50.000000000 +0100
++++ pkg-amavisd-new/README_FILES/README.sendmail 2013-01-13 09:58:19.799817245 +0100
@@ -212,7 +212,7 @@
/var/spool/mqueue and /var/spool/mqamavis is owned by amavis.
@@ -75,9 +75,9 @@ diff -urNad pkg-amavisd-new~/README_FILES/README.sendmail pkg-amavisd-new/README
write access to.
NOTE: As sendmail will perform most tasks as user amavis now, it may
-diff -urNad pkg-amavisd-new~/README_FILES/README.sendmail-dual pkg-amavisd-new/README_FILES/README.sendmail-dual
---- pkg-amavisd-new~/README_FILES/README.sendmail-dual 2006-09-15 22:36:47.000000000 +0200
-+++ pkg-amavisd-new/README_FILES/README.sendmail-dual 2008-05-20 19:29:10.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/README_FILES/README.sendmail-dual pkg-amavisd-new/README_FILES/README.sendmail-dual
+--- pkg-amavisd-new~/README_FILES/README.sendmail-dual 2013-01-13 09:54:50.000000000 +0100
++++ pkg-amavisd-new/README_FILES/README.sendmail-dual 2013-01-13 09:58:19.799817245 +0100
@@ -427,8 +427,8 @@
- Mail handling is I/O-intensive. For better performance one may place
@@ -89,9 +89,9 @@ diff -urNad pkg-amavisd-new~/README_FILES/README.sendmail-dual pkg-amavisd-new/R
- One of the important arguments for choosing the dual-MTA setup is to be
able to keep the number of content filtering processes under control,
-diff -urNad pkg-amavisd-new~/amavisd-agent pkg-amavisd-new/amavisd-agent
---- pkg-amavisd-new~/amavisd-agent 2008-04-10 20:47:12.000000000 +0200
-+++ pkg-amavisd-new/amavisd-agent 2008-05-20 19:30:33.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/amavisd-agent pkg-amavisd-new/amavisd-agent
+--- pkg-amavisd-new~/amavisd-agent 2013-01-13 09:54:50.000000000 +0100
++++ pkg-amavisd-new/amavisd-agent 2013-01-13 09:58:19.799817245 +0100
@@ -50,7 +50,7 @@
my($dbfile) = 'snmp.db';
@@ -101,9 +101,9 @@ diff -urNad pkg-amavisd-new~/amavisd-agent pkg-amavisd-new/amavisd-agent
my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional
my($repeatcount); # -c, repeat count (when defined)
-diff -urNad pkg-amavisd-new~/amavisd-agent pkg-amavisd-new/amavisd-agent
---- pkg-amavisd-new~/amavisd-nanny 2008-12-05 17:30:15.000000000 +0000
-+++ pkg-amavisd-new/amavisd-nanny 2008-12-05 17:30:38.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/amavisd-nanny pkg-amavisd-new/amavisd-nanny
+--- pkg-amavisd-new~/amavisd-nanny 2013-01-13 09:54:50.000000000 +0100
++++ pkg-amavisd-new/amavisd-nanny 2013-01-13 09:58:19.799817245 +0100
@@ -58,7 +58,7 @@
my($dbfile) = 'nanny.db';
@@ -113,15 +113,15 @@ diff -urNad pkg-amavisd-new~/amavisd-agent pkg-amavisd-new/amavisd-agent
my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional
my($repeatcount); # -c, repeat count (when defined)
-diff -urNad pkg-amavisd-new~/amavisd-release pkg-amavisd-new/amavisd-release
---- pkg-amavisd-new~/amavisd-release 2008-03-17 15:43:33.000000000 +0100
-+++ pkg-amavisd-new/amavisd-release 2008-05-20 19:29:10.000000000 +0200
-@@ -79,7 +79,7 @@
-
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/amavisd-release pkg-amavisd-new/amavisd-release
+--- pkg-amavisd-new~/amavisd-release 2013-01-13 09:48:13.000000000 +0100
++++ pkg-amavisd-new/amavisd-release 2013-01-13 09:58:55.219818194 +0100
+@@ -80,7 +80,7 @@
+ BEGIN {
$log_level = 1;
# $socketname = '127.0.0.1:9998';
- $socketname = '/var/amavis/amavisd.sock';
+ $socketname = '/var/lib/amavis/amavisd.sock';
+ }
- sub sanitize_str {
- my($str, $keep_eol) = @_;
+ BEGIN {
--
Debian packaging for amavisd-new
More information about the Amavisd-new-commits
mailing list