Date: Mon, 26 May 2014 22:59:25 -0700 (PDT) From: Douglas William Thrift <douglas@douglasthrift.net> To: FreeBSD-gnats-submit@freebsd.org Cc: douglas@douglasthrift.net Subject: ports/190297: Update port: www/mod_wsgi3 Upgrade to 3.5 Message-ID: <201405270559.s4R5xPRb015166@slowhand.douglasthrift.net> Resent-Message-ID: <201405270600.s4R600EH083309@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190297 >Category: ports >Synopsis: Update port: www/mod_wsgi3 Upgrade to 3.5 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 27 06:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Douglas William Thrift >Release: FreeBSD 9.2-RELEASE-p6 amd64 >Organization: >Environment: System: FreeBSD slowhand.douglasthrift.net 9.2-RELEASE-p6 FreeBSD 9.2-RELEASE-p6 #0: Tue May 13 08:21:53 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Upgrade www/mod_wsgi3 to 3.5. https://redports.org/buildarchive/20140527052601-39714/ http://modwsgi.readthedocs.org/en/develop/release-notes/version-3.5.html >How-To-Repeat: >Fix: --- mod_wsgi3.2014-05-27T054943Z.diff begins here --- Index: www/mod_wsgi3/Makefile =================================================================== --- www/mod_wsgi3/Makefile (revision 355463) +++ www/mod_wsgi3/Makefile (working copy) @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= mod_wsgi -PORTVERSION= 3.4 -PORTREVISION= 1 +PORTVERSION= 3.5 CATEGORIES= www python -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= http://github.com/GrahamDumpleton/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} PKGNAMESUFFIX= 3 Index: www/mod_wsgi3/distinfo =================================================================== --- www/mod_wsgi3/distinfo (revision 355463) +++ www/mod_wsgi3/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (mod_wsgi-3.4.tar.gz) = ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8 -SIZE (mod_wsgi-3.4.tar.gz) = 122739 +SHA256 (mod_wsgi-3.5.tar.gz) = f0674c38f0f568ece55610bcc6a775c179835c4cba23aa7f876d2a2a8520bf93 +SIZE (mod_wsgi-3.5.tar.gz) = 135875 Index: www/mod_wsgi3/files/patch-configure =================================================================== --- www/mod_wsgi3/files/patch-configure (revision 355463) +++ www/mod_wsgi3/files/patch-configure (working copy) @@ -1,49 +0,0 @@ ---- configure.orig Thu Oct 18 21:12:46 2012 +1100 -+++ configure Thu Oct 18 21:14:28 2012 +1100 -@@ -1785,7 +1785,15 @@ - - PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ -- stdout.write((sysconfig.get_config_var("VERSION")))'` -+ stdout.write(sysconfig.get_config_var("VERSION"))'` -+ -+PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \ -+ from distutils import sysconfig; \ -+ stdout.write(sysconfig.get_config_var("LDVERSION") or "")'` -+ -+if test x"${PYTHON_LDVERSION}" = x""; then -+ PYTHON_LDVERSION=${PYTHON_VERSION} -+fi - - CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ -@@ -1823,12 +1831,28 @@ - from distutils import sysconfig; \ - stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'` - -+if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then -+ PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}" -+fi -+ - if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \ - "${ENABLE_FRAMEWORK}" != "yes"; then - LDFLAGS1="-L${PYTHONLIBDIR}" - LDFLAGS2="-L${PYTHONCFGDIR}" - -- LDLIBS1="-lpython${PYTHON_VERSION}" -+ LDLIBS1="-lpython${PYTHON_LDVERSION}" -+ -+ # MacOS X seems to be broken and doesn't use ABIFLAGS suffix -+ # so add a check to try and work out what we need to do. -+ -+ if test -f "${PYTHONLIBDIR}/libpython${PYTHON_VERSION}.a"; then -+ LDLIBS1="-lpython${PYTHON_VERSION}" -+ fi -+ -+ if test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then -+ LDLIBS1="-lpython${PYTHON_VERSION}" -+ fi -+ - LDLIBS2=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ - stdout.write(sysconfig.get_config_var("LIBS"))'` Index: www/mod_wsgi3/files/patch-configure.ac =================================================================== --- www/mod_wsgi3/files/patch-configure.ac (revision 355463) +++ www/mod_wsgi3/files/patch-configure.ac (working copy) @@ -1,50 +0,0 @@ ---- configure.ac.orig Thu Oct 18 21:12:46 2012 +1100 -+++ configure.ac Thu Oct 18 21:14:28 2012 +1100 -@@ -75,7 +75,15 @@ - - PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ -- stdout.write((sysconfig.get_config_var("VERSION")))'` -+ stdout.write(sysconfig.get_config_var("VERSION"))'` -+ -+PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \ -+ from distutils import sysconfig; \ -+ stdout.write(sysconfig.get_config_var("LDVERSION") or "")'` -+ -+if test x"${PYTHON_LDVERSION}" = x""; then -+ PYTHON_LDVERSION=${PYTHON_VERSION} -+fi - - CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ -@@ -113,12 +121,28 @@ - from distutils import sysconfig; \ - stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'` - -+if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then -+ PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}" -+fi -+ - if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \ - "${ENABLE_FRAMEWORK}" != "yes"; then - LDFLAGS1="-L${PYTHONLIBDIR}" - LDFLAGS2="-L${PYTHONCFGDIR}" - -- LDLIBS1="-lpython${PYTHON_VERSION}" -+ LDLIBS1="-lpython${PYTHON_LDVERSION}" -+ -+ # MacOS X seems to be broken and doesn't use ABIFLAGS suffix -+ # so add a check to try and work out what we need to do. -+ -+ if test -f "${PYTHONLIBDIR}/libpython${PYTHON_VERSION}.a"; then -+ LDLIBS1="-lpython${PYTHON_VERSION}" -+ fi -+ -+ if test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then -+ LDLIBS1="-lpython${PYTHON_VERSION}" -+ fi -+ - LDLIBS2=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ - stdout.write(sysconfig.get_config_var("LIBS"))'` - Index: www/mod_wsgi3/files/patch-mod_wsgi.c =================================================================== --- www/mod_wsgi3/files/patch-mod_wsgi.c (revision 355463) +++ www/mod_wsgi3/files/patch-mod_wsgi.c (working copy) @@ -1,16 +0,0 @@ ---- mod_wsgi.c.orig 2012-08-22 23:10:44.000000000 -0400 -+++ mod_wsgi.c 2013-09-12 06:29:36.718830524 -0400 -@@ -10600,7 +10600,13 @@ - * will add their own input/output filters to the chain. - */ - -+#if AP_MODULE_MAGIC_AT_LEAST(20110619,0) -+ /* For 2.4 a NULL sbh pointer should work. */ -+ sbh = NULL; -+#else -+ /* For 2.2 a dummy sbh pointer is needed. */ - ap_create_sb_handle(&sbh, p, -1, 0); -+#endif - - c = (conn_rec *)apr_pcalloc(p, sizeof(conn_rec)); - --- mod_wsgi3.2014-05-27T054943Z.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405270559.s4R5xPRb015166>