23197540 Upgrade mod_wsgi to version 4.5.1
authorPetr Sumbera <petr.sumbera@oracle.com>
Mon, 16 May 2016 00:50:55 -0700
changeset 5993 54464a6c913c
parent 5988 728083b9843c
child 5994 af9925efa591
23197540 Upgrade mod_wsgi to version 4.5.1
components/apache2-modules/mod_wsgi/Makefile
components/apache2-modules/mod_wsgi/history
components/apache2-modules/mod_wsgi/mod_wsgi-24.p5m
components/apache2-modules/mod_wsgi/mod_wsgi-35-24.p5m
components/apache2-modules/mod_wsgi/mod_wsgi.license
components/apache2-modules/mod_wsgi/mod_wsgi.p5m
--- a/components/apache2-modules/mod_wsgi/Makefile	Sat May 14 15:45:23 2016 -0700
+++ b/components/apache2-modules/mod_wsgi/Makefile	Mon May 16 00:50:55 2016 -0700
@@ -26,16 +26,18 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		mod_wsgi
-COMPONENT_VERSION=	4.3.0
-COMPONENT_ARCHIVE_HASH=	sha256:89dfcc8564bb8781f36370c80c6fbeef9ec0723dec273231f4f760760d8e813d
+COMPONENT_VERSION=	4.5.1
+COMPONENT_ARCHIVE_HASH=	sha256:5ed31abf1978099ec0b4a00970c1be3c9cd3bef47830773cba441ca9770d4a2e
 COMPONENT_ARCHIVE_URL=	https://pypi.python.org/packages/source/m/mod_wsgi/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=  http://code.google.com/p/modwsgi/
 
-TPNO=			19269
+TPNO=			27758
 
 # Don't use default CPPFLAGS; it causes Apache's custom CPP to fail.
 CONFIGURE_CPPFLAGS=
-VARIANTS_64 = $(BUILD_DIR)/apache24-python27 $(BUILD_DIR)/apache24-python34
+VARIANTS_64 += $(BUILD_DIR)/apache24-python27
+VARIANTS_64 += $(BUILD_DIR)/apache24-python34
+VARIANTS_64 += $(BUILD_DIR)/apache24-python35
 include ../modules.mk
 
 $(BUILD_DIR)/apache24-%/$(MACH64)/.configured: APXS=$(APACHE_24_USR_PREFIX)/bin/apxs BITS=64
@@ -44,6 +46,7 @@
 
 $(BUILD_DIR)/apache2%-python27/$(MACH64)/.configured: PYTHON=$(PYTHON.2.7.64)
 $(BUILD_DIR)/apache2%-python34/$(MACH64)/.configured: PYTHON=$(PYTHON.3.4.64)
+$(BUILD_DIR)/apache2%-python35/$(MACH64)/.configured: PYTHON=$(PYTHON.3.5.64)
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -52,4 +55,5 @@
 
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += runtime/python-34
+REQUIRED_PACKAGES += runtime/python-35
 REQUIRED_PACKAGES += system/library/math
--- a/components/apache2-modules/mod_wsgi/history	Sat May 14 15:45:23 2016 -0700
+++ b/components/apache2-modules/mod_wsgi/history	Mon May 16 00:50:55 2016 -0700
@@ -1,5 +1,5 @@
-web/server/apache-22/module/[email protected]
-web/server/apache-22/module/[email protected]
-web/server/apache-22/module/[email protected]
-web/server/apache-22/module/[email protected]
-web/server/apache-24/module/[email protected]
+web/server/apache-22/module/[email protected]
+web/server/apache-22/module/[email protected]
+web/server/apache-22/module/[email protected]
+web/server/apache-22/module/[email protected]
+web/server/apache-24/module/[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-24.p5m	Mon May 16 00:50:55 2016 -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) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/web/server/apache-24/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="mod_wsgi plugin for Apache Web Server v2.4"
+set name=com.oracle.info.description \
+    value="the mod_wsgi plugin for Apache Web Server v2.4"
+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)
+depend type=conditional \
+    fmri=web/server/apache-24/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27
+depend type=conditional \
+    fmri=web/server/apache-24/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-34
+depend type=conditional \
+    fmri=web/server/apache-24/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-35
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-35-24.p5m	Mon May 16 00:50:55 2016 -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) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/web/server/apache-24/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python 3.5 mod_wsgi plugin for Apache Web Server v2.4"
+set name=com.oracle.info.description \
+    value="the Python 3.5 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.5.so \
+    pkg.linted.userland.action001.2=true
+link path=usr/apache2/2.4/libexec/mod_wsgi.so target=mod_wsgi-3.5.so \
+    mediator=python mediator-version=3.5
+license mod_wsgi.license license=Apache2.0
+
--- a/components/apache2-modules/mod_wsgi/mod_wsgi.license	Sat May 14 15:45:23 2016 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi.license	Mon May 16 00:50:55 2016 -0700
@@ -1,3 +1,9 @@
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
--- a/components/apache2-modules/mod_wsgi/mod_wsgi.p5m	Sat May 14 15:45:23 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri \
-    value=pkg:/web/server/apache-24/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="mod_wsgi plugin for Apache Web Server v2.4"
-set name=com.oracle.info.description \
-    value="the mod_wsgi plugin for Apache Web Server v2.4"
-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)
-depend type=conditional \
-    fmri=web/server/apache-24/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27
-depend type=conditional \
-    fmri=web/server/apache-24/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-34
-