[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-34-gc7f1a23

Stefan Fritsch sf at sfritsch.de
Thu May 30 13:15:09 UTC 2013


The following commit has been merged in the next branch:
commit 6bea7dc421102d2508d8f9ee3c7944e667b32632
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu May 30 14:46:14 2013 +0200

    Don't source /lib/init/vars.sh in init script
    
    new lintian claims that we should not do that. And we only need VERBOSE
    anyway.

diff --git a/debian/apache2.init b/debian/apache2.init
index ec10009..90eefee 100755
--- a/debian/apache2.init
+++ b/debian/apache2.init
@@ -64,8 +64,10 @@ fi
 
 PIDFILE=$(. $APACHE_ENVVARS && echo $APACHE_PID_FILE)
 
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
+VERBOSE=no
+if [ -f /etc/default/rcS ]; then
+        . /etc/default/rcS
+fi
 . /lib/lsb/init-functions
 
 
diff --git a/debian/changelog b/debian/changelog
index 8feedd8..6fa2588 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apache2 (2.4.4-4) UNRELEASED; urgency=low
   * Fix some lintian warnings:
     - fix pod error
     - add overrides for hardening-no-fortify-functions
+    - don't use /lib/init/vars.sh in init script
 
   [ Arno Töll ]
   * Correct maintainer scripts by removing forgotten left-overs of our Squeeze

-- 
Debian packaging for apache2



More information about the Pkg-apache-commits mailing list