[Amavisd-new-commits] [pkg-amavisd-new] 01/21: Move to deb3
Alexander Wirt
formorer at debian.org
Thu Sep 19 07:05:57 UTC 2013
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch master
in repository pkg-amavisd-new.
commit 34b85a4478f449daa12f5d8ca4d68c537b5da035
Author: Alexander Wirt <formorer at debian.org>
Date: Sun Sep 15 08:41:32 2013 +0200
Move to deb3
---
debian/control | 2 +-
debian/patches/00list | 6 ---
debian/patches/20_safe_path_at_init.dpatch | 21 ---------
debian/patches/20_safe_path_at_init.patch | 15 ++++++
...ltin.dpatch => 30_conf.d_support_builtin.patch} | 16 ++-----
.../{40_fix_paths.dpatch => 40_fix_paths.patch} | 49 +++++++-------------
...oc_changes.dpatch => 45_misc_doc_changes.patch} | 29 ++++--------
...dpatch => 60-amavisd-snmp-subagent_paths.patch} | 20 +++-----
debian/patches/85-clarify_fqdn_error.dpatch | 20 --------
debian/patches/85-clarify_fqdn_error.patch | 14 ++++++
debian/patches/series | 6 +++
debian/rules | 4 +-
debian/source/format | 2 +-
debian/source/local-options | 1 +
14 files changed, 80 insertions(+), 125 deletions(-)
diff --git a/debian/control b/debian/control
index a03a64f..79d5906 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: mail
Priority: extra
Maintainer: Brian May <bam at debian.org>
Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Alexander Wirt <formorer at debian.org>
-Build-Depends: debhelper (>= 9), po-debconf, dpatch (>= 2.0.32), patch (>= 2.5.9-3bpo1), dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 9), po-debconf
Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=amavisd-new/pkg-amavisd-new.git;a=summary
Vcs-Git: git://anonscm.debian.org/amavisd-new/pkg-amavisd-new.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b95f4a9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-20_safe_path_at_init
-30_conf.d_support_builtin
-40_fix_paths
-45_misc_doc_changes
-60-amavisd-snmp-subagent_paths
-85-clarify_fqdn_error.dpatch
diff --git a/debian/patches/20_safe_path_at_init.dpatch b/debian/patches/20_safe_path_at_init.dpatch
deleted file mode 100755
index 57284ab..0000000
--- a/debian/patches/20_safe_path_at_init.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 20_safe_path_at_init.dpatch by Henrique de Moraes Holschuh <hmh at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set a safe path at startup for benefit of the config scripts
-
- at DPATCH@
-diff -urNad amavisd-new~/amavisd amavisd-new/amavisd
---- amavisd-new~/amavisd 2007-06-27 12:43:00.000000000 +0200
-+++ amavisd-new/amavisd 2007-09-17 22:23:08.000000000 +0200
-@@ -10939,6 +10939,10 @@
- my($desired_user); # username or UID
- if ($> != 0) { $desired_user = $> } # use effective UID if not root
-
-+# Use a default, guaranteed safe path during startup, before loading
-+# an user-supplied one from the config file
-+$ENV{PATH} = "/bin:/usr/bin";
-+
- # collect and parse command line options
- my($log_level_override, $max_servers_override);
- my($myhome_override, $tempbase_override, $helpers_home_override);
diff --git a/debian/patches/20_safe_path_at_init.patch b/debian/patches/20_safe_path_at_init.patch
new file mode 100644
index 0000000..43bd2f8
--- /dev/null
+++ b/debian/patches/20_safe_path_at_init.patch
@@ -0,0 +1,15 @@
+Author: Henrique de Moraes Holschuh <hmh at debian.org>
+Description: Set a safe path at startup for benefit of the config scripts
+--- a/amavisd
++++ b/amavisd
+@@ -16586,6 +16586,10 @@
+ my $desired_user; # username or UID
+ if ($> != 0) { $desired_user = $> } # use effective UID if not root
+
++# Use a default, guaranteed safe path during startup, before loading
++# an user-supplied one from the config file
++$ENV{PATH} = "/bin:/usr/bin";
++
+ # collect and parse command line options
+ my($log_level_override, $max_servers_override);
+ my($myhome_override, $tempbase_override, $helpers_home_override);
diff --git a/debian/patches/30_conf.d_support_builtin.dpatch b/debian/patches/30_conf.d_support_builtin.patch
old mode 100755
new mode 100644
similarity index 66%
rename from debian/patches/30_conf.d_support_builtin.dpatch
rename to debian/patches/30_conf.d_support_builtin.patch
index dbb46bd..a8d3b3b
--- a/debian/patches/30_conf.d_support_builtin.dpatch
+++ b/debian/patches/30_conf.d_support_builtin.patch
@@ -1,14 +1,8 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 30_conf.d_support_builtin.dpatch by Henrique de Moraes Holschuh <hmh at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support Debian conf.d style out-of-the-box without perl hackery
-## DP: in the main legacy config file.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/amavisd pkg-amavisd-new/amavisd
---- pkg-amavisd-new~/amavisd 2013-01-13 09:49:24.000000000 +0100
-+++ pkg-amavisd-new/amavisd 2013-01-13 09:52:57.935808626 +0100
+Author: Henrique de Moraes Holschuh <hmh at debian.org>
+Description: Support Debian conf.d style out-of-the-box without perl hackery
+in the main legacy config file.
+--- a/amavisd
++++ b/amavisd
@@ -3556,6 +3556,25 @@
# map { untaint($_) } @config_files;
# }
diff --git a/debian/patches/40_fix_paths.dpatch b/debian/patches/40_fix_paths.patch
old mode 100755
new mode 100644
similarity index 54%
rename from debian/patches/40_fix_paths.dpatch
rename to debian/patches/40_fix_paths.patch
index 23b91d5..75cc8da
--- a/debian/patches/40_fix_paths.dpatch
+++ b/debian/patches/40_fix_paths.patch
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_fix_paths.dpatch by Henrique de Moraes Holschuh <hmh at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix references to paths that are different in Debian
-
- at DPATCH@
-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
+Author: Henrique de Moraes Holschuh <hmh at debian.org>
+Description: Fix references to paths that are different in Debian
+--- a/README_FILES/README.chroot
++++ b/README_FILES/README.chroot
@@ -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 +12,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
exit # This is NOT an automatic script!!!
# Don't execute commands without knowing what they will do!!!
-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
+--- a/README_FILES/README.old.scanners
++++ b/README_FILES/README.old.scanners
@@ -89,7 +89,7 @@
otherwise your logfiles don't show which file(s) is/are infected.
@@ -39,9 +32,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
# End of perl script
-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
+--- a/README_FILES/README.performance
++++ b/README_FILES/README.performance
@@ -16,7 +16,7 @@
Hopefully hardware matches expectations,
fast disks and enough memory are paramount.
@@ -51,9 +43,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
where amavisd does mail unpacking.
| is there any suggested configuration for this
-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
+--- a/README_FILES/README.sendmail
++++ b/README_FILES/README.sendmail
@@ -212,7 +212,7 @@
/var/spool/mqueue and /var/spool/mqamavis is owned by amavis.
@@ -75,9 +66,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
write access to.
NOTE: As sendmail will perform most tasks as user amavis now, it may
-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
+--- a/README_FILES/README.sendmail-dual
++++ b/README_FILES/README.sendmail-dual
@@ -427,8 +427,8 @@
- Mail handling is I/O-intensive. For better performance one may place
@@ -89,9 +79,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
- 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 '--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
+--- a/amavisd-agent
++++ b/amavisd-agent
@@ -50,7 +50,7 @@
my($dbfile) = 'snmp.db';
@@ -101,9 +90,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional
my($repeatcount); # -c, repeat count (when defined)
-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
+--- a/amavisd-nanny
++++ b/amavisd-nanny
@@ -58,7 +58,7 @@
my($dbfile) = 'nanny.db';
@@ -113,9 +101,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional
my($repeatcount); # -c, repeat count (when defined)
-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
+--- a/amavisd-release
++++ b/amavisd-release
@@ -80,7 +80,7 @@
BEGIN {
$log_level = 1;
diff --git a/debian/patches/45_misc_doc_changes.dpatch b/debian/patches/45_misc_doc_changes.patch
old mode 100755
new mode 100644
similarity index 60%
rename from debian/patches/45_misc_doc_changes.dpatch
rename to debian/patches/45_misc_doc_changes.patch
index 98592f8..33f84db
--- a/debian/patches/45_misc_doc_changes.dpatch
+++ b/debian/patches/45_misc_doc_changes.patch
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 45_misc_doc_changes.dpatch by Henrique de Moraes Holschuh <hmh at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Misc doc changes
-
- at DPATCH@
-diff -urNad unstable~/README_FILES/README.courier unstable/README_FILES/README.courier
---- unstable~/README_FILES/README.courier 2006-11-04 00:42:23.000000000 -0300
-+++ unstable/README_FILES/README.courier 2006-11-04 00:42:44.192140909 -0300
+Author: Henrique de Moraes Holschuh <hmh at debian.org>
+Description: Misc doc changes
+--- a/README_FILES/README.courier
++++ b/README_FILES/README.courier
@@ -1,3 +1,7 @@
+Debian Note: Rename the start links of amavisd-new to S21, or you
+risk trouble. See the last paragraph of this text for more information.
@@ -16,9 +10,8 @@ diff -urNad unstable~/README_FILES/README.courier unstable/README_FILES/README.c
How to use amavisd-new with Courier
***********************************
-diff -urNad unstable~/README_FILES/README.exim_v3 unstable/README_FILES/README.exim_v3
---- unstable~/README_FILES/README.exim_v3 2006-11-04 00:42:23.000000000 -0300
-+++ unstable/README_FILES/README.exim_v3 2006-11-04 00:42:44.192140909 -0300
+--- a/README_FILES/README.exim_v3
++++ b/README_FILES/README.exim_v3
@@ -1,3 +1,9 @@
+Debian notes:
+
@@ -29,9 +22,8 @@ diff -urNad unstable~/README_FILES/README.exim_v3 unstable/README_FILES/README.e
+======================================================================+
| (Please see instructions in README.exim_v4. The setup described here |
| is not recommended with amavisd-new + Exim v4) |
-diff -urNad unstable~/README_FILES/README.milter unstable/README_FILES/README.milter
---- unstable~/README_FILES/README.milter 2006-11-04 00:42:23.000000000 -0300
-+++ unstable/README_FILES/README.milter 2006-11-04 00:42:44.193140788 -0300
+--- a/README_FILES/README.milter
++++ b/README_FILES/README.milter
@@ -1,3 +1,24 @@
+Debian notes:
+
@@ -57,9 +49,8 @@ diff -urNad unstable~/README_FILES/README.milter unstable/README_FILES/README.mi
===============================================================================
NOTE:
A recommended sendmail setup is described in file README.sendmail-dual,
-diff -urNad unstable~/amavisd.conf-default unstable/amavisd.conf-default
---- unstable~/amavisd.conf-default 2006-11-04 00:42:23.000000000 -0300
-+++ unstable/amavisd.conf-default 2006-11-04 00:42:44.191141030 -0300
+--- a/amavisd.conf-default
++++ b/amavisd.conf-default
@@ -1,5 +1,8 @@
use strict;
diff --git a/debian/patches/60-amavisd-snmp-subagent_paths.dpatch b/debian/patches/60-amavisd-snmp-subagent_paths.patch
old mode 100755
new mode 100644
similarity index 57%
rename from debian/patches/60-amavisd-snmp-subagent_paths.dpatch
rename to debian/patches/60-amavisd-snmp-subagent_paths.patch
index d9cd4f9..d52f100
--- a/debian/patches/60-amavisd-snmp-subagent_paths.dpatch
+++ b/debian/patches/60-amavisd-snmp-subagent_paths.patch
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## amavisd-snmp-subagent_paths.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-amavisd-new~/amavisd-snmp-subagent pkg-amavisd-new/amavisd-snmp-subagent
---- pkg-amavisd-new~/amavisd-snmp-subagent 2009-07-11 20:11:51.000000000 +0200
-+++ pkg-amavisd-new/amavisd-snmp-subagent 2010-03-04 23:16:29.000000000 +0100
-@@ -64,7 +64,7 @@
+Author: Alexander Wirt <formorer at debian.org>
+Description: No description.
+--- a/amavisd-snmp-subagent
++++ b/amavisd-snmp-subagent
+@@ -66,7 +66,7 @@
$syslog_facility = LOG_MAIL;
my($db_home) = # DB databases directory
@@ -17,7 +11,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
my($mta_queue_dir);
-@@ -93,7 +93,7 @@
+@@ -95,7 +95,7 @@
my($log_level) = 0;
my($daemonize) = 1;
@@ -26,7 +20,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
my($pid_file_created) = 0;
my($syslog_open) = 0;
-@@ -723,7 +723,7 @@
+@@ -737,7 +737,7 @@
-d log_level debugging level, 0..5, default 0
-P pid_file a file name to receive a PID of a damonized process
-D db_home_dir amavis database directory ($db_home),
diff --git a/debian/patches/85-clarify_fqdn_error.dpatch b/debian/patches/85-clarify_fqdn_error.dpatch
deleted file mode 100755
index dd79019..0000000
--- a/debian/patches/85-clarify_fqdn_error.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 85-clarify_fqdn_error.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: clarify fqdn error message (#451804)
-
- at DPATCH@
-diff -urNad pkg-amavisd~/amavisd pkg-amavisd/amavisd
---- pkg-amavisd~/amavisd 2008-06-29 02:37:58.000000000 +0200
-+++ pkg-amavisd/amavisd 2008-07-24 20:55:51.000000000 +0200
-@@ -12962,7 +12962,8 @@
- The value of variable \$myhostname is \"$myhn\", but should have been
- a fully qualified domain name; perhaps uname(3) did not provide such.
- You must explicitly assign a FQDN of this host to variable \$myhostname
-- in amavisd.conf, or fix what uname(3) provides as a host's network name!
-+ in /etc/amavis/conf.d/05-node_id, or fix what uname(3) provides as a host's
-+ network name!
- EOD
-
- # $SIG{USR2} = sub {
diff --git a/debian/patches/85-clarify_fqdn_error.patch b/debian/patches/85-clarify_fqdn_error.patch
new file mode 100644
index 0000000..14f17c8
--- /dev/null
+++ b/debian/patches/85-clarify_fqdn_error.patch
@@ -0,0 +1,14 @@
+Author: Alexander Wirt <formorer at debian.org>
+Description: clarify fqdn error message (#451804)
+--- a/amavisd
++++ b/amavisd
+@@ -17079,7 +17079,8 @@
+ The value of variable \$myhostname is \"$myhn\", but should have been
+ a fully qualified domain name; perhaps uname(3) did not provide such.
+ You must explicitly assign a FQDN of this host to variable \$myhostname
+- in amavisd.conf, or fix what uname(3) provides as a host's network name!
++ in /etc/amavis/conf.d/05-node_id, or fix what uname(3) provides as a host's
++ network name!
+ EOD
+
+ $mail_id_size_bits > 0 &&
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1ff30be
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+20_safe_path_at_init.patch
+30_conf.d_support_builtin.patch
+40_fix_paths.patch
+45_misc_doc_changes.patch
+60-amavisd-snmp-subagent_paths.patch
+85-clarify_fqdn_error.patch
diff --git a/debian/rules b/debian/rules
index 240ba11..24fe9ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
%:
- dh $@ --with dpatch
+ dh $@
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/amavisd-new/pkg-amavisd-new.git
More information about the Amavisd-new-commits
mailing list