[Amavisd-new-debian-devel] One change in patch slipped out from changeset

[Ondřej Surý]

-- 
Ondřej Surý <ondrej at sury.org>  ***  http://blog.rfc1925.org/
Kulturní občasník              ***  http://www.obcasnik.cz/
Nehoupat, prosím               ***  http://nehoupat.blogspot.com/

-------------- next part --------------
# HG changeset patch
# User Ondřej Surý <ondrej at sury.org>
# Date 1189674130 -7200
# Node ID 3e59cc13954d6ab7f3cc204f81b3baa110ef9a42
# Parent  8a46f5ab6edd3931fc1d4f88e268d5ee5850c82e
Update 20_safe_path_at_init.dpatch as well

diff --git a/debian/patches/20_safe_path_at_init.dpatch b/debian/patches/20_safe_path_at_init.dpatch
--- a/debian/patches/20_safe_path_at_init.dpatch
+++ b/debian/patches/20_safe_path_at_init.dpatch
@@ -5,16 +5,16 @@
 ## DP: Set a safe path at startup for benefit of the config scripts
 
 @DPATCH@
-diff -urNad unstable~/amavisd unstable/amavisd
---- unstable~/amavisd	2006-10-31 15:34:14.000000000 -0300
-+++ unstable/amavisd	2006-11-04 00:26:52.268724203 -0300
-@@ -9708,6 +9708,9 @@
- # }
- #}
+diff -urNad amavisd-new-2.5.2~/amavisd amavisd-new-2.5.2/amavisd
+--- amavisd-new-2.5.2~/amavisd	2007-06-27 12:43:00.000000000 +0200
++++ amavisd-new-2.5.2/amavisd	2007-09-13 10:28:38.000000000 +0200
+@@ -7752,6 +7752,9 @@
+   }
+ }
  
 +# 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);
+ # initialize some remaining global variables in master process;
+ # invoked after chroot and after privileges have been dropped, before forking