svn commit: r391773 - in head/www/mod_wsgi4: . files

[Olli Hauer]

Author: ohauer
Date: Sun Jul 12 10:09:36 2015
New Revision: 391773
URL: https://svnweb.freebsd.org/changeset/ports/391773

Log:
  - update to 4.4.13
  - use dedicated module file
  
  Bugs Fixed (since 4.4.6):
  -------------------------
  1. Apache 2.2.29 and 2.4.11 introduce additional fields to the request
  structure ``request_rec`` due to CVE-2013-5704. The addition of these
  fields will cause versions of mod_wsgi from 4.4.0-4.4.5 to crash when used
  in mod_wsgi daemon mode and mod_wsgi isn't initialising the new structure
  members.
  
  If you are upgrading your Apache installation to those versions or later
  versions, you must also update to mod_wsgi version 4.4.6. The mod_wsgi
  4.4.6 source code must have also been compiled against the newer Apache
  version.
  
  PR:		201023
  Submitted by:	ohauer
  Approved by:	douglas_at_douglasthrift.net (maintainer)

Added:
  head/www/mod_wsgi4/files/270_mod_wsgi.conf.sample.in   (contents, props changed)
Modified:
  head/www/mod_wsgi4/Makefile
  head/www/mod_wsgi4/distinfo
  head/www/mod_wsgi4/pkg-descr
  head/www/mod_wsgi4/pkg-plist

Modified: head/www/mod_wsgi4/Makefile
==============================================================================
--- head/www/mod_wsgi4/Makefile	Sun Jul 12 10:04:30 2015	(r391772)
+++ head/www/mod_wsgi4/Makefile	Sun Jul 12 10:09:36 2015	(r391773)
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	mod_wsgi
-PORTVERSION=	3.5
+PORTVERSION=	4.4.13
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	3
+PKGNAMESUFFIX=	4
 
 MAINTAINER=	douglas at douglasthrift.net
 COMMENT=	Python WSGI adapter module for Apache
 
 LICENSE=	APACHE20
 
-CONFLICTS_INSTALL=${PKGNAMEPREFIX}mod_wsgi2.* mod_wsgi2.* \
-		${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*
+CONFLICTS_INSTALL=${PKGNAMEPREFIX}mod_wsgi3.* mod_wsgi3.*
 
 PROJECTHOST=	modwsgi
 
@@ -24,7 +23,10 @@ GH_ACCOUNT=	GrahamDumpleton
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
 
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message ${APMOD_FILE}
+APMOD_FILE=	270_${PORTNAME}.conf.sample
+PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}
+
 
 pre-everything::
 	@${ECHO_MSG} "======================= ATTENTION! ======================"
@@ -34,4 +36,8 @@ pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "========================================================="
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
+	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${PORTNAME}.so
 .include <bsd.port.mk>

Modified: head/www/mod_wsgi4/distinfo
==============================================================================
--- head/www/mod_wsgi4/distinfo	Sun Jul 12 10:04:30 2015	(r391772)
+++ head/www/mod_wsgi4/distinfo	Sun Jul 12 10:09:36 2015	(r391773)
@@ -1,2 +1,2 @@
-SHA256 (GrahamDumpleton-mod_wsgi-3.5_GH0.tar.gz) = f0674c38f0f568ece55610bcc6a775c179835c4cba23aa7f876d2a2a8520bf93
-SIZE (GrahamDumpleton-mod_wsgi-3.5_GH0.tar.gz) = 135875
+SHA256 (GrahamDumpleton-mod_wsgi-4.4.13_GH0.tar.gz) = e7a84e4af0da953070ab993268118791c7d3c7383d99e8b1c2e0ff88eb29c286
+SIZE (GrahamDumpleton-mod_wsgi-4.4.13_GH0.tar.gz) = 631708

Added: head/www/mod_wsgi4/files/270_mod_wsgi.conf.sample.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/mod_wsgi4/files/270_mod_wsgi.conf.sample.in	Sun Jul 12 10:09:36 2015	(r391773)
@@ -0,0 +1,9 @@
+## $FreeBSD$
+## vim: set filetype=apache:
+##
+## module file for mod_wsgi
+##
+## PROVIDE: mod_wsgi
+## REQUIRE:
+
+#LoadModule wsgi_module        %%APACHEMODDIR%%/mod_wsgi.so

Modified: head/www/mod_wsgi4/pkg-descr
==============================================================================
--- head/www/mod_wsgi4/pkg-descr	Sun Jul 12 10:04:30 2015	(r391772)
+++ head/www/mod_wsgi4/pkg-descr	Sun Jul 12 10:09:36 2015	(r391773)
@@ -4,4 +4,4 @@ adapter is written completely in C code 
 for hosting WSGI applications within Apache has a lower overhead than using
 existing WSGI adapters for mod_python or CGI.
 
-WWW: http://www.modwsgi.org/
+WWW: https://github.com/GrahamDumpleton/mod_wsgi/

Modified: head/www/mod_wsgi4/pkg-plist
==============================================================================
--- head/www/mod_wsgi4/pkg-plist	Sun Jul 12 10:04:30 2015	(r391772)
+++ head/www/mod_wsgi4/pkg-plist	Sun Jul 12 10:09:36 2015	(r391773)
@@ -1,4 +1,3 @@
- at unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
+ at sample %%APACHEETCDIR%%/modules.d/%%APMOD_FILE%%
 %%APACHEMODDIR%%/%%AP_MODULE%%
- at exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec echo "Don't forget to remove all mod_wsgi-related directives in your httpd.conf"