[Amavisd-new-commits] [pkg-amavisd-new] 05/21: 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 5e96aedca56695290bb881d5bc6d851e7d393e1b
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Sep 15 08:45:44 2013 +0200

    Refresh patches
---
 debian/patches/20_safe_path_at_init.patch      |    2 +-
 debian/patches/30_conf.d_support_builtin.patch |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/20_safe_path_at_init.patch b/debian/patches/20_safe_path_at_init.patch
index 43bd2f8..f7f8b1a 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
-@@ -16586,6 +16586,10 @@
+@@ -16855,6 +16855,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 a8d3b3b..49d90dd 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
-@@ -3556,6 +3556,25 @@
+@@ -3644,6 +3644,25 @@
  #   map { untaint($_) } @config_files;
  # }
  
@@ -29,7 +29,7 @@ in the main legacy config file.
  #use CDB_File;
  #sub tie_hash($$) {
  # my($hashref, $filename) = @_;
-@@ -16711,10 +16730,9 @@
+@@ -16990,10 +17009,9 @@
  
  # default location of the config file if none specified
  if (!@config_files) {

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