Update apache to apache_1-3.33nb3:

    Previously rc.d/apache was updated to run stop & start for restart.
    '/etc/rc.d/apache restart' then picked up startssl if apache was not
    running, but if apache was running it has a large chance of the
    start running before the stop completes, leaving no httpd running.
    Instead, add a restartssl option to apachectl, and use it.

4 files changed, 40 insertions, 8 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index b0f95875fbc..cc7c226db26 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.159 2004/12/28 02:47:50 reed Exp $
+# $NetBSD: Makefile,v 1.160 2005/02/28 23:30:48 abs Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
 DISTNAME=		apache_1.3.33
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/}
diff --git a/www/apache/distinfo b/www/apache/distinfo
index 65190da3273..d3c6c08e6d9 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2005/02/24 14:08:28 wiz Exp $
+$NetBSD: distinfo,v 1.44 2005/02/28 23:30:48 abs Exp $
 
 SHA1 (apache_1.3.33.tar.gz) = 4cd49534d1abd04c81ab215f2457122d85855b0d
 RMD160 (apache_1.3.33.tar.gz) = 80e9ea2c7c75f49454acfd83cead5506c5ffddea
@@ -16,7 +16,7 @@ SHA1 (patch-ad) = c02cd1af3c4b5e0d49aaa7f0eff20a8d76a633aa
 SHA1 (patch-ae) = 59318dd3376b10b84c0126d90f4b244a18268791
 SHA1 (patch-af) = 55b27779b63cd86d3aef5b700c13600f0d840554
 SHA1 (patch-ag) = 0c075960215e55525ffee15c381b82775614a2d2
-SHA1 (patch-ah) = 477e32b049f66a326364236f63e96759f2274df6
+SHA1 (patch-ah) = 1db5811a74ecadb5f8db2d74483f95c537b9c18d
 SHA1 (patch-ai) = e2e48f48bec8cba85345e31541d4e4ddcc30e799
 SHA1 (patch-aj) = ac7337b51d7d4ca25cef4020961736404ec79f01
 SHA1 (patch-ak) = 1be52fb5fca6c05c7cf489de541e0d52383ee43a
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index 465bb8d9760..28a3df9d5f4 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.25 2004/08/02 19:54:17 abs Exp $
+# $NetBSD: apache.sh,v 1.26 2005/02/28 23:30:49 abs Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -25,7 +25,7 @@ required_files="@PKG_SYSCONFDIR@/httpd.conf"
 extra_commands="reload"
 start_cmd="apache_doit start"
 stop_cmd="apache_doit stop"
-restart_cmd="apache_doit stop ; apache_doit start" # For apache_start=startssl
+restart_cmd="apache_doit restart"
 reload_cmd="apache_doit reload"
 
 apache_doit ()
@@ -34,6 +34,7 @@ apache_doit ()
 
 	case $1 in
 	start)	action=${apache_start} ;;
+	restart)action=re${apache_start} ;;	# For apache_start=startssl
 	reload)	action=graceful ;;
 	*)	action=$1 ;;
 	esac
diff --git a/www/apache/patches/patch-ah b/www/apache/patches/patch-ah
index a0c907c1987..7d9a60a20cb 100644
--- a/www/apache/patches/patch-ah
+++ b/www/apache/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.4 2004/10/29 13:48:31 abs Exp $
+$NetBSD: patch-ah,v 1.5 2005/02/28 23:30:49 abs Exp $
 
---- src/support/apachectl.orig	2004-10-29 14:44:35.000000000 +0100
+--- src/support/apachectl.orig	2005-02-28 22:42:11.000000000 +0000
 +++ src/support/apachectl
 @@ -42,6 +42,9 @@ PIDFILE=/usr/local/apache/logs/httpd.pid
  # the path to your httpd binary, including options if necessary
@@ -12,3 +12,34 @@ $NetBSD: patch-ah,v 1.4 2004/10/29 13:48:31 abs Exp $
  # a command that outputs a formatted text version of the HTML at the
  # url given on the command line.  Designed for lynx, however other
  # programs may work.  
+@@ -138,6 +141,30 @@ do
+ 	    fi
+ 	fi
+ 	;;
++    restartssl|sslrestart|restart-SSL)
++	if [ $RUNNING -eq 0 ]; then
++	    echo "$0 $ARG: httpd not running, trying to start"
++	    if $HTTPD -DSSL ; then
++		echo "$0 $ARG: httpd started"
++	    else
++		echo "$0 $ARG: httpd could not be started"
++		ERROR=5
++	    fi
++	else
++	    if $HTTPD -t >/dev/null 2>&1; then
++		if kill -HUP $PID ; then
++		    echo "$0 $ARG: httpd restarted"
++		else
++		    echo "$0 $ARG: httpd could not be restarted"
++		    ERROR=6
++		fi
++	    else
++		echo "$0 $ARG: configuration broken, ignoring restart"
++		echo "$0 $ARG: (run 'apachectl configtest' for details)"
++		ERROR=6
++	    fi
++	fi
++	;;
+     graceful)
+ 	if [ $RUNNING -eq 0 ]; then
+ 	    echo "$0 $ARG: httpd not running, trying to start"