tag 353805 patch
thanks dude
On Mon, May 15, 2006, Mohammed Adnène Trojette wrote:
> python2.2-dev has been removed from the archive (see #362047).
Here is a patch that addresses the issue. But I can't get the package
building from source because of the configure/configure.in files.
I am filing a bug about this just right now.
--
adn
Mohammed Adnène Trojette
diff -u libapache2-mod-python-3.1.3/debian/control
libapache2-mod-python-3.1.3/debian/control
--- libapache2-mod-python-3.1.3/debian/control
+++ libapache2-mod-python-3.1.3/debian/control
@@ -2,7 +2,7 @@
Section: python
Priority: optional
Maintainer: Peter Hawkins <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.16), debconf, autoconf, python, python2.2-dev
(>= 2.2.3), python2.3-dev, apache2-threaded-dev (>= 2.0.50-10)
+Build-Depends: debhelper (>= 4.1.16), debconf, autoconf, python,
python2.3-dev, apache2-threaded-dev (>= 2.0.50-10)
Standards-Version: 3.6.1
Package: libapache2-mod-python
@@ -26,18 +26,6 @@
.
This package contains the module documentation in HTML format.
-Package: libapache2-mod-python2.2
-Architecture: any
-Depends: debconf, ${shlibs:Depends}, apache2-common, apache2
-Suggests: libapache2-mod-python-doc
-Conflicts: libapache2-mod-python2.3, libapache-mod-python,
libapache-mod-python2.1, libapache-mod-python2.2, libapache-mod-python2.3
-Description: An Apache 2 module that embeds Python 2.2 within the server
- mod_python allows you to write web-based applications in Python.
- Because the parser is embedded in the server as an Apache module, it
- will run many times faster than traditional CGI scripts.
- .
- This version of the package is built for Python 2.2.
-
Package: libapache2-mod-python2.3
Architecture: any
Depends: debconf, ${shlibs:Depends}, apache2-common, apache2
diff -u libapache2-mod-python-3.1.3/debian/rules
libapache2-mod-python-3.1.3/debian/rules
--- libapache2-mod-python-3.1.3/debian/rules
+++ libapache2-mod-python-3.1.3/debian/rules
@@ -50,17 +50,6 @@
# Add here commands to install the package into
debian/libapache-mod-python.
#$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python
- # python 2.2
- rm -f config.cache config.status
- export PYTHON_BIN=/usr/bin/python2.2
- -env PYTHON_BIN=/usr/bin/python2.2 \
- ./configure --with-apxs=/usr/bin/apxs2 --prefix=/usr \
- --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
\
- --with-python-version=2.2
- $(MAKE) clean && $(MAKE)
- $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-python2.2
- cp debian/mod_python.load
debian/libapache2-mod-python2.2/etc/apache2/mods-available/
-
# python 2.3
rm -f config.cache config.status
export PYTHON_BIN=/usr/bin/python2.3
@@ -102,7 +91,6 @@
binary-arch: build install
dh_testdir -a
dh_testroot -a
- dh_python -plibapache2-mod-python2.2 /usr/lib/python2.2/site-packages
dh_python -plibapache2-mod-python2.3 /usr/lib/python2.3/site-packages
dh_installdebconf -a
dh_installdocs -a
diff -u libapache2-mod-python-3.1.3/debian/changelog
libapache2-mod-python-3.1.3/debian/changelog
--- libapache2-mod-python-3.1.3/debian/changelog
+++ libapache2-mod-python-3.1.3/debian/changelog
@@ -1,3 +1,14 @@
+libapache2-mod-python (3.1.3-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove all references to removed python2.2 (closes: #353805)
+ + debian/control: Build-Depends, Depends
+ + debian/rules
+ + debian/README.Debian
+ + debian/*python2.2*
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Tue, 16 May 2006 02:13:58
+0200
+
libapache2-mod-python (3.1.3-3) unstable; urgency=high
* Security bug fix for information leak vulnerability CVE CAN-2005-0088.
reverted:
--- libapache2-mod-python-3.1.3/debian/libapache2-mod-python2.2.config
+++ libapache2-mod-python-3.1.3.orig/debian/libapache2-mod-python2.2.config
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library
-. /usr/share/debconf/confmodule
-
-if [ -e /etc/apache2/mods-enabled/mod_python.load ]; then
- db_set libapache2-mod-python/enable_module true
-else
- # We want to enable the module by default during initial configuration
- if [ "$1" = "configure" ] ; then
- db_set libapache2-mod-python/enable_module true
- else
- db_set libapache2-mod-python/enable_module false
- fi
-fi
-
-# Enable the Apache 2 module?
-db_input medium libapache2-mod-python/enable_module || true
-db_go
diff -u libapache2-mod-python-3.1.3/debian/README.Debian
libapache2-mod-python-3.1.3/debian/README.Debian
--- libapache2-mod-python-3.1.3/debian/README.Debian
+++ libapache2-mod-python-3.1.3/debian/README.Debian
@@ -3,7 +3,6 @@
This package has been split into several components:
libapache2-mod-python - dummy package depending on libapache-mod-python2.3
-libapache2-mod-python2.2 - module for python2.2
libapache2-mod-python2.3 - module for python2.3
libapache2-mod-python-doc - documentation for this package (to avoid
duplication of the
~700k uncompressed of docs in the archive).
reverted:
--- libapache2-mod-python-3.1.3/debian/libapache2-mod-python2.2.postrm
+++ libapache2-mod-python-3.1.3.orig/debian/libapache2-mod-python2.2.postrm
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-PY_VERSION=2.2
-
-if [ "$1" = "remove" -o "$1" = "purge" ]; then
- if [ -L /etc/apache2/mods-enabled/mod_python.load ]; then
- rm -f /etc/apache2/mods-enabled/mod_python.load
- fi
-fi
-
-if [ "$1" = "purge" ]; then
- # Source debconf library
- . /usr/share/debconf/confmodule
- # Remove debconf database entries
- db_purge
-fi
-
-#DEBHELPER#
-
-exit 0
reverted:
--- libapache2-mod-python-3.1.3/debian/libapache2-mod-python2.2.templates
+++ libapache2-mod-python-3.1.3.orig/debian/libapache2-mod-python2.2.templates
@@ -1,11 +0,0 @@
-Template: libapache2-mod-python/enable_module
-Type: boolean
-_Description: Enable the Apache 2 mod_python module?
- Should the mod_python module be enabled in your Apache 2 configuration?
- You need to enable the module to use websites written for mod_python.
- .
- If you answer yes to this question, a symbolic link will be made for
- mod_python in /etc/apache2/mods_enabled/. If you answer no, the symbolic
- link will be deleted.
- .
- NB. You will need to restart Apache 2 manually after changing this option.
reverted:
--- libapache2-mod-python-3.1.3/debian/libapache2-mod-python2.2.postinst
+++ libapache2-mod-python-3.1.3.orig/debian/libapache2-mod-python2.2.postinst
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Source debconf library
-. /usr/share/debconf/confmodule
-
-MOD_PYTHON_LOAD=/etc/apache2/mods-enabled/mod_python.load
-
-if [ "$1" = "configure" -o "$1" = "reconfigure" ]; then
- db_get libapache2-mod-python/enable_module
- if [ "$RET" = "true" ]; then
- test ! -e $MOD_PYTHON_LOAD -o -L $MOD_PYTHON_LOAD && ln -sf
../mods-available/mod_python.load $MOD_PYTHON_LOAD
- else
- test -L $MOD_PYTHON_LOAD && rm -f $MOD_PYTHON_LOAD
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
reverted:
--- libapache2-mod-python-3.1.3/debian/libapache2-mod-python2.2.dirs
+++ libapache2-mod-python-3.1.3.orig/debian/libapache2-mod-python2.2.dirs
@@ -1,2 +0,0 @@
-/usr/lib/apache2/modules
-/etc/apache2/mods-available
reverted:
--- libapache2-mod-python-3.1.3/debian/libapache2-mod-python2.2.docs
+++ libapache2-mod-python-3.1.3.orig/debian/libapache2-mod-python2.2.docs
@@ -1,3 +0,0 @@
-debian/README.Debian
-NEWS
-README
