[Amavisd-new-commits] [pkg-amavisd-new] 01/01: 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 14d3f921daf4c0f6f3bec9f3d0b89897ee27b40b
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Nov 6 16:51:25 2016 +0100

    Refresh patches
---
 amavisd-release                                |  2 +-
 debian/patches/20_safe_path_at_init.patch      |  2 +-
 debian/patches/30_conf.d_support_builtin.patch |  4 ++--
 debian/patches/40_fix_paths.patch              | 11 -----------
 debian/patches/85-clarify_fqdn_error.patch     |  2 +-
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/amavisd-release b/amavisd-release
index 55e76b3..8aca38e 100755
--- a/amavisd-release
+++ b/amavisd-release
@@ -87,7 +87,7 @@ BEGIN {
   $log_level = 1;
 # $socketname = '127.0.0.1:9998';
 # $socketname = '[::1]:9998';
-  $socketname = '/var/amavis/amavisd.sock';
+  $socketname = '/var/lib/amavis/amavisd.sock';
 
 ### END OF USER CONFIGURABLE
 }
diff --git a/debian/patches/20_safe_path_at_init.patch b/debian/patches/20_safe_path_at_init.patch
index b1a8cd4..4c10859 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
-@@ -17514,6 +17514,10 @@
+@@ -18950,6 +18950,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 fccd55e..8f8d69b 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
-@@ -3713,6 +3713,25 @@
+@@ -4341,6 +4341,25 @@
  #   map { untaint($_) } @config_files;
  # }
  
@@ -29,7 +29,7 @@ in the main legacy config file.
  #use CDB_File;
  #sub tie_hash($$) {
  # my($hashref, $filename) = @_;
-@@ -17649,10 +17668,9 @@
+@@ -19085,10 +19104,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 8089ae6..30403f9 100644
--- a/debian/patches/40_fix_paths.patch
+++ b/debian/patches/40_fix_paths.patch
@@ -101,14 +101,3 @@ Description: Fix references to paths that are different in Debian
  my($wakeuptime) = 2;  # -w, sleep time in seconds, may be fractional
  my($repeatcount);     # -c, repeat count (when defined)
  
---- a/amavisd-release
-+++ b/amavisd-release
-@@ -86,7 +86,7 @@
- 
-   $log_level = 1;
- # $socketname = '127.0.0.1:9998';
--  $socketname = '/var/amavis/amavisd.sock';
-+  $socketname = '/var/lib/amavis/amavisd.sock';
- 
- ### END OF USER CONFIGURABLE
- }
diff --git a/debian/patches/85-clarify_fqdn_error.patch b/debian/patches/85-clarify_fqdn_error.patch
index 0d3b61a..b18a1f6 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
-@@ -18024,7 +18024,8 @@
+@@ -19463,7 +19463,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

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