Mon May 3 20:10:34 2010 UTC ()
Make sure that the "suexec" module actually gets built and installed if the
package gets build with "apache-shared-modules suexec ..." as the options.
Bump package revision for the benefit of users which previously compiled
the package these options and don't have the "suexec" module available.

Problem pointed out by Filip Hajny in private e-mail.


(tron)
diff -r1.57 -r1.58 pkgsrc/www/apache22/Makefile
diff -r1.17 -r1.18 pkgsrc/www/apache22/PLIST
diff -r1.7 -r1.8 pkgsrc/www/apache22/options.mk
cvs diff -r1.57 -r1.58 pkgsrc/www/apache22/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache22/Attic/Makefile 2010/04/30 16:30:09 1.57
+++ pkgsrc/www/apache22/Attic/Makefile 2010/05/03 20:10:33 1.58
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.57 2010/04/30 16:30:09 tron Exp $ 1# $NetBSD: Makefile,v 1.58 2010/05/03 20:10:33 tron Exp $
2 2
3DISTNAME= httpd-2.2.15 3DISTNAME= httpd-2.2.15
4PKGREVISION= 1 4PKGREVISION= 2
5PKGNAME= ${DISTNAME:S/httpd/apache/} 5PKGNAME= ${DISTNAME:S/httpd/apache/}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
8 http://archive.apache.org/dist/httpd/ \ 8 http://archive.apache.org/dist/httpd/ \
9 http://archive.eu.apache.org/dist/httpd/ 9 http://archive.eu.apache.org/dist/httpd/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= tron@NetBSD.org 12MAINTAINER= tron@NetBSD.org
13HOMEPAGE= http://httpd.apache.org/ 13HOMEPAGE= http://httpd.apache.org/
14COMMENT= Apache HTTP (Web) server, version 2.2 14COMMENT= Apache HTTP (Web) server, version 2.2
15LICENSE= apache-2.0 15LICENSE= apache-2.0
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
cvs diff -r1.17 -r1.18 pkgsrc/www/apache22/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/apache22/Attic/PLIST 2010/04/30 16:30:09 1.17
+++ pkgsrc/www/apache22/Attic/PLIST 2010/05/03 20:10:33 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.17 2010/04/30 16:30:09 tron Exp $ 1@comment $NetBSD: PLIST,v 1.18 2010/05/03 20:10:33 tron Exp $
2${PLIST.suexec}sbin/suexec 2${PLIST.suexec}sbin/suexec
3include/httpd/ap_compat.h 3include/httpd/ap_compat.h
4include/httpd/ap_config.h 4include/httpd/ap_config.h
5include/httpd/ap_config_auto.h 5include/httpd/ap_config_auto.h
6include/httpd/ap_config_layout.h 6include/httpd/ap_config_layout.h
7include/httpd/ap_listen.h 7include/httpd/ap_listen.h
8include/httpd/ap_mmn.h 8include/httpd/ap_mmn.h
9include/httpd/ap_mpm.h 9include/httpd/ap_mpm.h
10include/httpd/ap_provider.h 10include/httpd/ap_provider.h
11include/httpd/ap_regex.h 11include/httpd/ap_regex.h
12include/httpd/ap_regkey.h 12include/httpd/ap_regkey.h
13include/httpd/ap_release.h 13include/httpd/ap_release.h
14include/httpd/http_config.h 14include/httpd/http_config.h
@@ -109,26 +109,27 @@ ${PLIST.all-shared}lib/httpd/mod_proxy.s @@ -109,26 +109,27 @@ ${PLIST.all-shared}lib/httpd/mod_proxy.s
109${PLIST.all-shared}lib/httpd/mod_proxy_ajp.so 109${PLIST.all-shared}lib/httpd/mod_proxy_ajp.so
110${PLIST.all-shared}lib/httpd/mod_proxy_balancer.so 110${PLIST.all-shared}lib/httpd/mod_proxy_balancer.so
111${PLIST.all-shared}lib/httpd/mod_proxy_connect.so 111${PLIST.all-shared}lib/httpd/mod_proxy_connect.so
112${PLIST.all-shared}lib/httpd/mod_proxy_ftp.so 112${PLIST.all-shared}lib/httpd/mod_proxy_ftp.so
113${PLIST.all-shared}lib/httpd/mod_proxy_http.so 113${PLIST.all-shared}lib/httpd/mod_proxy_http.so
114${PLIST.all-shared}lib/httpd/mod_proxy_scgi.so 114${PLIST.all-shared}lib/httpd/mod_proxy_scgi.so
115${PLIST.all-shared}lib/httpd/mod_reqtimeout.so 115${PLIST.all-shared}lib/httpd/mod_reqtimeout.so
116${PLIST.all-shared}lib/httpd/mod_rewrite.so 116${PLIST.all-shared}lib/httpd/mod_rewrite.so
117${PLIST.all-shared}lib/httpd/mod_setenvif.so 117${PLIST.all-shared}lib/httpd/mod_setenvif.so
118${PLIST.all-shared}lib/httpd/mod_speling.so 118${PLIST.all-shared}lib/httpd/mod_speling.so
119${PLIST.all-shared}lib/httpd/mod_ssl.so 119${PLIST.all-shared}lib/httpd/mod_ssl.so
120${PLIST.all-shared}lib/httpd/mod_status.so 120${PLIST.all-shared}lib/httpd/mod_status.so
121${PLIST.all-shared}lib/httpd/mod_substitute.so 121${PLIST.all-shared}lib/httpd/mod_substitute.so
 122${PLIST.all-shared}${PLIST.suexec}lib/httpd/mod_suexec.so
122${PLIST.all-shared}lib/httpd/mod_unique_id.so 123${PLIST.all-shared}lib/httpd/mod_unique_id.so
123${PLIST.all-shared}lib/httpd/mod_userdir.so 124${PLIST.all-shared}lib/httpd/mod_userdir.so
124${PLIST.all-shared}lib/httpd/mod_usertrack.so 125${PLIST.all-shared}lib/httpd/mod_usertrack.so
125${PLIST.all-shared}lib/httpd/mod_version.so 126${PLIST.all-shared}lib/httpd/mod_version.so
126${PLIST.all-shared}lib/httpd/mod_vhost_alias.so 127${PLIST.all-shared}lib/httpd/mod_vhost_alias.so
127libexec/cgi-bin/printenv 128libexec/cgi-bin/printenv
128libexec/cgi-bin/test-cgi 129libexec/cgi-bin/test-cgi
129man/man1/dbmmanage.1 130man/man1/dbmmanage.1
130man/man1/htdbm.1 131man/man1/htdbm.1
131man/man1/htdigest.1 132man/man1/htdigest.1
132man/man1/htpasswd.1 133man/man1/htpasswd.1
133man/man8/ab.8 134man/man8/ab.8
134man/man8/apachectl.8 135man/man8/apachectl.8
cvs diff -r1.7 -r1.8 pkgsrc/www/apache22/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/apache22/Attic/options.mk 2010/04/30 16:30:09 1.7
+++ pkgsrc/www/apache22/Attic/options.mk 2010/05/03 20:10:33 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.7 2010/04/30 16:30:09 tron Exp $ 1# $NetBSD: options.mk,v 1.8 2010/05/03 20:10:33 tron Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.apache 3PKG_OPTIONS_VAR= PKG_OPTIONS.apache
4PKG_OPTIONS_REQUIRED_GROUPS= mpm 4PKG_OPTIONS_REQUIRED_GROUPS= mpm
5PKG_OPTIONS_GROUP.mpm= apache-mpm-event apache-mpm-prefork apache-mpm-worker 5PKG_OPTIONS_GROUP.mpm= apache-mpm-event apache-mpm-prefork apache-mpm-worker
6PKG_SUPPORTED_OPTIONS= apache-shared-modules suexec 6PKG_SUPPORTED_OPTIONS= apache-shared-modules suexec
7PKG_SUGGESTED_OPTIONS= apache-shared-modules apache-mpm-prefork 7PKG_SUGGESTED_OPTIONS= apache-shared-modules apache-mpm-prefork
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11# Set the "Multi-Processing Model" used by Apache to handle requests. 11# Set the "Multi-Processing Model" used by Apache to handle requests.
12# Valid values are: 12# Valid values are:
13# event multi-threaded based in worker, designed 13# event multi-threaded based in worker, designed
14# to allow more requests to be served 14# to allow more requests to be served
@@ -46,20 +46,24 @@ PLIST_VARS+= suexec @@ -46,20 +46,24 @@ PLIST_VARS+= suexec
46BUILD_DEFS+= APACHE_SUEXEC_PATH 46BUILD_DEFS+= APACHE_SUEXEC_PATH
47BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE 47BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
48 48
49APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs 49APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs
50APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin 50APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
51APACHE_SUEXEC_LOGFILE?= ${VARBASE}/log/httpd/suexec.log 51APACHE_SUEXEC_LOGFILE?= ${VARBASE}/log/httpd/suexec.log
52APACHE_SUEXEC_CONFIGURE_ARGS+= \ 52APACHE_SUEXEC_CONFIGURE_ARGS+= \
53 --with-suexec-bin=${PREFIX}/sbin/suexec \ 53 --with-suexec-bin=${PREFIX}/sbin/suexec \
54 --with-suexec-caller=${APACHE_USER} \ 54 --with-suexec-caller=${APACHE_USER} \
55 --with-suexec-safepath='${APACHE_SUEXEC_PATH:Q}' \ 55 --with-suexec-safepath='${APACHE_SUEXEC_PATH:Q}' \
56 --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q} \ 56 --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q} \
57 --with-suexec-logfile=${APACHE_SUEXEC_LOGFILE:Q} 57 --with-suexec-logfile=${APACHE_SUEXEC_LOGFILE:Q}
58 58
 59. if !empty(PKG_OPTIONS:Mapache-shared-modules)
 60CONFIGURE_ARGS+= --enable-modules="all suexec"
 61. else
59APACHE_MODULES+= suexec 62APACHE_MODULES+= suexec
 63. endif
60CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} 64CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
61BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS 65BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS
62BUILD_TARGET= all suexec 66BUILD_TARGET= all suexec
63PLIST.suexec= yes 67PLIST.suexec= yes
64SPECIAL_PERMS+= sbin/suexec ${REAL_ROOT_USER} ${APACHE_GROUP} 4510 68SPECIAL_PERMS+= sbin/suexec ${REAL_ROOT_USER} ${APACHE_GROUP} 4510
65.endif 69.endif