commit: 6e75ab9bbf05de6c9428d849457a36de455ae24c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Jul 5 10:18:38 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Jul 5 10:35:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e75ab9b
www-apache/mod_python: Remove last-rited pkg, #536134 profiles/package.mask | 7 -- www-apache/mod_python/Manifest | 1 - www-apache/mod_python/files/16_mod_python.conf | 33 ------ .../files/mod_python-3.5.0-buildsystem.patch | 35 ------ .../files/mod_python-3.5.0-version.patch | 121 --------------------- www-apache/mod_python/metadata.xml | 21 ---- www-apache/mod_python/mod_python-3.5.0-r1.ebuild | 55 ---------- 7 files changed, 273 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index bc5ab41517b..7066da4f048 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -447,13 +447,6 @@ virtual/ada # Removal in 30 days. Bug #379975. net-dialup/capi4k-utils -# Michał Górny <mgo...@gentoo.org> (05 Jun 2017) -# (on behalf of Treecleaner project) -# Abandoned upstream and downstream. Buggy. Segfaults hard on Python -# upgrades. Use one of the *CGI modules instead. -# Removal in 30 days. Bug #536134. -www-apache/mod_python - # Hans de Graaff <gra...@gentoo.org> (05 Jun 2017) # Bundles obsolete and vulnerable webkit version. # Upstream has stopped development and recommends using diff --git a/www-apache/mod_python/Manifest b/www-apache/mod_python/Manifest deleted file mode 100644 index 5b2f8601a55..00000000000 --- a/www-apache/mod_python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mod_python-3.5.0.tgz 571403 SHA256 0ef09058ed98b41c18d899d8b710a0cce2df2b53c44d877401133b3f28bdca90 SHA512 a8838c807db36bd316e44c43c1b1db6d6565a30d1823664f3d44667f5843274ff5f77a849fcfa226fcfb6d399ef2dd983939ff0f6db8849a3e7d25ceafe0c765 WHIRLPOOL 677db711d64d7519eca27890e865cbf773f97253b0ff97b1192b9b8a89c1427c3906b6ba5fa1fcfe146ee5c5d5afc25c141b80119df3741a80db160b0b7a64c8 diff --git a/www-apache/mod_python/files/16_mod_python.conf b/www-apache/mod_python/files/16_mod_python.conf deleted file mode 100644 index 9fbe3624a00..00000000000 --- a/www-apache/mod_python/files/16_mod_python.conf +++ /dev/null @@ -1,33 +0,0 @@ -<IfDefine PYTHON> -LoadModule python_module modules/mod_python.so - -# Mod_python is a module that embeds the Python language interpreter -# within the server, allowing Apache handlers to be written in Python. - -# This will cause files beneath /home/httpd/htdocs with the extension .spam -# to be handled by the Python script /home/httpd/htdocs/eggs.py -# -#<Directory /home/httpd/htdocs> -# AddHandler python-program .spam -# PythonHandler eggs -#</Directory> - -# This will cause all requests to the /python heirachy of your -# webserver to be handled by the python script /path/to/myhandler.py -# -#<Location /python> -# SetHandler python-program -# PythonPath "sys.path + ['/path/to']" -# PythonHandler myhandler -#</Location> - -# This will cause all requests to the /python heirachy of your -# webserver to be handled by mod_python's Publisher handler -# -#<Location /python> -# SetHandler python-program -# PythonHandler mod_python.publisher -#</Location> -</IfDefine> - -# vim: ts=4 filetype=apache diff --git a/www-apache/mod_python/files/mod_python-3.5.0-buildsystem.patch b/www-apache/mod_python/files/mod_python-3.5.0-buildsystem.patch deleted file mode 100644 index 5941a501685..00000000000 --- a/www-apache/mod_python/files/mod_python-3.5.0-buildsystem.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- mod_python-3.5.0/scripts/Makefile.in -+++ mod_python-3.5.0/scripts/Makefile.in -@@ -26,4 +26,5 @@ - rm -f Makefile - - install: -+ $(INSTALL) -d $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 mod_python $(DESTDIR)$(BINDIR)/mod_python ---- mod_python-3.5.0/dist/Makefile.in -+++ mod_python-3.5.0/dist/Makefile.in -@@ -34,9 +34,9 @@ - install_py_lib: mod_python src - @cd src; $(MAKE) psp_parser.c - if test -z "$(DESTDIR)" ; then \ -- $(PYTHON_BIN) setup.py install --optimize 2 --force ; \ -+ $(PYTHON_BIN) setup.py install --no-compile --force ; \ - else \ -- $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ -+ $(PYTHON_BIN) setup.py install --no-compile --force --root $(DESTDIR) ; \ - fi - - mod_python.so: ---- mod_python-3.5.0/Makefile.in -+++ mod_python-3.5.0/Makefile.in -@@ -31,8 +31,8 @@ - dso: @DSO@ - - do_dso: -- @cd src && $(MAKE) -- @cd dist && $(MAKE) build -+ cd src && $(MAKE) -+ cd dist && $(MAKE) build - @echo - @echo 'Now run sudo make install' - @echo ' (or, if you only want to perform a partial install,' diff --git a/www-apache/mod_python/files/mod_python-3.5.0-version.patch b/www-apache/mod_python/files/mod_python-3.5.0-version.patch deleted file mode 100644 index 3c56c4d5218..00000000000 --- a/www-apache/mod_python/files/mod_python-3.5.0-version.patch +++ /dev/null @@ -1,121 +0,0 @@ -taken from upstream - -https://bugs.gentoo.org/531154 - -From 976a674b42f9647865d40fa417e7a3dc56a16e6e Mon Sep 17 00:00:00 2001 -From: Grisha Trubetskoy <gri...@modpython.org> -Date: Thu, 19 Dec 2013 12:23:18 -0500 -Subject: [PATCH] Fixes for compile without git, correct how git revision hash - is generated (skip it if it's a tag or no git available or we are not working - with a checkin), also fix a bash-dependency (helps on Solaris), and a couple - of cross-platform awk fixes in configure. - ---- - configure.in | 6 +++--- - dist/version.sh | 15 +++++++++++++-- - src/Makefile.in | 14 +++++--------- - src/include/mod_python.h | 1 - - src/include/mod_python.h.in | 1 - - src/include/mp_version.h | 2 -- - 6 files changed, 21 insertions(+), 18 deletions(-) - -diff --git a/dist/version.sh b/dist/version.sh -index 1060b4f..e50000d 100755 ---- a/dist/version.sh -+++ b/dist/version.sh -@@ -5,6 +5,17 @@ MPV_PATH="`dirname $0`/../src/include/mp_version.h" - MAJ=`awk '/MP_VERSION_MAJOR/ {print $3}' $MPV_PATH` - MIN=`awk '/MP_VERSION_MINOR/ {print $3}' $MPV_PATH` - PCH=`awk '/MP_VERSION_PATCH/ {print $3}' $MPV_PATH` --GIT=`git describe --always` - --echo $MAJ.$MIN.$PCH-$GIT -+# if git exists in path -+if type git >/dev/null 2>&1; then -+ # and we are in a checkout -+ if git rev-parse 2>/dev/null; then -+ # but not on a tag (which means this is a release) -+ if test -z "`git log 'HEAD^!' --format=%d 2>/dev/null | grep 'tag: '`"; then -+ # append git revision hash to version -+ GIT="-`git describe --always`" -+ fi -+ fi -+fi -+ -+echo $MAJ.$MIN.$PCH$GIT -diff --git a/src/Makefile.in b/src/Makefile.in -index c3b3fb2..081c954 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -50,7 +50,7 @@ psp_parser.c: psp_parser.l - - dso: mod_python.so - --mod_python.so: $(SRCS) @SOLARIS_HACKS@ -+mod_python.so: $(SRCS) @SOLARIS_HACKS@ - @echo - @echo 'Building mod_python.so.' - @echo -@@ -64,21 +64,17 @@ distclean: clean - rm -f Makefile .depend - - version.c: -- @MP_GIT_SHA=$$(git describe --always); \ -- echo > version.c ; \ -+ @echo > version.c ; \ - echo "/* THIS FILE IS AUTO-GENERATED BY Makefile */" >> version.c ; \ - echo "#include \"mp_version.h\"" >> version.c ; \ -- echo "const char * const mp_git_sha = \"$${MP_GIT_SHA}\";" >> version.c ; \ - echo "const int mp_version_major = MP_VERSION_MAJOR;" >> version.c ; \ - echo "const int mp_version_minor = MP_VERSION_MINOR;" >> version.c ; \ - echo "const int mp_version_patch = MP_VERSION_PATCH;" >> version.c ; \ -- echo "const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) \"-$${MP_GIT_SHA}\";" >> version.c ; \ -- echo "const char * const mp_version_component = \"mod_python/\" MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) \"-$${MP_GIT_SHA}\";" >> version.c -- --# echo "const char * const mp_version_component = \"mod_python/\" #MP_VERSION_MAJOR \".\" #MP_VERSION_MINOR \".\" #MP_VERSION_PATCH \"-$${MP_GIT_SHA}\";" >> version.c -+ echo "const char * const mp_version_string = \"`../dist/version.sh`\";" >> version.c ; \ -+ echo "const char * const mp_version_component = \"mod_python/\" \"`../dist/version.sh`\";" >> version.c - - # this is a hack to help avoid a gcc/solaris problem --# python uses assert() which needs _eprintf(). See -+# python uses assert() which needs _eprintf(). See - # SOLARIS_HACKS above - _eprintf.o: - ar -x `gcc -print-libgcc-file-name` _eprintf.o -diff --git a/src/include/mod_python.h b/src/include/mod_python.h -index 061146b..68a77d4 100644 ---- a/src/include/mod_python.h -+++ b/src/include/mod_python.h -@@ -156,7 +156,6 @@ extern module AP_MODULE_DECLARE_DATA python_module; - #define MUTEX_DIR "/tmp" - - /* version stuff */ --extern const char * const mp_git_sha; - extern const int mp_version_major; - extern const int mp_version_minor; - extern const int mp_version_patch; -diff --git a/src/include/mod_python.h.in b/src/include/mod_python.h.in -index 4b6f1fb..7d536c5 100644 ---- a/src/include/mod_python.h.in -+++ b/src/include/mod_python.h.in -@@ -156,7 +156,6 @@ extern module AP_MODULE_DECLARE_DATA python_module; - #define MUTEX_DIR "@MUTEX_DIR@" - - /* version stuff */ --extern const char * const mp_git_sha; - extern const int mp_version_major; - extern const int mp_version_minor; - extern const int mp_version_patch; -diff --git a/src/include/mp_version.h b/src/include/mp_version.h -index 4b3a494..5ed83a1 100644 ---- a/src/include/mp_version.h -+++ b/src/include/mp_version.h -@@ -10,5 +10,3 @@ - #define MP_VERSION_MINOR 5 - #define MP_VERSION_PATCH 0 - --#define STR(x) #x --#define MP_VERSION_STRING(maj, min, p) STR(maj) "." STR(min) "." STR(p) --- -2.6.2 - diff --git a/www-apache/mod_python/metadata.xml b/www-apache/mod_python/metadata.xml deleted file mode 100644 index 82f1ff2b20e..00000000000 --- a/www-apache/mod_python/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>x...@gentoo.org</email> - <name>Michael Weber</name> - </maintainer> - <longdescription> - Mod_python is an Apache module that embeds the Python interpreter within - the server. With mod_python you can write web-based applications in Python - that will run many times faster than traditional CGI and will have access - to advanced features such as ability to retain database connections and - other data between hits and access to Apache internals. - </longdescription> - <longdescription lang="ja"> - Mod_PythonはウェブサーバーにPythonインタープリタを埋め込むApacheモジュールです。 - Mod_PythonはPython言語のウェブベース・アプリケーションを従来のCGIよりも何倍も高> - 速に走らせることができ、データデータベースのコネクション保持に関するより高度なア - クセス機能やヒット間の他のデータやApache内部へのアクセス機能を持ちます。 - </longdescription> -</pkgmetadata> diff --git a/www-apache/mod_python/mod_python-3.5.0-r1.ebuild b/www-apache/mod_python/mod_python-3.5.0-r1.ebuild deleted file mode 100644 index 72bdffc43e2..00000000000 --- a/www-apache/mod_python/mod_python-3.5.0-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 python3_4 ) - -inherit apache-module eutils python-single-r1 - -DESCRIPTION="An Apache2 module providing an embedded Python interpreter" -HOMEPAGE="http://modpython.org/"; -SRC_URI="http://dist.modpython.org/dist/${P}.tgz"; - -LICENSE="Apache-2.0" -KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86" -IUSE="doc test" -SLOT="0" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -APACHE2_MOD_CONF="16_${PN}" -APACHE2_MOD_DEFINE="PYTHON" -need_apache2 - -RDEPEND="${RDEPEND} - ${PYTHON_DEPS}" -DEPEND="${DEPEND} - test? ( - app-admin/apache-tools - net-misc/curl - )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-buildsystem.patch - epatch "${FILESDIR}"/${P}-version.patch #531154 - - export CFLAGS="$(apxs2 -q CFLAGS)" - export LDFLAGS="$(apxs2 -q LDFLAGS)" -} - -src_compile() { - default -} - -src_test() { - cd test || die - PYTHONPATH="$(ls -d ${S}/dist/build/lib.*)" ${PYTHON} test.py || die -} - -src_install() { - default - - use doc && dohtml -r doc-html/* - - apache-module_src_install -}
