[Amavisd-new-commits] [pkg-amavisd-new] 05/08: Refresh patches

[Alexander Wirt]

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 c8de0d525a055c24585c42bd72da4a0d39b39dd5
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat May 10 15:27:47 2014 +0200

    Refresh patches
---
 debian/patches/20_safe_path_at_init.patch           | 2 +-
 debian/patches/30_conf.d_support_builtin.patch      | 4 ++--
 debian/patches/40_fix_paths.patch                   | 6 +++---
 debian/patches/60-amavisd-snmp-subagent_paths.patch | 6 +++---
 debian/patches/85-clarify_fqdn_error.patch          | 2 +-
 debian/patches/90_fix_snmp_subagent_warning         | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/20_safe_path_at_init.patch b/debian/patches/20_safe_path_at_init.patch
index f7f8b1a..b1a8cd4 100644
--- a/debian/patches/20_safe_path_at_init.patch
+++ b/debian/patches/20_safe_path_at_init.patch
@@ -2,7 +2,7 @@ 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
-@@ -16855,6 +16855,10 @@
+@@ -17514,6 +17514,10 @@
  my $desired_user;                       # username or UID
  if ($> != 0) { $desired_user = $> }     # use effective UID if not root
  
diff --git a/debian/patches/30_conf.d_support_builtin.patch b/debian/patches/30_conf.d_support_builtin.patch
index 49d90dd..fccd55e 100644
--- a/debian/patches/30_conf.d_support_builtin.patch
+++ b/debian/patches/30_conf.d_support_builtin.patch
@@ -3,7 +3,7 @@ Description: Support Debian conf.d style out-of-the-box without perl hackery
 in the main legacy config file.
 --- a/amavisd
 +++ b/amavisd
-@@ -3644,6 +3644,25 @@
+@@ -3713,6 +3713,25 @@
  #   map { untaint($_) } @config_files;
  # }
  
@@ -29,7 +29,7 @@ in the main legacy config file.
  #use CDB_File;
  #sub tie_hash($$) {
  # my($hashref, $filename) = @_;
-@@ -16990,10 +17009,9 @@
+@@ -17649,10 +17668,9 @@
  
  # default location of the config file if none specified
  if (!@config_files) {
diff --git a/debian/patches/40_fix_paths.patch b/debian/patches/40_fix_paths.patch
index fac5dc5..8089ae6 100644
--- a/debian/patches/40_fix_paths.patch
+++ b/debian/patches/40_fix_paths.patch
@@ -81,7 +81,7 @@ Description: Fix references to paths that are different in Debian
    able to keep the number of content filtering processes under control,
 --- a/amavisd-agent
 +++ b/amavisd-agent
-@@ -50,7 +50,7 @@
+@@ -53,7 +53,7 @@
  
  my($dbfile) = 'snmp.db';
  my($db_home) =  # DB databases directory
@@ -92,7 +92,7 @@ Description: Fix references to paths that are different in Debian
  my($repeatcount);      # -c, repeat count (when defined)
 --- a/amavisd-nanny
 +++ b/amavisd-nanny
-@@ -58,7 +58,7 @@
+@@ -61,7 +61,7 @@
  
  my($dbfile) = 'nanny.db';
  my($db_home) =  # DB databases directory
@@ -103,7 +103,7 @@ Description: Fix references to paths that are different in Debian
  
 --- a/amavisd-release
 +++ b/amavisd-release
-@@ -82,7 +82,7 @@
+@@ -86,7 +86,7 @@
  
    $log_level = 1;
  # $socketname = '127.0.0.1:9998';
diff --git a/debian/patches/60-amavisd-snmp-subagent_paths.patch b/debian/patches/60-amavisd-snmp-subagent_paths.patch
index d52f100..27d4493 100644
--- a/debian/patches/60-amavisd-snmp-subagent_paths.patch
+++ b/debian/patches/60-amavisd-snmp-subagent_paths.patch
@@ -2,7 +2,7 @@ Author: Alexander Wirt <formorer at debian.org>
 Description: No description.
 --- a/amavisd-snmp-subagent
 +++ b/amavisd-snmp-subagent
-@@ -66,7 +66,7 @@
+@@ -69,7 +69,7 @@
  $syslog_facility = LOG_MAIL;
  
  my($db_home) =  # DB databases directory
@@ -11,7 +11,7 @@ Description: No description.
  
  my($mta_queue_dir);
  
-@@ -95,7 +95,7 @@
+@@ -98,7 +98,7 @@
  
  my($log_level) = 0;
  my($daemonize) = 1;
@@ -20,7 +20,7 @@ Description: No description.
  
  my($pid_file_created) = 0;
  my($syslog_open) = 0;
-@@ -737,7 +737,7 @@
+@@ -740,7 +740,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.patch b/debian/patches/85-clarify_fqdn_error.patch
index 14f17c8..0d3b61a 100644
--- a/debian/patches/85-clarify_fqdn_error.patch
+++ b/debian/patches/85-clarify_fqdn_error.patch
@@ -2,7 +2,7 @@ Author: Alexander Wirt <formorer at debian.org>
 Description: clarify fqdn error message (#451804)
 --- a/amavisd
 +++ b/amavisd
-@@ -17079,7 +17079,8 @@
+@@ -18024,7 +18024,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
diff --git a/debian/patches/90_fix_snmp_subagent_warning b/debian/patches/90_fix_snmp_subagent_warning
index b290afd..61322d5 100644
--- a/debian/patches/90_fix_snmp_subagent_warning
+++ b/debian/patches/90_fix_snmp_subagent_warning
@@ -1,6 +1,6 @@
 --- a/amavisd-snmp-subagent
 +++ b/amavisd-snmp-subagent
-@@ -777,7 +777,7 @@
+@@ -780,7 +780,7 @@
    if (!defined $mta_queue_dir) {  # test for access to Postfix queue directory
      local($ENV{PATH}) = '/usr/sbin:/usr/local/sbin:/opt/postfix/sbin';
      $! = 0;
@@ -11,7 +11,7 @@
          do_log(1, "no postfix (unable to run postconf command): $!");
 --- a/amavisd-snmp-subagent-zmq
 +++ b/amavisd-snmp-subagent-zmq
-@@ -1120,7 +1120,7 @@
+@@ -1123,7 +1123,7 @@
    if (!defined $mta_queue_dir) {  # test for access to Postfix queue directory
      local($ENV{PATH}) = '/usr/sbin:/usr/local/sbin:/opt/postfix/sbin';
      $! = 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/amavisd-new/pkg-amavisd-new.git