19780770 Apache 2.4 needs some third party modules too
19780705 mod_jk upgrade to version 1.2.40
15812307 SUNBT7194162 upgrade mod_wsgi to version 4.3.0
19617430 mod_wsgi doesn't build if apache 2.4 is installed
--- a/components/apache2-modules/mod_dtrace/Makefile Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_dtrace/Makefile Tue Oct 21 02:05:30 2014 -0700
@@ -32,18 +32,11 @@
include ../../../make-rules/justmake.mk
include ../../../make-rules/ips.mk
-
-APACHE_USR_PREFIX=/usr/apache2/2.2
+include ../modules.mk
-$(BUILD_DIR_32)/.built: COMPONENT_BUILD_ARGS += APXS=$(APACHE_USR_PREFIX)/bin/apxs
-$(BUILD_DIR_64)/.built: COMPONENT_BUILD_ARGS += APXS=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
-$(BUILD_DIR_32)/.built: COMPONENT_BUILD_ARGS += DTRACE="/usr/sbin/dtrace -32"
-$(BUILD_DIR_64)/.built: COMPONENT_BUILD_ARGS += DTRACE="/usr/sbin/dtrace -64"
-
-PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
-ifeq ($(strip $(PARFAIT_BUILD)),yes)
-PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
-endif
+COMPONENT_BUILD_ARGS += APXS=$(APXS)
+COMPONENT_BUILD_ARGS += DTRACE="/usr/sbin/dtrace -$(BITS)"
+COMPONENT_BUILD_ARGS += PATH="$(PATH)"
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_dtrace/apache-dtrace-24.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/web/server/apache-24/module/apache-dtrace@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="DTrace plugin for Apache Web Server V2.4"
+set name=com.oracle.info.description value="the DTrace plugin for Apache Web Server V2.4"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/090
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license apache.license license="Apache v2.0"
+
+file dtrace-24.conf path=etc/apache2/2.4/samples-conf.d/dtrace.conf
+file build/apache24/$(MACH64)/.libs/mod_dtrace.so path=usr/apache2/2.4/libexec/mod_dtrace.so pkg.linted.userland.action001.2=true
--- a/components/apache2-modules/mod_dtrace/apache-dtrace.p5m Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_dtrace/apache-dtrace.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -38,5 +38,5 @@
file dtrace.conf path=etc/apache2/2.2/conf.d/dtrace.conf mode=0644 preserve=renamenew \
original_name=SUNWapch22m-dtrace:etc/apache2/2.2/conf.d/dtrace.conf
-file build/$(MACH32)/.libs/mod_dtrace.so path=usr/apache2/2.2/libexec/mod_dtrace.so
-file build/$(MACH64)/.libs/mod_dtrace.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_dtrace.so
+file build/apache22/$(MACH32)/.libs/mod_dtrace.so path=usr/apache2/2.2/libexec/mod_dtrace.so
+file build/apache22/$(MACH64)/.libs/mod_dtrace.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_dtrace.so
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_dtrace/dtrace-24.conf Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,1 @@
+LoadModule dtrace_module libexec/mod_dtrace.so
--- a/components/apache2-modules/mod_fcgid/Makefile Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_fcgid/Makefile Tue Oct 21 02:05:30 2014 -0700
@@ -37,21 +37,12 @@
include ../../../make-rules/prep.mk
include ../../../make-rules/justmake.mk
include ../../../make-rules/ips.mk
+include ../modules.mk
PATCH_LEVEL=0
-APACHE_USR_PREFIX=/usr/apache2/2.2
-
-$(BUILD_DIR_32)/.built: APXS=$(APACHE_USR_PREFIX)/bin/apxs
-$(BUILD_DIR_64)/.built: APXS=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
-
COMPONENT_PRE_BUILD_ACTION= ( cd $(@D); APXS=$(APXS) ./configure.apxs )
-PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
-ifeq ($(strip $(PARFAIT_BUILD)),yes)
-PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
-endif
-
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
build: $(BUILD_32_and_64)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_fcgid/apache-fcgid-24.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+ value=pkg:/web/server/apache-24/module/apache-fcgid@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="FastCGI plugin for Apache Web Server V2.4"
+set name=pkg.description \
+ value="FastCGI plugin for Apache Web Server Version 2.4"
+set name=com.oracle.info.description value="the FastCGI plugin for Apache Web Server V2.4"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+ value=LSARC/2009/600
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+
+license apache.license license="Apache v2.0"
+
+file fcgid-24.conf path=etc/apache2/2.4/samples-conf.d/fcgid.conf
+file path=usr/apache2/2.4/libexec/mod_fcgid.so pkg.linted.userland.action001.2=true
+file path=usr/apache2/2.4/manual/mod/mod_fcgid.html.en
+file path=usr/apache2/2.4/manual/mod/mod_fcgid.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_fcgid/fcgid-24.conf Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,13 @@
+LoadModule fcgid_module libexec/mod_fcgid.so
+
+<IfModule mod_fcgid.c>
+FcgidProcessTableFile /var/run/apache2/2.4/fcgid_shm
+FcgidIPCDir /var/run/apache2/2.4/fcgid.sock
+AddHandler fcgid-script .fcgi
+<Location /fcgid>
+ SetHandler fcgid-script
+ Options ExecCGI
+ allow from all
+</Location>
+</IfModule>
+
--- a/components/apache2-modules/mod_jk/Makefile Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_jk/Makefile Tue Oct 21 02:05:30 2014 -0700
@@ -23,42 +23,31 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= mod_jk
-COMPONENT_VERSION= 1.2.28
+COMPONENT_VERSION= 1.2.40
COMPONENT_PROJECT_URL= http://tomcat.apache.org/connectors-doc/
COMPONENT_SRC_NAME= tomcat-connectors
COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:898fddced320754121b53b3292d1d20a31bebc6733d5aeb92367143f8941fe6f
-COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+ sha256:895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d
+COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/apache
-TPNO= 9082
+TPNO= 19268
+
+CONFIGURE_DEFAULT_DIRS=no
+DEFAULT_COMPILER=no
include ../../../make-rules/prep.mk
include ../../../make-rules/configure.mk
include ../../../make-rules/ips.mk
+include ../modules.mk
PATCH_LEVEL=0
-APACHE_USR_PREFIX=/usr/apache2/2.2
-
CONFIGURE_SCRIPT = $(SOURCE_DIR)/native/configure
-# Forcing CC from environment instead. Using one provided by apxs doesn't
-# make mod_jk build.
-CC=
-
-CONFIGURE_OPTIONS.32 += --with-apxs=$(APACHE_USR_PREFIX)/bin/apxs
-CONFIGURE_OPTIONS.64 += --with-apxs=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
-
-# Header files are missing during build without cloning.
-COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR)/native $(@D));
-
-PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
-ifeq ($(strip $(PARFAIT_BUILD)),yes)
-PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
-endif
+CONFIGURE_OPTIONS += --with-apxs=$(APXS)
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_jk/apache-jk-24.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,44 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+ value=pkg:/web/server/apache-24/module/apache-jk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Tomcat Connector plugin for Apache Web Server V2.4"
+set name=pkg.description \
+ value="Tomcat Connector plugin for Apache Web Server Version 2.4"
+set name=com.oracle.info.description value="the Tomcat Connector plugin for Apache Web Server V2.4"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+ value=PSARC/2014/253
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+
+license apache.license license="Apache v2.0"
+
+file jk-24.conf path=etc/apache2/2.4/samples-conf.d/jk.conf
+file workers.properties path=etc/apache2/2.4/samples-conf.d/workers.properties
+file build/apache24/$(MACH64)/apache-2.0/mod_jk.so path=usr/apache2/2.4/libexec/mod_jk.so pkg.linted.userland.action001.2=true
--- a/components/apache2-modules/mod_jk/apache-jk.p5m Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -43,5 +43,5 @@
original_name=SUNWapch22m-jk:etc/apache2/2.2/conf.d/jk.conf
file workers.properties path=etc/apache2/2.2/conf.d/workers.properties mode=0644 preserve=renamenew \
original_name=SUNWapch22m-jk:etc/apache2/2.2/conf.d/workers.properties
-file build/$(MACH32)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/mod_jk.so
-file build/$(MACH64)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_jk.so
+file build/apache22/$(MACH32)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/mod_jk.so
+file build/apache22/$(MACH64)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_jk.so
--- a/components/apache2-modules/mod_jk/apache.license Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_jk/apache.license Tue Oct 21 02:05:30 2014 -0700
@@ -253,7 +253,7 @@
Apache Tomcat Connectors
-Copyright 2002-2009 The Apache Software Foundation
+Copyright 2002-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_jk/jk-24.conf Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,18 @@
+LoadModule jk_module libexec/mod_jk.so
+
+<IfModule mod_jk.c>
+ JkWorkersFile /etc/apache2/2.4/conf.d/workers.properties
+ # Where to put jk shared memory
+ # Update this path to match your local state directory or logs directory
+ JkShmFile /var/apache2/2.4/logs/mod_jk.shm
+ # Where to put jk logs
+ # Update this path to match your logs directory location (put mod_jk.log next to access_log)
+ JkLogFile /var/apache2/2.4/logs/mod_jk.log
+ # Set the jk log level [debug/error/info]
+ JkLogLevel info
+ # Select the timestamp log format
+ JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
+ # Send everything for context /examples to worker named worker1 (ajp13)
+ JkMount /examples/* worker1
+</IfModule>
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_jk/patches/srcdir.patch Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,69 @@
+Patch origin: in-house
+Patch status: under investigation, submitted upstream
+
+https://issues.apache.org/bugzilla/show_bug.cgi?id=57060
+
+--- native/common/Makefile.in 2012-05-09 13:08:26.000000000 +0000
++++ native/common/Makefile.in 2014-09-16 12:42:37.566279820 +0000
+@@ -31,7 +31,7 @@
+ OEXT=.lo
+ include list.mk
+
+-CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
++CFLAGS=-I. @apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
+
+ include @top_srcdir@/scripts/build/rules.mk
+
+--- native/apache-2.0/Makefile.in 2012-05-09 13:08:26.000000000 +0000
++++ native/apache-2.0/Makefile.in 2014-09-17 09:40:13.054602402 +0000
+@@ -15,6 +15,9 @@
+
+ ##
+
++srcdir=@srcdir@
++top_srcdir=@top_srcdir@
++top_builddir=@top_builddir@
+ APXS=@APXS@
+ CP=@CP@
+ APACHE_DIR=@APACHE_DIR@
+@@ -36,20 +39,20 @@
+ include @APACHE_CONFIG_VARS@
+
+ # Local settings ( overriding/appending to Apache's )
+-COMMON=../common
+-JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON}
++COMMON=common
++JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
+ CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
+
+
+ # Implicit rules
+-include ../scripts/build/rules.mk
++include @top_srcdir@/scripts/build/rules.mk
+
+ OEXT=.lo
+
+ all: Makefile @LIB_JK_TYPE@
+ install: @INSTALL_TYPE@
+
+-Makefile: Makefile.in
++Makefile: ${srcdir}/Makefile.in
+ echo Regenerating Makefile
+ ( cd ..; ./config.status )
+
+@@ -74,11 +77,14 @@
+ #################### Dynamic .so file ####################
+ # APXS will compile every file, this is derived from apxs
+
++mod_jk.lo: ${srcdir}/mod_jk.c
++ ${LT_COMPILE}
++
+ mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
+ $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath ${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
+
+ mod_jk.so: mod_jk.la
+- ../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
++ @top_srcdir@/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
+
+ install_dynamic:
+ @echo ""
--- a/components/apache2-modules/mod_security2/Makefile Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_security2/Makefile Tue Oct 21 02:05:30 2014 -0700
@@ -39,17 +39,17 @@
include ../../../make-rules/prep.mk
include ../../../make-rules/configure.mk
include ../../../make-rules/ips.mk
-
-APACHE_USR_PREFIX=/usr/apache2/2.2
+include ../modules.mk
-APXS.32= $(APACHE_USR_PREFIX)/bin/apxs
-APXS.64= $(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
+COMPONENT_POST_UNPACK_ACTION += \
+ (cd $(SOURCE_DIR); \
+ $(CP) modsecurity.conf-recommended modsecurity-24.conf-recommended)
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += LTFLAGS="--silent --tag=CC"
-CONFIGURE_OPTIONS += --with-apxs=$(APXS.$(BITS))
-CONFIGURE_OPTIONS += --with-apr=`$(APXS.$(BITS)) -q APR_CONFIG`
-CONFIGURE_OPTIONS += --with-apu=`$(APXS.$(BITS)) -q APU_CONFIG`
+CONFIGURE_OPTIONS += --with-apxs=$(APXS)
+CONFIGURE_OPTIONS += --with-apr=`$(APXS) -q APR_CONFIG`
+CONFIGURE_OPTIONS += --with-apu=`$(APXS) -q APU_CONFIG`
COMPONENT_TEST_ARGS += CFLAGS="$(CFLAGS) -DMSC_TEST"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_security2/apache-security-24.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+ value=pkg:/web/server/apache-24/module/apache-security@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Mod Security plugin for Apache Web Server V2.4"
+set name=pkg.description \
+ value="Mod Security plugin for Apache Web Server Version 2.4"
+set name=com.oracle.info.description value="the Mod Security plugin for Apache Web Server V2.4"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+ value=PSARC/2008/090
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+
+license LICENSE license="Apache v2.0"
+
+dir path=var/apache2/2.4/modsec/tmp/ group=webservd owner=webservd mode=770
+
+file modsecurity-24.conf-recommended path=etc/apache2/2.4/samples-conf.d/security2.conf
+file build/apache24/$(MACH64)/apache2/.libs/mod_security2.so path=usr/apache2/2.4/libexec/mod_security2.so pkg.linted.userland.action001.2=true
+file unicode.mapping path=etc/apache2/2.4/samples-conf.d/unicode.mapping
--- a/components/apache2-modules/mod_security2/apache-security.p5m Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_security2/apache-security.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -42,6 +42,6 @@
dir path=var/apache2/2.2/modsec/tmp/ group=webservd owner=webservd mode=770
file modsecurity.conf-recommended path=etc/apache2/2.2/samples-conf.d/security2.conf
-file build/$(MACH32)/apache2/.libs/mod_security2.so path=usr/apache2/2.2/libexec/mod_security2.so
-file build/$(MACH64)/apache2/.libs/mod_security2.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_security2.so
+file build/apache22/$(MACH32)/apache2/.libs/mod_security2.so path=usr/apache2/2.2/libexec/mod_security2.so
+file build/apache22/$(MACH64)/apache2/.libs/mod_security2.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_security2.so
file unicode.mapping path=etc/apache2/2.2/samples-conf.d/unicode.mapping
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_security2/patches/security2-conf-24.patch Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,67 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+Customize conf file for Solaris.
+
+--- modsecurity-apache_2.7.5/modsecurity-24.conf-recommended 2014-09-18 11:02:07.894164052 +0000
++++ modsecurity-apache_2.7.5/modsecurity-24.conf-recommended 2014-09-18 11:02:55.661565764 +0000
+@@ -1,3 +1,7 @@
++LoadModule security2_module libexec/mod_security2.so
++
++<IfModule mod_security2.c>
++
+ # -- Rule engine initialization ----------------------------------------------
+
+ # Enable ModSecurity, attaching it to every transaction. Use detection
+@@ -129,13 +133,13 @@
+ # This default setting is chosen due to all systems have /tmp available however,
+ # this is less than ideal. It is recommended that you specify a location that's private.
+ #
+-SecTmpDir /tmp/
++SecTmpDir /var/apache2/2.4/modsec/tmp/
+
+ # The location where ModSecurity will keep its persistent data. This default setting
+ # is chosen due to all systems have /tmp available however, it
+ # too should be updated to a place that other users can't access.
+ #
+-SecDataDir /tmp/
++SecDataDir /var/apache2/2.4/modsec/tmp/
+
+
+ # -- File uploads handling configuration -------------------------------------
+@@ -144,7 +148,7 @@
+ # location must be private to ModSecurity. You don't want other users on
+ # the server to access the files, do you?
+ #
+-#SecUploadDir /opt/modsecurity/var/upload/
++#SecUploadDir /var/apache2/2.4/modsec/upload/
+
+ # By default, only keep the files that were determined to be unusual
+ # in some way (by an external inspection script). For this to work you
+@@ -164,7 +168,7 @@
+ # The default debug log configuration is to duplicate the error, warning
+ # and notice messages from the error log.
+ #
+-#SecDebugLog /opt/modsecurity/var/log/debug.log
++#SecDebugLog /var/apache2/2.4/logs/modsec_debug.log
+ #SecDebugLogLevel 3
+
+
+@@ -184,10 +188,10 @@
+ # assumes that you will use the audit log only ocassionally.
+ #
+ SecAuditLogType Serial
+-SecAuditLog /var/log/modsec_audit.log
++SecAuditLog /var/apache2/2.4/logs/modsec_audit.log
+
+ # Specify the path for concurrent audit logging.
+-#SecAuditLogStorageDir /opt/modsecurity/var/audit/
++#SecAuditLogStorageDir /var/apache2/2.4/modsec/audit/
+
+
+ # -- Miscellaneous -----------------------------------------------------------
+@@ -211,3 +221,4 @@
+ # version, Anonymous unique id for host.
+ SecStatusEngine On
+
++</IfModule>
--- a/components/apache2-modules/mod_wsgi/Makefile Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_wsgi/Makefile Tue Oct 21 02:05:30 2014 -0700
@@ -25,61 +25,54 @@
include ../../../make-rules/shared-macros.mk
-PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
-ifeq ($(strip $(PARFAIT_BUILD)),yes)
-PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
-endif
-
COMPONENT_NAME= mod_wsgi
-COMPONENT_VERSION= 3.3
+COMPONENT_VERSION= 4.3.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:d96e1078990484cfe5579df1e95dc73f009495e9c3f9a066b0983650bd9e3243
-COMPONENT_ARCHIVE_URL= http://modwsgi.googlecode.com/files/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH= sha256:89dfcc8564bb8781f36370c80c6fbeef9ec0723dec273231f4f760760d8e813d
+COMPONENT_ARCHIVE_URL= https://pypi.python.org/packages/source/m/mod_wsgi/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= http://code.google.com/p/modwsgi/
COMPONENT_BUGDB= utility/apache
-TPNO= 7687
+TPNO= 19269
include $(WS_TOP)/make-rules/prep.mk
include $(WS_TOP)/make-rules/configure.mk
include $(WS_TOP)/make-rules/ips.mk
+include ../modules.mk
+
+APACHE_USR_PREFIX = /usr/apache2/
+
+VARIANT_AP_22_PY26 = $(BUILD_DIR)/apache22-python26
+VARIANT_AP_22_PY27 = $(BUILD_DIR)/apache22-python27
+VARIANT_AP_22_PY34 = $(BUILD_DIR)/apache22-python34
+VARIANT_AP_24_PY26 = $(BUILD_DIR)/apache24-pytohn26
+VARIANT_AP_24_PY27 = $(BUILD_DIR)/apache24-python27
+VARIANT_AP_24_PY34 = $(BUILD_DIR)/apache24-python34
+
+VARIANTS_32 = $(VARIANT_AP_22_PY26) $(VARIANT_AP_22_PY27)
+VARIANTS_64 = $(VARIANT_AP_22_PY26) $(VARIANT_AP_22_PY27) $(VARIANT_AP_22_PY34) \
+ $(VARIANT_AP_24_PY26) $(VARIANT_AP_24_PY27) $(VARIANT_AP_24_PY34)
+
+$(BUILD_DIR)/apache22-%/$(MACH32)/.configured: APXS=$(APACHE_USR_PREFIX)/2.2/bin/apxs
+$(BUILD_DIR)/apache22-%/$(MACH64)/.configured: APXS=$(APACHE_USR_PREFIX)/2.2/bin/$(MACH64)/apxs
+$(BUILD_DIR)/apache24-%/$(MACH64)/.configured: APXS=$(APACHE_USR_PREFIX)/2.4/bin/apxs
+
+$(BUILD_DIR)/apache2%-python26/$(MACH32)/.configured: PYTHON=$(PYTHON.2.6.32)
+$(BUILD_DIR)/apache2%-python26/$(MACH64)/.configured: PYTHON=$(PYTHON.2.6.64)
+$(BUILD_DIR)/apache2%-python27/$(MACH32)/.configured: PYTHON=$(PYTHON.2.7.32)
+$(BUILD_DIR)/apache2%-python27/$(MACH64)/.configured: PYTHON=$(PYTHON.2.7.64)
+$(BUILD_DIR)/apache2%-python34/$(MACH32)/.configured: PYTHON=$(PYTHON.3.4.32)
+$(BUILD_DIR)/apache2%-python34/$(MACH64)/.configured: PYTHON=$(PYTHON.3.4.64)
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D))
-# The following four paragraphs are copied from setup.py.mk
-# but since mod_wsgi doesn't use setup.py, we can't just include
-# setup.py.mk
-$(BUILD_DIR)/%-2.6/.built: PYTHON_VERSION=2.6
-$(BUILD_DIR)/%-2.7/.built: PYTHON_VERSION=2.7
-$(BUILD_DIR)/$(MACH32)-%/.built: BITS=32
-$(BUILD_DIR)/$(MACH64)-%/.built: BITS=64
-
-$(BUILD_DIR)/%-2.6/.installed: PYTHON_VERSION=2.6
-$(BUILD_DIR)/%-2.7/.installed: PYTHON_VERSION=2.7
-$(BUILD_DIR)/$(MACH32)-%/.installed: BITS=32
-$(BUILD_DIR)/$(MACH64)-%/.installed: BITS=64
-
-BUILD_32 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH32)-%/.built)
-BUILD_64 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.built)
-
-INSTALL_32 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH32)-%/.installed)
-INSTALL_64 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.installed)
-
-$(BUILD_32): CONFIGURE_OPTIONS += --with-python=$(PYTHON.32)
-$(BUILD_64): CONFIGURE_OPTIONS += --with-apxs=/usr/bin/$(MACH64)/apxs --with-python=$(PYTHON.64)
+CONFIGURE_OPTIONS += --with-python=$(PYTHON)
+CONFIGURE_OPTIONS += --with-apxs=$(APXS)
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-$(INSTALL_32): COMPONENT_POST_INSTALL_ACTION = \
- (cd $(PROTO_DIR)/usr/apache2/2.2/libexec ; \
- $(MV) mod_wsgi.so mod_wsgi-$(PYTHON_VERSION).so)
-
-$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION = \
- (cd $(PROTO_DIR)/usr/apache2/2.2/libexec/$(MACH64) ; \
- $(MV) mod_wsgi.so mod_wsgi-$(PYTHON_VERSION).so)
-
# common targets
build: $(BUILD_32_and_64)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-26-24.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/web/server/apache-24/module/apache-wsgi-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Python 2.6 mod_wsgi plugin for Apache Web Server v2.4"
+set name=com.oracle.info.description value="the Python 2.6 mod_wsgi plugin for Apache Web Server v2.4"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/253
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/apache2/2.4/libexec/mod_wsgi-2.6.so pkg.linted.userland.action001.2=true
+link path=usr/apache2/2.4/libexec/mod_wsgi.so \
+ target=mod_wsgi-2.6.so mediator=python \
+ mediator-priority=vendor mediator-version=2.6
+license mod_wsgi.license license=Apache2.0
--- a/components/apache2-modules/mod_wsgi/mod_wsgi-26.p5m Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-26.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -35,11 +35,11 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2012/162
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/apache2/2.2/libexec/$(MACH64)/mod_wsgi-2.6.so mode=0555
+file path=usr/apache2/2.2/libexec/$(MACH64)/mod_wsgi-2.6.so
link path=usr/apache2/2.2/libexec/$(MACH64)/mod_wsgi.so \
target=mod_wsgi-2.6.so mediator=python \
mediator-priority=vendor mediator-version=2.6
-file path=usr/apache2/2.2/libexec/mod_wsgi-2.6.so mode=0555
+file path=usr/apache2/2.2/libexec/mod_wsgi-2.6.so
link path=usr/apache2/2.2/libexec/mod_wsgi.so \
target=mod_wsgi-2.6.so mediator=python \
mediator-priority=vendor mediator-version=2.6
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-27-24.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/web/server/apache-24/module/apache-wsgi-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Python 2.7 mod_wsgi plugin for Apache Web Server v2.4"
+set name=com.oracle.info.description value="the Python 2.7 mod_wsgi plugin for Apache Web Server v2.4"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/253
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/apache2/2.4/libexec/mod_wsgi-2.7.so pkg.linted.userland.action001.2=true
+link path=usr/apache2/2.4/libexec/mod_wsgi.so \
+ target=mod_wsgi-2.7.so mediator=python \
+ mediator-version=2.7
+license mod_wsgi.license license=Apache2.0
+
--- a/components/apache2-modules/mod_wsgi/mod_wsgi-27.p5m Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-27.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -35,14 +35,14 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2012/162
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/apache2/2.2/libexec/$(MACH64)/mod_wsgi-2.7.so mode=0555
+file path=usr/apache2/2.2/libexec/$(MACH64)/mod_wsgi-2.7.so
link path=usr/apache2/2.2/libexec/$(MACH64)/mod_wsgi.so \
target=mod_wsgi-2.7.so mediator=python \
mediator-version=2.7
link path=usr/apache2/2.2/libexec/$(MACH64)/mod_wsgi.so \
target=mod_wsgi-2.7.so mediator=python \
mediator-version=2.7
-file path=usr/apache2/2.2/libexec/mod_wsgi-2.7.so mode=0555
+file path=usr/apache2/2.2/libexec/mod_wsgi-2.7.so
link path=usr/apache2/2.2/libexec/mod_wsgi.so \
target=mod_wsgi-2.7.so mediator=python \
mediator-version=2.7
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-34-24.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/web/server/apache-24/module/apache-wsgi-34@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Python 3.4 mod_wsgi plugin for Apache Web Server v2.4"
+set name=com.oracle.info.description value="the Python 3.4 mod_wsgi plugin for Apache Web Server v2.4"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2012/162
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/apache2/2.4/libexec/mod_wsgi-3.4.so pkg.linted.userland.action001.2=true
+link path=usr/apache2/2.4/libexec/mod_wsgi.so \
+ target=mod_wsgi-3.4.so mediator=python \
+ mediator-version=3.4
+license mod_wsgi.license license=Apache2.0
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-34.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/web/server/apache-22/module/apache-wsgi-34@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Python 3.4 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.description value="the Python 3.4 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2012/162
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/apache2/2.2/libexec/$(MACH64)/mod_wsgi-3.4.so
+link path=usr/apache2/2.2/libexec/$(MACH64)/mod_wsgi.so \
+ target=mod_wsgi-3.4.so mediator=python \
+ mediator-version=3.4
+license mod_wsgi.license license=Apache2.0
+
--- a/components/apache2-modules/mod_wsgi/mod_wsgi.p5m Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi.p5m Tue Oct 21 02:05:30 2014 -0700
@@ -40,4 +40,7 @@
depend fmri=web/server/apache-22/module/apache-wsgi-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/python-27 \
type=conditional
+depend fmri=web/server/apache-22/module/apache-wsgi-34@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-34 \
+ type=conditional
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_wsgi/patches/rename.patch Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,24 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+Renames module to contain Python version in its name.
+
+--- mod_wsgi-4.3.0/Makefile.in 2014-09-14 22:00:29.000000000 +0000
++++ mod_wsgi-4.3.0/Makefile.in 2014-09-18 13:32:39.390320209 +0000
+@@ -23,6 +23,8 @@
+ LDFLAGS = @LDFLAGS@
+ LDLIBS = @LDLIBS@
+
++PYTHON_VERSION:=$(shell $(PYTHON) -V 2>&1 | sed -e 's/Python //' -e 's/..$$//')
++
+ SRCFILES = src/server/mod_wsgi.c src/server/wsgi_*.c
+
+ all : src/server/mod_wsgi.la
+@@ -35,6 +37,7 @@
+
+ install : all $(DESTDIR)$(LIBEXECDIR)
+ $(APXS) -i -S LIBEXECDIR=$(DESTDIR)$(LIBEXECDIR) -n 'mod_wsgi' src/server/mod_wsgi.la
++ mv $(DESTDIR)$(LIBEXECDIR)/mod_wsgi.so $(DESTDIR)$(LIBEXECDIR)/mod_wsgi-$(PYTHON_VERSION).so
+
+ clean :
+ -rm -rf src/server/.libs
--- a/components/apache2-modules/mod_wsgi/resolve.deps Mon Oct 20 21:15:08 2014 -0700
+++ b/components/apache2-modules/mod_wsgi/resolve.deps Tue Oct 21 02:05:30 2014 -0700
@@ -1,5 +1,6 @@
runtime/python-26
runtime/python-27
+runtime/python-34
system/library
system/library/math
system/linker
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/modules.mk Tue Oct 21 02:05:30 2014 -0700
@@ -0,0 +1,78 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+APACHE_22_USR_PREFIX=/usr/apache2/2.2
+APACHE_24_USR_PREFIX=/usr/apache2/2.4
+
+VARIANT_APACHE_22 = $(BUILD_DIR)/apache22
+VARIANT_APACHE_24 = $(BUILD_DIR)/apache24
+
+VARIANTS_32 = $(VARIANT_APACHE_22)
+VARIANTS_64 = $(VARIANT_APACHE_22) $(VARIANT_APACHE_24)
+
+BUILD_32 = $(VARIANTS_32:%=%/$(MACH32)/.built)
+BUILD_64 = $(VARIANTS_64:%=%/$(MACH64)/.built)
+
+INSTALL_32 = $(VARIANTS_32:%=%/$(MACH32)/.installed)
+INSTALL_64 = $(VARIANTS_64:%=%/$(MACH64)/.installed)
+
+TEST_32 = $(VARIANTS_32:%=%/$(MACH32)/.tested)
+TEST_64 = $(VARIANTS_64:%=%/$(MACH64)/.tested)
+
+$(VARIANT_APACHE_22)/$(MACH64)/.configured: BITS=64
+$(VARIANT_APACHE_24)/$(MACH64)/.configured: BITS=64
+
+$(VARIANT_APACHE_22)/$(MACH64)/.built: BITS=64
+$(VARIANT_APACHE_24)/$(MACH64)/.built: BITS=64
+
+$(VARIANT_APACHE_22)/$(MACH64)/.tested: BITS=64
+$(VARIANT_APACHE_24)/$(MACH64)/.tested: BITS=64
+
+$(VARIANT_APACHE_22)/%/.configured: APACHE_USR_PREFIX=$(APACHE_22_USR_PREFIX)
+$(VARIANT_APACHE_24)/%/.configured: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
+
+$(VARIANT_APACHE_22)/%/.built: APACHE_USR_PREFIX=$(APACHE_22_USR_PREFIX)
+$(VARIANT_APACHE_24)/%/.built: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
+
+$(VARIANT_APACHE_22)/%/.installed: APACHE_USR_PREFIX=$(APACHE_22_USR_PREFIX)
+$(VARIANT_APACHE_24)/%/.installed: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
+
+$(BUILD_DIR)/apache22/$(MACH32)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/apxs
+$(BUILD_DIR)/apache22/$(MACH64)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
+$(BUILD_DIR)/apache24/$(MACH64)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/apxs
+
+$(BUILD_DIR)/apache22/$(MACH32)/.built: APXS=$(APACHE_USR_PREFIX)/bin/apxs
+$(BUILD_DIR)/apache22/$(MACH64)/.built: APXS=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
+$(BUILD_DIR)/apache24/$(MACH64)/.built: APXS=$(APACHE_USR_PREFIX)/bin/apxs
+
+DEFAULT_COMPILER?=yes
+
+ifeq ($(strip $(DEFAULT_COMPILER)),no)
+CC=
+CXX=
+endif
+
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+ifeq ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif