[Pkg-apache-commits] r908 - in /trunk/apache2: apache2.2-common.apache2.init changelog control

[sf at alioth.debian.org]

Author: sf
Date: Sun May 10 07:58:50 2009
New Revision: 908

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=908
Log:
- Allow apache2-mpm-itk as alternate dependency in apache2 meta package
- Fix some misuse of command substitution in the init script

Modified:
    trunk/apache2/apache2.2-common.apache2.init
    trunk/apache2/changelog
    trunk/apache2/control

Modified: trunk/apache2/apache2.2-common.apache2.init
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.apache2.init?rev=908&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.apache2.init (original)
+++ trunk/apache2/apache2.2-common.apache2.init Sun May 10 07:58:50 2009
@@ -13,7 +13,7 @@
 
 ENV="env -i LANG=C PATH=/usr/local/bin:/usr/bin:/bin"
 
-#[ `ls -1 /etc/apache2/sites-enabled/ | wc -l | sed -e 's/ *//;'` -eq 0 ] && \
+#[ $(ls -1 /etc/apache2/sites-enabled/ | wc -l | sed -e 's/ *//;') -eq 0 ] && \
 #echo "You haven't enabled any sites yet, so I'm not starting apache2." && \
 #echo "To add and enable a host, use addhost and enhost." && exit 0
 
@@ -41,7 +41,7 @@
 APACHE2CTL="$ENV /usr/sbin/apache2ctl"
 HTCACHECLEAN="$ENV /usr/sbin/htcacheclean"
 
-PIDFILE=`. /etc/apache2/envvars ; echo $APACHE_PID_FILE`
+PIDFILE=$(. /etc/apache2/envvars && echo $APACHE_PID_FILE)
 if [ -z "$PIDFILE" ] ; then
 	echo ERROR: APACHE_PID_FILE needs to be defined in /etc/apache2/envvars >&2
 	exit 2
@@ -72,9 +72,9 @@
 pidof_apache() {
     # if pidof is null for some reasons the script exits automagically
     # classified as good/unknown feature
-    PIDS=`pidof apache2` || true
-
-    [ -e $PIDFILE ] && PIDS2=`cat $PIDFILE`
+    PIDS=$(pidof apache2) || true
+
+    [ -e $PIDFILE ] && PIDS2=$(cat $PIDFILE)
     
     # if there is a pid we need to verify that belongs to apache2
     # for real
@@ -91,7 +91,7 @@
 }
 
 apache_stop() {
-	if `$APACHE2CTL configtest > /dev/null 2>&1`; then
+	if $APACHE2CTL configtest > /dev/null 2>&1; then
 		# if the config is ok than we just stop normaly
                 $APACHE2CTL stop 2>&1 | grep -v 'not running' >&2 || true
 	else
@@ -120,7 +120,7 @@
 apache_wait_stop() {
 	# running ?
 	PIDTMP=$(pidof_apache)
-	if $(kill -0 "${PIDTMP:-}" 2> /dev/null); then
+	if kill -0 "${PIDTMP:-}" 2> /dev/null; then
 	    PID=$PIDTMP
 	fi
 
@@ -129,7 +129,7 @@
 	# wait until really stopped
 	if [ -n "${PID:-}" ]; then
 		i=0
-		while $(kill -0 "${PID:-}" 2> /dev/null);  do
+		while kill -0 "${PID:-}" 2> /dev/null;  do
         		if [ $i = '60' ]; then
         			break;
         	 	else

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=908&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun May 10 07:58:50 2009
@@ -1,6 +1,13 @@
 apache2 (2.2.11-4) UNRELEASED; urgency=low
 
+  [ Peter Samuelson ]
   * Adjust sections to match recent ftpmaster overrides.
+
+  [ Stefan Fritsch ]
+  * Allow apache2-mpm-itk as alternate dependency in apache2 meta package
+    (closes: #527225).
+  * Fix some misuse of command substitution in the init script. Thanks to
+    Jari Aalto for the patch. (Closes: #523398)
 
  -- Peter Samuelson <peter at p12n.org>  Tue, 31 Mar 2009 22:21:19 -0500
 

Modified: trunk/apache2/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/control?rev=908&op=diff
==============================================================================
--- trunk/apache2/control (original)
+++ trunk/apache2/control Sun May 10 07:58:50 2009
@@ -119,7 +119,7 @@
 
 Package: apache2
 Architecture: all
-Depends: apache2-mpm-worker (>= ${source:Version}) | apache2-mpm-prefork (>= ${source:Version}) | apache2-mpm-event (>= ${source:Version})
+Depends: apache2-mpm-worker (>= ${source:Version}) | apache2-mpm-prefork (>= ${source:Version}) | apache2-mpm-event (>= ${source:Version}) | apache2-mpm-itk
 Description: Apache HTTP Server metapackage         
  The Apache Software Foundation's goal is to build a secure, efficient and
  extensible HTTP server as standards-compliant open source software. The