Sun Aug 30 03:08:40 2009 UTC ()
Update ap-python to 2.7.11.

While here,
 * add user-destdir support
 * convert dynamic PLIST to static one
 * share/doc/html was deprecated, install in share/doc directly
 * Remove restriction to python23, and change PKGNAME to allow creating
   python valiant packages.

This release addresses a vulnerability in mod_python's publisher handler
whereby a carefully crafted URL would expose objects that should not be
visible, leading to an information leak. The Common Vulnerabilities and
Exposures project (http://cve.mitre.org/) has assigned the name CAN-2005-0088
to this issue.

Users of the publisher handler are urged to upgrade as soon as possible.


(obache)
diff -r1.23 -r1.24 pkgsrc/www/ap-python/Makefile
diff -r0 -r1.1 pkgsrc/www/ap-python/PLIST
diff -r1.5 -r1.6 pkgsrc/www/ap-python/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/www/ap-python/patches/patch-ad
cvs diff -r1.23 -r1.24 pkgsrc/www/ap-python/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap-python/Attic/Makefile 2009/06/14 22:58:10 1.23
+++ pkgsrc/www/ap-python/Attic/Makefile 2009/08/30 03:08:40 1.24
@@ -1,37 +1,33 @@ @@ -1,37 +1,33 @@
1# $NetBSD: Makefile,v 1.23 2009/06/14 22:58:10 joerg Exp $ 1# $NetBSD: Makefile,v 1.24 2009/08/30 03:08:40 obache Exp $
2# 2#
3 3
4DISTNAME= mod_python-2.7.10 4DISTNAME= mod_python-2.7.11
5PKGNAME= ap13-python-2.7.10 5PKGNAME= ap13-${PYPKGPREFIX}-python-2.7.11
6PKGREVISION= 1 
7CATEGORIES= www 6CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/modpython/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/modpython/}
9EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.modpython.org/ 11HOMEPAGE= http://www.modpython.org/
13COMMENT= Python interpreter embedded into Apache 12COMMENT= Python interpreter embedded into Apache
14 13
15USE_TOOLS+= pax 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17CONFLICTS= ap-python-[0-9]* 16USE_TOOLS+= pax
18 17
19PLIST_SRC= ${WRKDIR}/.PLIST_SRC 18CONFLICTS= ap-python-[0-9]* ap13-python-[0-9]* ap13-py[0-9]*-python-[0-9]*
 19SUPERSEDES= ap13-python-[0-9]*
20 20
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22CONFIGURE_ENV+= PYTHON_BIN=${PYTHONBIN:Q} ac_cv_path_MKDEP= 22CONFIGURE_ENV+= PYTHON_BIN=${PYTHONBIN:Q} ac_cv_path_MKDEP=
23MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} 23
24PYTHON_VERSIONS_ACCEPTED= 23 24INSTALLATION_DIRS= lib/httpd share/doc/ap-mod_python
 25
 26PY_PATCHPLIST= yes
25 27
26post-install: 28post-install:
27 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ap-mod_python 29 cd ${WRKSRC}/doc-html && pax -rwpe . ${DESTDIR}${PREFIX}/share/doc/ap-mod_python
28 cd ${WRKSRC} && pax -rw -s /doc-html/ap-mod_python/ \ 
29 -pe doc-html ${PREFIX}/share/doc/html 
30 ${ECHO} lib/httpd/mod_python.so >${PLIST_SRC} 
31 cd ${PREFIX} && ${FIND} ${PYSITELIB}/mod_python \ 
32 share/doc/html/ap-mod_python \ 
33 -type f -print >>${PLIST_SRC} 
34 30
35.include "../../lang/python/extension.mk" 31.include "../../lang/python/extension.mk"
36.include "../../www/apache/buildlink3.mk" 32.include "../../www/apache/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/www/ap-python/Attic/PLIST
@comment $NetBSD: PLIST,v 1.1 2009/08/30 03:08:40 obache Exp $
lib/httpd/mod_python.so
${PYSITELIB}/mod_python/__init__.py
${PYSITELIB}/mod_python/__init__.pyc
${PYSITELIB}/mod_python/__init__.pyo
${PYSITELIB}/mod_python/apache.py
${PYSITELIB}/mod_python/apache.pyc
${PYSITELIB}/mod_python/apache.pyo
${PYSITELIB}/mod_python/cgihandler.py
${PYSITELIB}/mod_python/cgihandler.pyc
${PYSITELIB}/mod_python/cgihandler.pyo
${PYSITELIB}/mod_python/httpdapi.py
${PYSITELIB}/mod_python/httpdapi.pyc
${PYSITELIB}/mod_python/httpdapi.pyo
${PYSITELIB}/mod_python/publisher.py
${PYSITELIB}/mod_python/publisher.pyc
${PYSITELIB}/mod_python/publisher.pyo
${PYSITELIB}/mod_python/util.py
${PYSITELIB}/mod_python/util.pyc
${PYSITELIB}/mod_python/util.pyo
${PYSITELIB}/mod_python/zhandler.py
${PYSITELIB}/mod_python/zhandler.pyc
${PYSITELIB}/mod_python/zhandler.pyo
share/doc/ap-mod_python/about.html
share/doc/ap-mod_python/app-vnsinst.html
share/doc/ap-mod_python/app-wininst.html
share/doc/ap-mod_python/contents.html
share/doc/ap-mod_python/dir-handlers-ach.html
share/doc/ap-mod_python/dir-handlers-auh.html
share/doc/ap-mod_python/dir-handlers-fuh.html
share/doc/ap-mod_python/dir-handlers-hph.html
share/doc/ap-mod_python/dir-handlers-pch.html
share/doc/ap-mod_python/dir-handlers-ph.html
share/doc/ap-mod_python/dir-handlers-pih.html
share/doc/ap-mod_python/dir-handlers-plh.html
share/doc/ap-mod_python/dir-handlers-prrh.html
share/doc/ap-mod_python/dir-handlers-syn.html
share/doc/ap-mod_python/dir-handlers-th.html
share/doc/ap-mod_python/dir-handlers-tph.html
share/doc/ap-mod_python/dir-handlers.html
share/doc/ap-mod_python/dir-other-epd.html
share/doc/ap-mod_python/dir-other-ipd.html
share/doc/ap-mod_python/dir-other-ipdv.html
share/doc/ap-mod_python/dir-other-par.html
share/doc/ap-mod_python/dir-other-pd.html
share/doc/ap-mod_python/dir-other-phm.html
share/doc/ap-mod_python/dir-other-pi.html
share/doc/ap-mod_python/dir-other-po.html
share/doc/ap-mod_python/dir-other-pomz.html
share/doc/ap-mod_python/dir-other-pp.html
share/doc/ap-mod_python/dir-other.html
share/doc/ap-mod_python/directives.html
share/doc/ap-mod_python/front.html
share/doc/ap-mod_python/genindex.html
share/doc/ap-mod_python/hand-cgi.html
share/doc/ap-mod_python/hand-httpdapy.html
share/doc/ap-mod_python/hand-pub-alg-args.html
share/doc/ap-mod_python/hand-pub-alg-auth.html
share/doc/ap-mod_python/hand-pub-alg-trav.html
share/doc/ap-mod_python/hand-pub-alg.html
share/doc/ap-mod_python/hand-pub-intro.html
share/doc/ap-mod_python/hand-pub.html
share/doc/ap-mod_python/hand-z.html
share/doc/ap-mod_python/handlers.html
share/doc/ap-mod_python/icons/blank.gif
share/doc/ap-mod_python/icons/blank.png
share/doc/ap-mod_python/icons/contents.gif
share/doc/ap-mod_python/icons/contents.png
share/doc/ap-mod_python/icons/icons2
share/doc/ap-mod_python/icons/index.gif
share/doc/ap-mod_python/icons/index.png
share/doc/ap-mod_python/icons/modules.gif
share/doc/ap-mod_python/icons/modules.png
share/doc/ap-mod_python/icons/next.gif
share/doc/ap-mod_python/icons/next.png
share/doc/ap-mod_python/icons/previous.gif
share/doc/ap-mod_python/icons/previous.png
share/doc/ap-mod_python/icons/up.gif
share/doc/ap-mod_python/icons/up.png
share/doc/ap-mod_python/index.html
share/doc/ap-mod_python/inst-apacheconfig.html
share/doc/ap-mod_python/inst-compiling.html
share/doc/ap-mod_python/inst-configure.html
share/doc/ap-mod_python/inst-installing.html
share/doc/ap-mod_python/inst-make.html
share/doc/ap-mod_python/inst-makeinstall.html
share/doc/ap-mod_python/inst-prerequisites.html
share/doc/ap-mod_python/inst-testing.html
share/doc/ap-mod_python/inst-trouble.html
share/doc/ap-mod_python/installation.html
share/doc/ap-mod_python/intr-flexibility.html
share/doc/ap-mod_python/intr-history.html
share/doc/ap-mod_python/intr-performance.html
share/doc/ap-mod_python/introduction.html
share/doc/ap-mod_python/modpython.css
share/doc/ap-mod_python/modpython.html
share/doc/ap-mod_python/modpython2
share/doc/ap-mod_python/module-apache.html
share/doc/ap-mod_python/node58.html
share/doc/ap-mod_python/node74.html
share/doc/ap-mod_python/pyapi-callback.html
share/doc/ap-mod_python/pyapi-debug.html
share/doc/ap-mod_python/pyapi-handler.html
share/doc/ap-mod_python/pyapi-interps.html
share/doc/ap-mod_python/pyapi-mpconn-mem.html
share/doc/ap-mod_python/pyapi-mpconn.html
share/doc/ap-mod_python/pyapi-mprequest-mem.html
share/doc/ap-mod_python/pyapi-mprequest-meth.html
share/doc/ap-mod_python/pyapi-mprequest.html
share/doc/ap-mod_python/pyapi-mpserver.html
share/doc/ap-mod_python/pyapi-mpsrv-mem.html
share/doc/ap-mod_python/pyapi-mpsrv-meth.html
share/doc/ap-mod_python/pyapi-mptable.html
share/doc/ap-mod_python/pyapi-util-fstor-fld.html
share/doc/ap-mod_python/pyapi-util-fstor.html
share/doc/ap-mod_python/pyapi-util-funcs.html
share/doc/ap-mod_python/pyapi-util.html
share/doc/ap-mod_python/pythonapi.html
share/doc/ap-mod_python/tut-more-complicated.html
share/doc/ap-mod_python/tut-overview.html
share/doc/ap-mod_python/tut-pub.html
share/doc/ap-mod_python/tut-what-it-do.html
share/doc/ap-mod_python/tutorial.html
cvs diff -r1.5 -r1.6 pkgsrc/www/ap-python/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ap-python/Attic/distinfo 2008/07/10 14:59:57 1.5
+++ pkgsrc/www/ap-python/Attic/distinfo 2009/08/30 03:08:40 1.6
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.5 2008/07/10 14:59:57 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2009/08/30 03:08:40 obache Exp $
2 2
3SHA1 (mod_python-2.7.10.tgz) = 1fcac8d268d836a7ba2cbdc8c5827f9fdce2b1ca 3SHA1 (mod_python-2.7.11.tgz) = 8c123359f98a7acf077e078226fccdb0ff51c4ce
4RMD160 (mod_python-2.7.10.tgz) = b666f6172f534839bc33b797dd72d89a823d7de3 4RMD160 (mod_python-2.7.11.tgz) = 1b34de01b3fa4bb27bb5a39396a2497db66fabd5
5Size (mod_python-2.7.10.tgz) = 175631 bytes 5Size (mod_python-2.7.11.tgz) = 175763 bytes
6SHA1 (patch-aa) = 43c2f7df1e2ad58cf8d334dde631990bc56ff3e9 6SHA1 (patch-aa) = 43c2f7df1e2ad58cf8d334dde631990bc56ff3e9
7SHA1 (patch-ab) = b79f50bed5ad6bda8f5e6aef111fbc9b9aedf943 7SHA1 (patch-ab) = b79f50bed5ad6bda8f5e6aef111fbc9b9aedf943
8SHA1 (patch-ac) = 1c2a5c1d961e9710561c406b60518fbfef4cb2cb 8SHA1 (patch-ac) = 1c2a5c1d961e9710561c406b60518fbfef4cb2cb
9SHA1 (patch-ad) = 6ce2a424d581ebfc8763543451af566809b979a8 9SHA1 (patch-ad) = a59ed67d803dfa93bd9db58b796b4821fc3b072e
10SHA1 (patch-ae) = 2010c3b1522d61332bee60d052770e5addb115d1 10SHA1 (patch-ae) = 2010c3b1522d61332bee60d052770e5addb115d1
11SHA1 (patch-af) = cd658639b5443ae63185611768b91f167bb06c7d 11SHA1 (patch-af) = cd658639b5443ae63185611768b91f167bb06c7d
12SHA1 (patch-ag) = 0377336cdb8f40429d36277c23070a174a924c5b 12SHA1 (patch-ag) = 0377336cdb8f40429d36277c23070a174a924c5b
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/ap-python/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/www/ap-python/patches/Attic/patch-ad 2002/02/05 21:05:58 1.1.1.1
+++ pkgsrc/www/ap-python/patches/Attic/patch-ad 2009/08/30 03:08:40 1.2
@@ -1,14 +1,30 @@ @@ -1,14 +1,30 @@
1$NetBSD: patch-ad,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $ 1$NetBSD: patch-ad,v 1.2 2009/08/30 03:08:40 obache Exp $
2 2
3--- Makefile.in.orig Wed Dec 6 04:05:37 2000 3--- Makefile.in.orig 2000-12-06 03:05:37.000000000 +0000
4+++ Makefile.in Tue Feb 5 21:30:44 2002 4+++ Makefile.in
5@@ -119,7 +119,8 @@ 5@@ -82,7 +82,7 @@ install_dso: dso
 6 @echo
 7 @echo "Performing DSO installation."
 8 @echo
 9- $(INSTALL) src/mod_python.so $(LIBEXECDIR)
 10+ $(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
 11 @$(MAKE) install_py_lib
 12 @echo
 13 @echo "Now don't forget to edit your main config and add"
 14@@ -114,12 +114,13 @@ install_static: static
 15 @echo
 16
 17 install_py_lib:
 18- $(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
 19+ $(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
 20 @for f in `ls lib/python/mod_python/*.py`; \
6 do \ 21 do \
7 $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \ 22- $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
 23+ $(BSD_INSTALL_DATA) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
8 done 24 done
9- python $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python 25- python $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
10+ ${PYTHONBIN} $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python 26+ @PYTHON_BIN@ $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
11+ ${PYTHONBIN} -O $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python 27+ @PYTHON_BIN@ -O $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
12  28
13 clean: 29 clean:
14 cd src && $(MAKE) clean 30 cd src && $(MAKE) clean