debian/0000755000000000000000000000000012163271733007173 5ustar debian/control0000644000000000000000000000264512150475040010576 0ustar Source: libapache2-mod-python Section: httpd Priority: optional Maintainer: Debian Python Modules Team Uploaders: Robert S. Edmonds Build-Depends: debhelper (>= 9), dh-autoreconf, python-dev (>= 2.6.6-3~), dh-apache2, apache2-dev (>> 2.4~) X-Python-Version: 2.7 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/libapache2-mod-python/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/libapache2-mod-python/trunk/ Homepage: http://www.modpython.org/ Standards-Version: 3.9.4 Package: libapache2-mod-python Architecture: any Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} Suggests: libapache2-mod-python-doc Description: Python-embedding module for Apache 2 The mod_python module supports web applications written in Python. Because the parser is embedded in the server as an Apache module, it will run much faster than traditional CGI. . This package is built for the current Python version. Package: libapache2-mod-python-doc Architecture: all Depends: ${misc:Depends} Suggests: www-browser Section: doc Description: Python-embedding module for Apache 2 - documentation The mod_python module supports web applications written in Python. Because the parser is embedded in the server as an Apache module, it will run much faster than traditional CGI. . This package contains the module documentation in HTML format. debian/libapache2-mod-python.docs0000644000000000000000000000004111726517743014136 0ustar debian/README.Debian NEWS README debian/rules0000755000000000000000000000045612150443034010247 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 PYTHON=$(shell pyversions -d) %: dh $@ --with autoreconf,python2,apache2 override_dh_auto_configure: dh_auto_configure -- --with-apxs=/usr/bin/apxs2 --with-python=$(PYTHON) override_dh_auto_clean: dh_auto_clean rm -rf $(CURDIR)/src/include/mod_python.h debian/watch0000644000000000000000000000026312150466022010216 0ustar version=3 http://archive.apache.org/dist/httpd/modpython/mod_python-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) # Bart Martens Wed, 26 Dec 2012 19:28:48 +0000 debian/libapache2-mod-python-doc.docs0000644000000000000000000000005311726517075014702 0ustar doc-html/ debian/README.Debian NEWS README debian/changelog0000644000000000000000000004224612163267751011062 0ustar libapache2-mod-python (3.3.1-11) unstable; urgency=low * Team upload. * Upload to unstable. -- Arthur de Jong Fri, 28 Jun 2013 13:13:39 +0200 libapache2-mod-python (3.3.1-10) experimental; urgency=low * Team upload. [ Arthur de Jong ] * Switch to dh_python2 based on the patch in Ubuntu. (Closes: #616858, LP: #788514) * FTBFS: switch configure.in to pkg-config to configure Python. This fixes discovery with multiarch Python. Taken from the Ubuntu packaging (LP: #1098597) (closes: #710640). * Remove version from apache2-threaded-dev build dependency because every version since etch is new enough. * Dropped provides/replaces/conflicts for ancient versions of mod_python. * Switch from dpatch to source format 3.0 (quilt). * Dropped obsolete patch 03_includes.patch: long since been fixed in mod_python. * Switch to dh-style debian/rules. * Switch to debhelper compatibility level 9. * Update 02_makefile.patch to add --install-layout=deb to the setup.py call. * Remove generated file to support building twice in a row. * Simple spelling fix in Python docstring (thanks lintian). * Remove code for renaming mod_python.load to python.load because we are not supporting upgrades from etch. * Update watch file provided by Bart Martens. * Update to Standards-Version 3.9.4. * Build with Apache 2.4 (closes: #666796): - use dh_apache2 (remove postinst and prerm) - 20_apache24.patch: fixes for Apache 2.4. [ Jakub Wilk ] * Use canonical URIs for Vcs-* fields. -- Arthur de Jong Sun, 26 May 2013 23:48:10 +0200 libapache2-mod-python (3.3.1-9) unstable; urgency=low [ Sandro Tosi ] * debian/libapache2-mod-python.{prerm, postrm} - move a2dismod from postrm (executed too late in the purge process) to prerm, so purge can disable the module when it's still available; thanks to Lucas Nussbaum for the report; Closes: #574229 * debian/control - bump Standards-Version to 3.8.4 (no changes needed) - updated Section to 'httpd' to match override file -- Debian Python Modules Team Sat, 27 Mar 2010 14:41:02 +0100 libapache2-mod-python (3.3.1-8) unstable; urgency=medium [ Emilio Pozuelo Monfort ] * Unconditionally enable the Apache module upon first install, instead of asking the user through debconf. Closes: #512755. * Remove debconf templates and build magic because of the above change. [ Sandro Tosi ] * debian/patches/10_bts521965.dpatch - fix a FTBFS due to new apr (> 1.3.x); thanks to Daniel Schepler for the report; Closes: #521965 (RC hence urgency=medium) * debian/control - bump Standards-Version to 3.8.2 (no changes needed) * debian/libapache2-mod-python.postinst - use 'dpkg --compare-versions' -- Debian Python Modules Team Wed, 08 Jul 2009 00:16:42 +0200 libapache2-mod-python (3.3.1-7) unstable; urgency=low [ Sandro Tosi ] * debian/po/pt_BR.po - updated Brazilian Portuguese debconf templates translation; thanks to Eder L. Marques for the report and patch; Closes: #511886 * debian/po/nl.po - updated Dutch debconf templates translation; thanks to Thijs Kinkhorst and Vincent Zweije; for location of translated po file, have a look at http://lists.debian.org/debian-l10n-dutch/2009/01/msg00031.html -- Debian Python Modules Team Fri, 30 Jan 2009 11:26:57 +0100 libapache2-mod-python (3.3.1-6) unstable; urgency=low [ Sandro Tosi ] * debian/control - switch Vcs-Browser field to viewsvn - add ${misc:Depends} to bin packages Depends * debian/po/es.po - updated Spanish debconf translation; thanks to Francisco Javier Cuadrado; Closes: #506982 * debian/libapache2-mod-python.postrm - added 'set -e' -- Debian Python Modules Team Thu, 18 Dec 2008 08:51:47 +0100 libapache2-mod-python (3.3.1-5) unstable; urgency=low [ Sandro Tosi ] * debian/po/eu.po - updated Basque debconf translation; thanks to Xabier Bilbao; Closes: #492409 -- Debian Python Modules Team Mon, 11 Aug 2008 00:00:01 +0200 libapache2-mod-python (3.3.1-4) unstable; urgency=low [ Sandro Tosi ] * debian/control - uniforming Vcs-Browser field - bump Standards-Version to 3.8.0 + added debian/README.source * debian/po/tr.po - added Turkish debconf translation; thanks to Mert Dirik; Closes: #491240 * debian/po/sv.po - updated Swedish debconf translation; thanks to Martin Bagge; Closes: #490788 * debian/po/sk.po - updated Slovak debconf translation; thanks to Ivan Masár; Closes: #483521 * debian/po/gl.po - updated Galician debconf translation; thanks to Jacobo Tarrio; Closes: #480976 * debian/po/vi.po - updated Vietnamese debconf translation; thanks to Clytie Siddall; Closes: #491435 * debian/libapache2-mod-python-doc.doc-base - updated Section to Programming/Python * debian/po/eu.po - added Basque debconf translation; thanks to Xabier Bilbao; Closes: #492043 * debian/patches/{01_configure,02_makefile,03_includes}.dpatch - renamed from .diff - added dpatch header and remove the scripting code [ Norbert Tretkowski ] * Remove myself from uploaders. [ David Paleino ] * Removed myself from Uploaders. [ Piotr Ożarowski ] * Remove myself from uploaders. -- Debian Python Modules Team Thu, 24 Jul 2008 19:41:46 +0200 libapache2-mod-python (3.3.1-3) unstable; urgency=low [ Piotr Ożarowski ] * Rename mod_python.load to python.load (to follow /etc/apache2/mods-available best practise, closes: 456917) * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now) * Added initial Slovak debconf translation from Ivan Masár (closes: #438584) * Updated Vietnamese debconf translation from Clytie Siddall (closes: #453622) * Define debhelper's compatibility mode in debian/compat instead of debian/rules (to make lintian happy) * Change libapache2-mod-python-doc's section to "doc" * Bump Standards-Version to 3.7.3 (no changes needed) [ David Paleino ] * debian/po/it.po updated (closes: #451608) * debian/control: - added myself to Uploaders - added Homepage field - wrapped Uploaders, Build-Depends and Conflicts fields * debian/rules: - don't ignore the value of $(MAKE) distclean - removed useless commented dh_* calls - some minor changes [ Christian Perrier ] * Debconf templates and debian/control reviewed by the debian-l10n-english team as part of the Smith review project. Closes: #450417 * [Debconf translation updates] * Japanese. Closes: #450900 * Portuguese. Closes: #451020 * Finnish. Closes: #451148 * Italian. Closes: #451608 * German. Closes: #451881 * French. Closes: #452636 * Russian. Closes: #434229, #452735 * Polish. Closes: #452960 * Czech. Closes: #453030 -- Piotr Ożarowski Thu, 27 Dec 2007 17:06:19 +0100 libapache2-mod-python (3.3.1-2) unstable; urgency=low [ Norbert Tretkowski ] * Added Piotr Ożarowski as uploader. [ Robert S. Edmonds ] * Add updated po-debconf templates. (closes: #421528, #427030) -- Robert S. Edmonds Fri, 15 Jun 2007 21:40:28 -0400 libapache2-mod-python (3.3.1-1) unstable; urgency=low * New upstream release * Remove configure and mod_python.h files in clean rule to make the diff.gz file smaller * Current Python version in libapache2-mod-pythonX.Y package name (Provides: field) filled in automatically. * Added XS-Vcs-Browser field -- Piotr Ożarowski Thu, 12 Apr 2007 20:52:05 +0200 libapache2-mod-python (3.2.10-4) unstable; urgency=low * Added XS-Vcs-Svn field * Removed "db_purge" part from libapache2-mod-python.postrm (dh_installdebconf is generating a rule that will not fail if debconf is already removed) * Added initial Spanish debconf translation from Manuel Porras Peralta. (closes: #411235) * Added initial Portuguese debconf translation from Pedro Ribeiro. (closes: #411742) * Added initial Galician debconf translation from Jacobo Tarrio. (closes: #411831) -- Piotr Ozarowski Wed, 21 Feb 2007 18:24:29 +0100 libapache2-mod-python (3.2.10-3) unstable; urgency=medium [ Piotr Ozarowski ] * Rebuild for Python 2.4.4. (closes: #398680) * Removed libapache2-mod-python2.3 from Provides. (closes: #393927) * Added initial German debconf translation from Matthias Julius. (closes: #394949) * Removed no longer needed debian/pycompat file. -- Norbert Tretkowski Sun, 19 Nov 2006 22:08:41 +0100 libapache2-mod-python (3.2.10-2) unstable; urgency=medium [ Piotr Ozarowski ] * Dependencies updated: + replaced apache2-common with apache2.2-common (closes: #391790) + bumped apache2-threaded-dev version (see above), + bumped python-central version (dh_python removed from debian/rules), + bumped debhelper version (see above), + added po-debconf to Build-Depends (lintian error). * Removed deprecated dh_installmanpages from debian/rules (there are no manpages to install). * Updated Dutch debconf translation from Vincent Zweije. (closes: #388834) * Updated Czech debconf translation from Miroslav Kure. (closes: #384752) * Updated Japanese debconf translation from Hideki Yamane. (closes: #391811) -- Norbert Tretkowski Thu, 12 Oct 2006 17:14:47 +0200 libapache2-mod-python (3.2.10-1) unstable; urgency=low * New upstream release. * Updated 01_configure.diff patches for new release. * Updated Standards-Version to 3.7.2.1, no changes required. -- Norbert Tretkowski Sat, 19 Aug 2006 10:58:20 +0200 libapache2-mod-python (3.2.8-3) unstable; urgency=low [ Jeremie Corbier ] * New python policy transition. (closes: #373561) * Added initial dutch debconf translation from Vincent Zweije. (closes: #368649) * Updated french debconf translation from Jean-Luc Coulon. (closes: #376547) * Updated italian debconf translation from Luca Monducci. (closes: #382088) [ Piotr Ozarowski ] * Added initial polish debconf translation. -- Norbert Tretkowski Fri, 18 Aug 2006 12:41:39 +0200 libapache2-mod-python (3.2.8-2) unstable; urgency=medium [ Norbert Tretkowski ] * Added initial italian debconf translation from Luca Monducci. (closes: #368342) * Acknowledge Non-Maintainer Upload 3.1.3-2.1. (closes: #266188) [ Robert S. Edmonds ] * Patching the generated configure script is wrong and unnecessary. (closes: #370234, #375582) [ Piotr Ozarowski ] * Added watch file. -- Norbert Tretkowski Sun, 30 Jul 2006 11:02:27 +0200 libapache2-mod-python (3.2.8-1) unstable; urgency=low * New upstream release. (closes: #360654) + Correctly support the HEAD method. (closes: #297289) + Correctly recognizes DirectoryIndex instruction. (closes: #358750) + Fixes segfaults with apache2-mpm-worker. (closes: #365302) [ Robert S. Edmonds ] * Added python2.4 packages. (closes: #347219) * Backported bash 3.1 configure script fix from upstream. (closes: #367450) [ Norbert Tretkowski ] * Set Maintainer to Debian Python Modules Team. * Added Robert and myself to uploaders. * Removed python2.2 packages. (closes: #353805, #362474) * Depend on debconf | debconf-2.0. (closes: #331996) * Updated french debconf translation from Jean-Luc Coulon. (closes: #287245) * Added initial vietnamese debconf translation from Clytie Siddall. (closes: #312233) * Added initial brazilian portuguese debconf translation from Andre Luis Lopes. (closes: #262564) * Added initial czech debconf translation from Miroslav Kure. (closes: #289510) * Added initial swedish debconf translation from Daniel Nylander. (closes: #333404) * Fixed typo in all debconf translations. (closes: #316296) * Added doc-base file from Paul Brossier. (closes: #331012) * Run debconf-updatepo in clean target. * Adjusted README.Debian to it reflects the new packages. * Updated standards-version to 3.7.2.0, no changes required. * Splitted out patches and used dpatch instead. * Fixed debconf templates to make lintian happy. -- Norbert Tretkowski Tue, 16 May 2006 18:45:41 -0500 libapache2-mod-python (3.1.3-3) unstable; urgency=high * Security bug fix for information leak vulnerability CVE CAN-2005-0088. -- Peter Hawkins Fri, 11 Feb 2005 22:23:27 +1100 libapache2-mod-python (3.1.3-2.2) unstable; urgency=high * NMU, reverting the LFS transition made in the previous upload * Bump apache2 build-dep to (>= 2.0.50-10) -- Adam Conrad Sat, 21 Aug 2004 05:51:54 -0600 libapache2-mod-python (3.1.3-2.1) unstable; urgency=medium * NMU for apache2 LFS transition (closes: #266188) * Bump apache2-threaded-dev build-dep to (>= 2.0.50-9) -- Adam Conrad Tue, 17 Aug 2004 08:16:34 -0600 libapache2-mod-python (3.1.3-2) unstable; urgency=low * Added python to the build dependencies. (closes: #259327) * Added dependency on apache2 for libapache2-mod-python2.[23]. (closes: #252403) * Added French and Japanese debconf translations. (closes: #243656, #258787) -- Peter Hawkins Wed, 14 Jul 2004 17:01:04 +1000 libapache2-mod-python (3.1.3-1) unstable; urgency=low * New upstream release (closes: #236889, #241320) * debian/*.templates, debian/control: Updated package to make it compatible with po2debconf. -- Peter Hawkins Thu, 1 Apr 2004 21:54:32 +1000 libapache2-mod-python (3.0.4-2) unstable; urgency=low * debian/control: Change apache2-dev build dependency to apache2-threaded-dev, since apache2-dev became a virtual package. (closes: #225179) -- Peter Hawkins Sun, 28 Dec 2003 10:30:39 +1100 libapache2-mod-python (3.0.4-1) unstable; urgency=low * New upstream version, which fixes segmentation faults on empty query string components when using the publisher handler. * debian/rules: Build binary-all packages in the binary-indep target, not in binary-arch (closes: #214267) -- Peter Hawkins Thu, 13 Nov 2003 16:50:23 +1100 libapache2-mod-python (3.0.3-3) unstable; urgency=medium * Fixed autoconf invocation from debian/rules. -- Peter Hawkins Sun, 5 Oct 2003 13:29:10 +1000 libapache2-mod-python (3.0.3-2) unstable; urgency=medium * Acknowledge NMUs (closes: #208278, #206197, #206661). * Update standards version to 3.6.1 * Removed build dependency on apache2. -- Peter Hawkins Sat, 4 Oct 2003 10:58:18 +1000 libapache2-mod-python (3.0.3-1.2) unstable; urgency=low * NMU. * Add build dependency on python2.3-dev (closes: #208278). -- Matthias Klose Mon, 1 Sep 2003 23:38:03 +0200 libapache2-mod-python (3.0.3-1.1) unstable; urgency=low * NMU. * Build libapache2-mod-python2.3 package (closes: #206197, #206661). -- Matthias Klose Tue, 26 Aug 2003 07:20:27 +0200 libapache2-mod-python (3.0.3-1) unstable; urgency=low * New upstream release. (closes: #190906) * Added debconf support for enabling/disabling the apache module. * debian/control: Updated standards version to 3.5.10. * debian/rules: Now we use apxs2 from a recent apache2-dev correctly, so the package builds again. (closes: #193362) * debian/control: Fixed typo in conflicts line for libapache2-mod-python2.2. -- Peter Hawkins Thu, 29 May 2003 15:57:36 +1000 libapache2-mod-python (3.0.1-2) unstable; urgency=low * Changed description field so that it no longer mentions PyApache, which was an obsolete reference (closes: #171668) * libapache-mod-python now has a versioned dependency on libapache-mod-python2.2 * Fixed postinst and prerm scripts so they don't stomp on the /etc/apache2/mods-available symlink. * Changed standards version to 3.5.8 -- Peter Hawkins Thu, 5 Dec 2002 17:35:45 +1100 libapache2-mod-python (3.0.1-1) unstable; urgency=low * New upstream release 3.0.1. Uploaded package to unstable. -- Peter Hawkins Wed, 27 Nov 2002 17:31:48 +1100 libapache2-mod-python (2.9.999.4-1) unstable; urgency=low * New upstream release 3.0.0 beta 4. -- Peter Hawkins Thu, 31 Oct 2002 09:23:58 +1100 libapache2-mod-python (2.9.999.3-3) unstable; urgency=low * Patch from upstream to fix segfault in table_dealloc. -- Peter Hawkins Wed, 30 Oct 2002 10:36:16 +1100 libapache2-mod-python (2.9.999.3-2) unstable; urgency=low * Fixed postrm scripts. -- Peter Hawkins Sun, 20 Oct 2002 10:50:02 +1000 libapache2-mod-python (2.9.999.3-1) unstable; urgency=low * Updated package to mod_python 3.0.0 beta 3. * Fixed a few bugs in Makefiles and package scripts. -- Peter Hawkins Wed, 16 Oct 2002 10:55:41 +1000 libapache2-mod-python (2.9.999.2-1) unstable; urgency=low * Initial package of mod_python 3.0.0 beta 2. -- Peter Hawkins Sun, 13 Oct 2002 13:20:16 +1000 debian/python.load0000644000000000000000000000010012150421042011326 0ustar LoadModule python_module /usr/lib/apache2/modules/mod_python.so debian/compat0000644000000000000000000000000212150420054010355 0ustar 9 debian/README.Debian0000644000000000000000000000071011724505177011236 0ustar libapache2-mod-python for Debian ------------------------------- This package has been split into several components: libapache2-mod-python - module for currently supported python version libapache2-mod-python-doc - documentation for this package (to avoid duplication of the ~700k uncompressed of docs in the archive). The HTML documentation can now be found at: /usr/share/doc/libapache2-mod-python-doc/doc-html/ -- Peter Hawkins debian/libapache2-mod-python-doc.doc-base0000644000000000000000000000120611724505177015426 0ustar Document: libapache2-mod-python-doc Title: Apache Mod_python Manual Author: Gregory Trubetskoy Abstract: Mod_python allows embedding Python within the Apache server for a considerable boost in performance and added flexibility in designing web based applications. . This document aims to be the only necessary and authoritative source of information about mod_python, usable as a comprehensive reference, a user guide and a tutorial all-in-one. Section: Programming/Python Format: HTML Index: /usr/share/doc/libapache2-mod-python-doc/doc-html/index.html Files: /usr/share/doc/libapache2-mod-python-doc/doc-html/*.html debian/source/0000755000000000000000000000000012163271617010474 5ustar debian/source/format0000644000000000000000000000001412150413633011672 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000012163271617010623 5ustar debian/patches/20_apache24.patch0000644000000000000000000000752412150501263013531 0ustar Description: Changes to build with Apache 2.4 This is a patch of minimal changes to compile mod_python with Apace 2.4. Changes mostly based around: http://httpd.apache.org/docs/2.4/developer/new_api_2_4.html . This does not change any internal properties that mod_python exposes (e.g. it still exposes remote_ip while Apache internally now uses client_ip). . This currently breaks the Request.requires() Python method which will now always return an empty tuple because the function was not rewritten to not use ap_requires() which is no longer available. The above API changes document contains some pointers on what should be done. Author: Arthur de Jong Bug-Debian: http://bugs.debian.org/666796 --- a/src/mod_python.c +++ b/src/mod_python.c @@ -561,8 +561,8 @@ static apr_status_t init_mutexes(server_ #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE) if (!geteuid()) { - chown(fname, unixd_config.user_id, -1); - unixd_set_global_mutex_perms(mutex[n]); + chown(fname, ap_unixd_config.user_id, -1); + ap_unixd_set_global_mutex_perms(mutex[n]); } #endif } --- a/src/serverobject.c +++ b/src/serverobject.c @@ -191,7 +191,7 @@ static struct PyMemberDef server_rec_mbr {"server_hostname", T_STRING, OFF(server_hostname)}, {"port", T_SHORT, OFF(port)}, {"error_fname", T_STRING, OFF(error_fname)}, - {"loglevel", T_INT, OFF(loglevel)}, + {"loglevel", T_INT, OFF(log.level)}, {"is_virtual", T_INT, OFF(is_virtual)}, /* XXX implement module_config ? */ /* XXX implement lookup_defaults ? */ @@ -288,7 +288,9 @@ static PyObject *getmakeobj(serverobject static PyObject *my_generation(serverobject *self, void *objname) { - return PyInt_FromLong((long)ap_my_generation); + int mpm_generation = 0; + ap_mpm_query(AP_MPMQ_GENERATION, &mpm_generation); + return PyInt_FromLong((long)mpm_generation); } static PyObject *restart_time(serverobject *self, void *objname) --- a/src/connobject.c +++ b/src/connobject.c @@ -287,7 +287,7 @@ static struct memberlist conn_memberlist /* XXX client_socket? */ {"local_addr", T_OBJECT, 0, RO}, {"remote_addr", T_OBJECT, 0, RO}, - {"remote_ip", T_STRING, OFF(remote_ip), RO}, + {"remote_ip", T_STRING, OFF(client_ip), RO}, {"remote_host", T_STRING, OFF(remote_host), RO}, {"remote_logname", T_STRING, OFF(remote_logname), RO}, {"aborted", T_INT, 0, RO}, @@ -415,7 +415,7 @@ static PyObject * conn_getattr(connobjec return makesockaddr(self->conn->local_addr); } else if (strcmp(name, "remote_addr") == 0) { - return makesockaddr(self->conn->remote_addr); + return makesockaddr(self->conn->client_addr); } else if (strcmp(name, "notes") == 0) { Py_INCREF(self->notes); --- a/src/requestobject.c +++ b/src/requestobject.c @@ -1222,7 +1222,11 @@ static PyObject *req_register_cleanup(re static PyObject * req_requires(requestobject *self) { + /* Because we don't have an idea how to do this with Apache 2.4 + just return an empty result for now. */ + return Py_BuildValue("()"); +#ifdef COMMENTED_OUT_BECAUSE_NOT_WORKING_WITH_APACHE_24 /* This function returns everything specified after the "requires" as is, without any attempts to parse/organize because "requires" args only need to be grokable by mod_auth if it is @@ -1257,6 +1261,7 @@ static PyObject * req_requires(requestob _PyTuple_Resize(&result, ti); return result; +#endif /* COMMENTED_OUT_BECAUSE_NOT_WORKING_WITH_APACHE_24 */ } /** debian/patches/01_configure.patch0000644000000000000000000000313012150435024014110 0ustar Description: Patch configure script. Remove apache version check for debian package, since we don't want to build-depend on apache2. Author: Robert S. Edmonds --- a/configure.in +++ b/configure.in @@ -107,15 +107,17 @@ else ALL="dso" # check Apache version - AC_MSG_CHECKING(Apache version) - HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`" - ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'` - AC_MSG_RESULT($ver) +# peterh: Remove apache version check for debian package, since we don't +# want to build-depend on apache2. +# AC_MSG_CHECKING(Apache version) +# HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`" +# ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'` +# AC_MSG_RESULT($ver) # make sure version begins with 2 - if test -z "`echo $ver | egrep \^2`"; then - AC_MSG_ERROR([This version of mod_python only works with Apache 2. The one you have seems to be $ver.]) - fi +# if test -z "`echo $ver | egrep \^2`"; then +# AC_MSG_ERROR([This version of mod_python only works with Apache 2. The one you have seems to be $ver.]) +# fi # determine LIBEXEC AC_MSG_CHECKING(for Apache libexec directory) @@ -287,7 +289,7 @@ MOD_PYTHON_SO="`pwd`/src/mod_python.so" # get the mod_python version AC_SUBST(MP_VERSION) MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h` -MP_VERSION=`echo $MP_VERSION | sed 's/["]//g'` +MP_VERSION=`echo $MP_VERSION | sed 's/"//g'` # get --with-python-src. The python src is required to generate the documentation # It is not required to compile or install mod_python itself debian/patches/10_bts521965.patch0000644000000000000000000000106012150435033013413 0ustar Description: fix a FTBFS due to new apr > 1.3.x (bb is the bucket brigade) Origin: http://www.modpython.org/pipermail/mod_python/2008-October/025724.html Bug-Debian: http://bugs.debian.org/521965 --- a/src/connobject.c +++ b/src/connobject.c @@ -139,7 +139,7 @@ static PyObject * _conn_read(conn_rec *c bytes_read = 0; while ((bytes_read < len || len == 0) && - !(b == APR_BRIGADE_SENTINEL(b) || + !(b == APR_BRIGADE_SENTINEL(bb) || APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) { const char *data; debian/patches/series0000644000000000000000000000020312150455546012034 0ustar 01_configure.patch 02_makefile.patch 04_autoconf_python_multiarch.patch 05_fix_spelling.patch 10_bts521965.patch 20_apache24.patch debian/patches/02_makefile.patch0000644000000000000000000000076312150435027013721 0ustar Description: Patch makefile to issue correct setup.py call. Author: Peter Hawkins --- a/dist/Makefile.in +++ b/dist/Makefile.in @@ -36,7 +36,7 @@ install_py_lib: mod_python src if test -z "$(DESTDIR)" ; then \ $(PYTHON_BIN) setup.py install --optimize 2 --force ; \ else \ - $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ + $(PYTHON_BIN) setup.py install --install-layout=deb --force --root $(DESTDIR) --no-compile ; \ fi mod_python.so: debian/patches/05_fix_spelling.patch0000644000000000000000000000231212150455546014632 0ustar Description: Simple spelling fix in Python docstring (thanks lintian) Author: Arthur de Jong --- a/src/requestobject.c +++ b/src/requestobject.c @@ -1924,7 +1924,7 @@ static PyGetSetDef request_getsets[] = { {"unparsed_uri", (getter)getreq_recmbr, NULL, "The URI without any parsing performed", "unparsed_uri"}, {"uri", (getter)getreq_recmbr, (setter)setreq_recmbr, "The path portion of URI", "uri"}, {"filename", (getter)getreq_recmbr, (setter)setreq_recmbr, "The file name on disk that this request corresponds to", "filename"}, - {"canonical_filename", (getter)getreq_recmbr, (setter)setreq_recmbr, "The true filename (req.filename is canonicalized if they dont match)", "canonical_filename"}, + {"canonical_filename", (getter)getreq_recmbr, (setter)setreq_recmbr, "The true filename (req.filename is canonicalized if they don't match)", "canonical_filename"}, {"path_info", (getter)getreq_recmbr, (setter)setreq_recmbr, "Path_info, if any", "path_info"}, {"args", (getter)getreq_recmbr, (setter)setreq_recmbr, "QUERY_ARGS, if any", "args"}, {"finfo", (getter)getreq_rec_fi, (setter)setreq_recmbr, "File information", "finfo"}, debian/patches/04_autoconf_python_multiarch.patch0000644000000000000000000000540212150435031017423 0ustar Description: Drop custom Python detection and use pkg-config instead. Drop custom Python detection and use pkg-config instead. This fixes FTBFS due to multiarch include paths. Not sure if this should be fowrarded or not (see https://lists.ubuntu.com/archives/ubuntu-devel/2013-January/036291.html) Author: Robie Basak Bug-Ubuntu: https://launchpad.net/bugs/1098597 Forwarded: no --- a/configure.in +++ b/configure.in @@ -223,39 +223,9 @@ AC_MSG_RESULT($PY_STD_LIB) # set python std library variable AC_SUBST(LIBS) -PyLIBP=${PY_STD_LIB} -PyLIBPL=${PyLIBP}/config -PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a -PyLIBS=`grep "^LIB[[SMC]]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` -PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` -PyFRAMEWORK=`grep "^PYTHONFRAMEWORK=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` -PyFRAMEWORKDIR=`grep "^PYTHONFRAMEWORKDIR=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' ' | awk '{print $1}'` - -save_LDFLAGS="$LDFLAGS" -save_LIBS="$LIBS" -if test "$PyFRAMEWORKDIR" != "no-framework"; then - if test -n "$PyFRAMEWORK"; then - PyPYTHONLIBS="-framework $PyFRAMEWORK" - LDFLAGS="${LDFLAGS} -Wl,-framework,Python" - fi -else - LDFLAGS="${LDFLAGS} -L${PyLIBPL}" - AC_CHECK_LIB(python${PyVERSION}, Py_NewInterpreter, - [ PyPYTHONLIBS="-lpython${PyVERSION}" ], - [ LDFLAGS="$save_LDFLAGS" - if test -f ${PyLIBPL}/libpython${PyVERSION}.a; then - PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a - else - AC_ERROR(Can not link to python) - fi - ], - [ ${PyLIBS} ${PyMODLIBS} ] ) -fi -LIBS="$save_LIBS" - # (actually this check already just happened above) AC_MSG_CHECKING(what libraries Python was linked with) -PY_LIBS="${PyPYTHONLIBS} ${PyLIBS} ${PyMODLIBS}" +PY_LIBS=`${PYTHON_BIN}-config --libs` ## XXX this is a small work around for a weird RedHat problem ## erase -lieee from library list @@ -268,15 +238,13 @@ AC_MSG_RESULT($PY_LIBS) AC_MSG_CHECKING(linker flags used to link Python) AC_SUBST(LDFLAGS) -PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` -PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` -LDFLAGS="${LDFLAGS} ${PyLFS} ${PyLDFLAGS}" +PY_LDFLAGS=`${PYTHON_BIN}-config --ldflags` LDFLAGS="${LDFLAGS} ${PY_LDFLAGS}" AC_MSG_RESULT($PY_LDFLAGS) AC_MSG_CHECKING(where Python include files are) AC_SUBST(INCLUDES) -PY_INCLUDES="-I${PyEXEC_INSTALLDIR}/include/python${PyVERSION}" +PY_INCLUDES=`${PYTHON_BIN}-config --includes` INCLUDES="${INCLUDES} ${AP_INCLUDES} ${PY_INCLUDES}" AC_MSG_RESULT($PY_INCLUDES) debian/copyright0000644000000000000000000000702711724505177011140 0ustar This package was debianized by Peter Hawkins on Wed Nov 27 22:20:47 EST 2002. It's currently maintained by Robert S. Edmonds and Norbert Tretkowski . It was downloaded from: http://www.apache.org/dist/httpd/modpython/ Upstream Author: Gregory Trubetskoy Copyright: /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2000-2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", * "mod_python", or "modpython", nor may these terms appear in their * name, without prior written permission of the Apache Software * Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . * * Originally developed by Gregory Trubetskoy. * * * This software is based on the original concept as published in the * book "Internet Programming with Python" by Aaron Watters, Guido van * Rossum and James C. Ahlstrom, 1996 M&T Books, ISBN: 1-55851-484-8. * The book and original software is Copyright 1996 by M&T Books. * * This software consists of an extension to the Apache http server. * More information about Apache may be found at: * * http://www.apache.org/ * * More information on Python language can be found at: * * http://www.python.org/ * */ debian/libapache2-mod-python.apache20000644000000000000000000000011412150434626014500 0ustar mod debian/tmp/usr/lib/apache2/modules/mod_python.so mod debian/python.load debian/libapache2-mod-python.install0000644000000000000000000000002112150421136014630 0ustar usr/lib/python2*