This fixes two small issues with www/apache-httpd:

 - The rc script doesn't work out of the box because it doesn't pass
   the -k option needed for 'start|stop|...' arguments. I hope my
   way of fixing it is appropriate, and welcome other suggestions.

 - The readme implies that chroot is not available, while it has
   been available since 2.2.10 and does indeed work as advertised.
   http://httpd.apache.org/docs/2.2/mod/mpm_common.html#chrootdir

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile    12 Jul 2013 13:21:25 -0000      1.38
+++ Makefile    11 Sep 2013 19:39:40 -0000
@@ -3,6 +3,7 @@
 COMMENT=       apache HTTP server
 
 V=             2.2.25
+REVISION=      1
 PKGNAME=       apache-httpd-${V}
 DISTNAME=      httpd-${V}
 
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/apache-httpd/pkg/MESSAGE,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 MESSAGE
--- pkg/MESSAGE 14 Dec 2006 07:14:21 -0000      1.1.1.1
+++ pkg/MESSAGE 11 Sep 2013 19:40:48 -0000
@@ -3,6 +3,5 @@ provided as a port for those who, for va
 version 2. 
 
 OpenBSD provides a custom Apache server, httpd(8), in the base system
-which has been audited for security and may run in a chroot(2)
-environment.  Users are STRONGLY encouraged to use the system httpd
-rather than this port.
+which has been audited for security. Users are STRONGLY encouraged to
+use the system httpd rather than this port.
Index: pkg/httpd2.rc
===================================================================
RCS file: /cvs/ports/www/apache-httpd/pkg/httpd2.rc,v
retrieving revision 1.1
diff -u -p -r1.1 httpd2.rc
--- pkg/httpd2.rc       18 Jul 2012 08:45:42 -0000      1.1
+++ pkg/httpd2.rc       11 Sep 2013 19:40:21 -0000
@@ -10,4 +10,6 @@ rc_pre() {
        rm -f /var/apache2/logs/{ssl_mutex,httpd.lock,accept.lock}.*
 }
 
+daemon_flags="${daemon_flags} -k"
+
 rc_cmd $1

Reply via email to