[Amavisd-new-commits] [SCM] Debian packaging for amavisd-new branch, master, updated. debian/1%2.7.1-2-8-gdfe69b5

[Alexander Wirt]

The following commit has been merged in the master branch:
commit dfe69b56167e05808ca171a27218f5f50afd9d83
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Jan 13 09:53:30 2013 +0100

    Refresh 30_conf.d_support_builtin.dpatch

diff --git a/debian/patches/30_conf.d_support_builtin.dpatch b/debian/patches/30_conf.d_support_builtin.dpatch
index b8452d0..dbb46bd 100755
--- a/debian/patches/30_conf.d_support_builtin.dpatch
+++ b/debian/patches/30_conf.d_support_builtin.dpatch
@@ -6,12 +6,12 @@
 ## DP: in the main legacy config file.
 
 @DPATCH@
-diff -urNad amavisd-new~/amavisd amavisd-new/amavisd
---- amavisd-new~/amavisd	2007-09-17 22:29:49.000000000 +0200
-+++ amavisd-new/amavisd	2007-09-17 22:31:56.000000000 +0200
-@@ -2394,6 +2394,25 @@
-     Amavis::Util::read_text("$dir/template-spam-admin.txt", $file_chset);
- }
+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
+@@ -3556,6 +3556,25 @@
+ #   map { untaint($_) } @config_files;
+ # }
  
 +# attempt to read a list of config files to use instead of the default
 +# one, through an external help script. Used by the Debian distribution.
@@ -35,15 +35,17 @@ diff -urNad amavisd-new~/amavisd amavisd-new/amavisd
  #use CDB_File;
  #sub tie_hash($$) {
  # my($hashref, $filename) = @_;
-@@ -11054,7 +11073,10 @@
-   Amavis::Lookup::RE->new(@$Amavis::Conf::map_full_type_to_short_type_re);
+@@ -16711,10 +16730,9 @@
  
  # default location of the config file if none specified
--push(@config_files, '/etc/amavisd.conf')  if !@config_files;
-+if (!@config_files) {
+ if (!@config_files) {
+-  @config_files = ( '/etc/amavisd.conf' );
+-# # Debian/Ubuntu specific:
+-# @config_files = Amavis::Util::find_config_files('/usr/share/amavis/conf.d',
+-#                                                 '/etc/amavis/conf.d');
++  # Debian/Ubuntu specific:
 +  @config_files = Amavis::Util::find_config_files('/usr/share/amavis/conf.d',
-+                                                       '/etc/amavis/conf.d');
-+}
++    '/etc/amavis/conf.d');
+ }
+ 
  # Read and evaluate config files, which may override default settings
- Amavis::Conf::include_config_files(@config_files);
- Amavis::Conf::supply_after_defaults();

-- 
Debian packaging for amavisd-new