pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/ap-python Update ap-python to 2.7.11.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/57914ca6e2cd
branches:  trunk
changeset: 398414:57914ca6e2cd
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Aug 30 03:08:40 2009 +0000

description:
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.

diffstat:

 www/ap-python/Makefile         |   28 ++++-----
 www/ap-python/PLIST            |  123 +++++++++++++++++++++++++++++++++++++++++
 www/ap-python/distinfo         |   10 +-
 www/ap-python/patches/patch-ad |   30 +++++++--
 4 files changed, 163 insertions(+), 28 deletions(-)

diffs (240 lines):

diff -r 707ed44daa85 -r 57914ca6e2cd www/ap-python/Makefile
--- a/www/ap-python/Makefile    Sun Aug 30 02:21:58 2009 +0000
+++ b/www/ap-python/Makefile    Sun Aug 30 03:08:40 2009 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/06/14 22:58:10 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2009/08/30 03:08:40 obache Exp $
 #
 
-DISTNAME=              mod_python-2.7.10
-PKGNAME=               ap13-python-2.7.10
-PKGREVISION=           1
+DISTNAME=              mod_python-2.7.11
+PKGNAME=               ap13-${PYPKGPREFIX}-python-2.7.11
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/modpython/}
 EXTRACT_SUFX=          .tgz
@@ -12,25 +11,22 @@
 HOMEPAGE=              http://www.modpython.org/
 COMMENT=               Python interpreter embedded into Apache
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    pax
 
-CONFLICTS=     ap-python-[0-9]*
-
-PLIST_SRC=             ${WRKDIR}/.PLIST_SRC
+CONFLICTS=     ap-python-[0-9]* ap13-python-[0-9]* ap13-py[0-9]*-python-[0-9]*
+SUPERSEDES=    ap13-python-[0-9]*
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                PYTHON_BIN=${PYTHONBIN:Q} ac_cv_path_MKDEP=
-MAKE_ENV+=             PYTHONBIN=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED=      23
+
+INSTALLATION_DIRS=     lib/httpd share/doc/ap-mod_python
+
+PY_PATCHPLIST= yes
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ap-mod_python
-       cd ${WRKSRC} && pax -rw -s /doc-html/ap-mod_python/ \
-               -pe doc-html ${PREFIX}/share/doc/html
-       ${ECHO} lib/httpd/mod_python.so >${PLIST_SRC}
-       cd ${PREFIX} && ${FIND} ${PYSITELIB}/mod_python \
-               share/doc/html/ap-mod_python \
-               -type f -print >>${PLIST_SRC}
+       cd ${WRKSRC}/doc-html && pax -rwpe . ${DESTDIR}${PREFIX}/share/doc/ap-mod_python
 
 .include "../../lang/python/extension.mk"
 .include "../../www/apache/buildlink3.mk"
diff -r 707ed44daa85 -r 57914ca6e2cd www/ap-python/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/ap-python/PLIST       Sun Aug 30 03:08:40 2009 +0000
@@ -0,0 +1,123 @@
+@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
diff -r 707ed44daa85 -r 57914ca6e2cd www/ap-python/distinfo
--- a/www/ap-python/distinfo    Sun Aug 30 02:21:58 2009 +0000
+++ b/www/ap-python/distinfo    Sun Aug 30 03:08:40 2009 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2008/07/10 14:59:57 joerg Exp $
+$NetBSD: distinfo,v 1.6 2009/08/30 03:08:40 obache Exp $
 
-SHA1 (mod_python-2.7.10.tgz) = 1fcac8d268d836a7ba2cbdc8c5827f9fdce2b1ca
-RMD160 (mod_python-2.7.10.tgz) = b666f6172f534839bc33b797dd72d89a823d7de3
-Size (mod_python-2.7.10.tgz) = 175631 bytes
+SHA1 (mod_python-2.7.11.tgz) = 8c123359f98a7acf077e078226fccdb0ff51c4ce
+RMD160 (mod_python-2.7.11.tgz) = 1b34de01b3fa4bb27bb5a39396a2497db66fabd5
+Size (mod_python-2.7.11.tgz) = 175763 bytes
 SHA1 (patch-aa) = 43c2f7df1e2ad58cf8d334dde631990bc56ff3e9
 SHA1 (patch-ab) = b79f50bed5ad6bda8f5e6aef111fbc9b9aedf943
 SHA1 (patch-ac) = 1c2a5c1d961e9710561c406b60518fbfef4cb2cb
-SHA1 (patch-ad) = 6ce2a424d581ebfc8763543451af566809b979a8
+SHA1 (patch-ad) = a59ed67d803dfa93bd9db58b796b4821fc3b072e
 SHA1 (patch-ae) = 2010c3b1522d61332bee60d052770e5addb115d1
 SHA1 (patch-af) = cd658639b5443ae63185611768b91f167bb06c7d
 SHA1 (patch-ag) = 0377336cdb8f40429d36277c23070a174a924c5b
diff -r 707ed44daa85 -r 57914ca6e2cd www/ap-python/patches/patch-ad
--- a/www/ap-python/patches/patch-ad    Sun Aug 30 02:21:58 2009 +0000
+++ b/www/ap-python/patches/patch-ad    Sun Aug 30 03:08:40 2009 +0000
@@ -1,14 +1,30 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2009/08/30 03:08:40 obache Exp $
 
---- Makefile.in.orig   Wed Dec  6 04:05:37 2000
-+++ Makefile.in        Tue Feb  5 21:30:44 2002
-@@ -119,7 +119,8 @@
+--- Makefile.in.orig   2000-12-06 03:05:37.000000000 +0000
++++ Makefile.in
+@@ -82,7 +82,7 @@ install_dso: dso
+       @echo
+       @echo "Performing DSO installation."
+       @echo
+-      $(INSTALL) src/mod_python.so $(LIBEXECDIR)
++      $(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
+       @$(MAKE) install_py_lib
+       @echo
+       @echo "Now don't forget to edit your main config and add"
+@@ -114,12 +114,13 @@ install_static:  static
+       @echo
+ 
+ install_py_lib:
+-      $(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
++      $(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
+       @for f in `ls lib/python/mod_python/*.py`; \
        do \
-               $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
+-              $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
++              $(BSD_INSTALL_DATA) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
        done
 -      python $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
-+      ${PYTHONBIN} $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
-+      ${PYTHONBIN} -O $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
++      @PYTHON_BIN@ $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
++      @PYTHON_BIN@ -O $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
  
  clean:
        cd src && $(MAKE) clean



Home | Main Index | Thread Index | Old Index