Hello, I have updated the patch of Stefan Huehner for python2.4 and clean some stuff. Everything seems fine with this patch (build and content of the package).
Regards, Arnaud Fontaine
diff -urN libapache-mod-python-2.7.10.old/debian/changelog libapache-mod-python-2.7.10/debian/changelog
--- libapache-mod-python-2.7.10.old/debian/changelog 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/changelog 2006-04-20 01:19:22.000000000 +0200
@@ -1,3 +1,13 @@
+libapache-mod-python (2:2.7.10-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop support for python2.1 and python2.2, add
+ libapache-mod-python2.4. Thanks to Stefan Huehner.
+ Closes: #362473.
+ * Remove useless python depends from libapache-mod-python.
+
+ -- Arnaud Fontaine <[EMAIL PROTECTED]> Thu, 20 Apr 2006 00:54:21 +0200
+
libapache-mod-python (2:2.7.10-4) unstable; urgency=high
* Security bug fix for information leak vulnerability CVE CAN-2005-0088
diff -urN libapache-mod-python-2.7.10.old/debian/control libapache-mod-python-2.7.10/debian/control
--- libapache-mod-python-2.7.10.old/debian/control 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/control 2006-04-20 01:16:17.000000000 +0200
@@ -2,12 +2,12 @@
Section: python
Priority: optional
Maintainer: Peter Hawkins <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), python, python2.1-dev (>= 2.1.3-11), python2.2-dev (>= 2.2.1.91-1), python2.3-dev (>= 2.2.93-1exp1), apache-dev (>= 1.3.22)
+Build-Depends: debhelper (>> 4.0.0), python2.3-dev, python2.4-dev, python-dev (>= 2.2.93-1exp1), apache-dev (>= 1.3.22)
Standards-Version: 3.6.1
Package: libapache-mod-python
Architecture: all
-Depends: libapache-mod-python2.3 (>= ${Source-Version}), python (>= 2.3), python (<< 2.4)
+Depends: libapache-mod-python2.3
Description: An Apache module that embeds Python within the server
Warning: This package use to contain PyApache. It now
contains ModPython. This apache module allows you to
@@ -28,41 +28,28 @@
.
This package contains the module documentation in HTML format.
-Package: libapache-mod-python2.1
-Architecture: any
-Depends: ${shlibs:Depends}, apache-common (>= 1.3.29-1), python2.1
-Suggests: libapache-mod-python-doc
-Conflicts: libapache-mod-python2.2, libapache-mod-python2.3, libapache-mod-python (<< 2:2.7.8-2)
-Replaces: libapache-mod-python (<< 2:2.7.8-2)
-Description: An Apache module that embeds Python 2.1 within the server
- mod_python is an apache module that allows you to
- write web-based applications in Python that will run
- many times faster than traditional CGI.
- .
- This version of the package is built for Python 2.1.
-
-Package: libapache-mod-python2.2
+Package: libapache-mod-python2.3
Architecture: any
-Depends: ${shlibs:Depends}, apache-common (>= 1.3.29-1), python2.2
+Depends: ${python:Depends}, ${shlibs:Depends}, apache-common (>= 1.3.29-1)
Suggests: libapache-mod-python-doc
-Conflicts: libapache-mod-python2.1, libapache-mod-python2.3, libapache-mod-python (<< 2:2.7.8-2)
+Conflicts: libapache-mod-python2.1, libapache-mod-python2.2, libapache-mod-python2.4, libapache-mod-python (<< 2:2.7.8-2)
Replaces: libapache-mod-python (<< 2:2.7.8-2)
-Description: An Apache module that embeds Python 2.2 within the server
+Description: An Apache module that embeds Python 2.3 within the server
mod_python is an apache module that allows you to
write web-based applications in Python that will run
many times faster than traditional CGI.
.
- This version of the package is built for Python 2.2.
+ This version of the package is built for Python 2.3.
-Package: libapache-mod-python2.3
+Package: libapache-mod-python2.4
Architecture: any
-Depends: ${shlibs:Depends}, apache-common (>= 1.3.29-1), python2.3
+Depends: ${python:Depends}, ${shlibs:Depends}, apache-common (>= 1.3.29-1)
Suggests: libapache-mod-python-doc
-Conflicts: libapache-mod-python2.1, libapache-mod-python2.2, libapache-mod-python (<< 2:2.7.8-2)
+Conflicts: libapache-mod-python2.1, libapache-mod-python2.2, libapache-mod-python2.3, libapache-mod-python (<< 2:2.7.8-2)
Replaces: libapache-mod-python (<< 2:2.7.8-2)
-Description: An Apache module that embeds Python 2.3 within the server
+Description: An Apache module that embeds Python 2.4 within the server
mod_python is an apache module that allows you to
write web-based applications in Python that will run
many times faster than traditional CGI.
.
- This version of the package is built for Python 2.3.
+ This version of the package is built for Python 2.4.
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.1.dirs libapache-mod-python-2.7.10/debian/libapache-mod-python2.1.dirs
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.1.dirs 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.1.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/lib/apache/1.3
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.1.docs libapache-mod-python-2.7.10/debian/libapache-mod-python2.1.docs
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.1.docs 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.1.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-debian/README.Debian
-NEWS
-README
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.1.postinst libapache-mod-python-2.7.10/debian/libapache-mod-python2.1.postinst
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.1.postinst 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.1.postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Source debconf library
-. /usr/share/debconf/confmodule
-
-if [ "$1" = "configure" -o "$1" = "reconfigure" ]; then
- for i in apache apache-perl apache-ssl; do
- if [ -e /etc/$i/httpd.conf ]; then
- modules-config $i enable mod_python
- fi
- done
-fi
-
-#DEBHELPER#
-
-exit 0
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.1.prerm libapache-mod-python-2.7.10/debian/libapache-mod-python2.1.prerm
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.1.prerm 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.1.prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" -o "$1" = "purge" ]; then
- for i in apache apache-perl apache-ssl; do
- if [ -e /etc/$i/httpd.conf ]; then
- modules-config $i disable mod_python quiet
- fi
- done
-fi
-
-#DEBHELPER#
-
-exit 0
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.2.dirs libapache-mod-python-2.7.10/debian/libapache-mod-python2.2.dirs
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.2.dirs 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.2.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/lib/apache/1.3
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.2.docs libapache-mod-python-2.7.10/debian/libapache-mod-python2.2.docs
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.2.docs 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.2.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-debian/README.Debian
-NEWS
-README
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.2.postinst libapache-mod-python-2.7.10/debian/libapache-mod-python2.2.postinst
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.2.postinst 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.2.postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Source debconf library
-. /usr/share/debconf/confmodule
-
-if [ "$1" = "configure" -o "$1" = "reconfigure" ]; then
- for i in apache apache-perl apache-ssl; do
- if [ -e /etc/$i/httpd.conf ]; then
- modules-config $i enable mod_python
- fi
- done
-fi
-
-#DEBHELPER#
-
-exit 0
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.2.prerm libapache-mod-python-2.7.10/debian/libapache-mod-python2.2.prerm
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.2.prerm 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.2.prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" -o "$1" = "purge" ]; then
- for i in apache apache-perl apache-ssl; do
- if [ -e /etc/$i/httpd.conf ]; then
- modules-config $i disable mod_python quiet
- fi
- done
-fi
-
-#DEBHELPER#
-
-exit 0
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.4.dirs libapache-mod-python-2.7.10/debian/libapache-mod-python2.4.dirs
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.4.dirs 1970-01-01 01:00:00.000000000 +0100
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.4.dirs 2006-04-20 01:02:58.000000000 +0200
@@ -0,0 +1 @@
+/usr/lib/apache/1.3
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.4.docs libapache-mod-python-2.7.10/debian/libapache-mod-python2.4.docs
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.4.docs 1970-01-01 01:00:00.000000000 +0100
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.4.docs 2006-04-20 01:03:17.000000000 +0200
@@ -0,0 +1,3 @@
+debian/README.Debian
+NEWS
+README
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.4.postinst libapache-mod-python-2.7.10/debian/libapache-mod-python2.4.postinst
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.4.postinst 1970-01-01 01:00:00.000000000 +0100
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.4.postinst 2006-04-20 01:03:29.000000000 +0200
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" -o "$1" = "reconfigure" ]; then
+ for i in apache apache-perl apache-ssl; do
+ if [ -e /etc/$i/httpd.conf ]; then
+ modules-config $i enable mod_python
+ fi
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
diff -urN libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.4.prerm libapache-mod-python-2.7.10/debian/libapache-mod-python2.4.prerm
--- libapache-mod-python-2.7.10.old/debian/libapache-mod-python2.4.prerm 1970-01-01 01:00:00.000000000 +0100
+++ libapache-mod-python-2.7.10/debian/libapache-mod-python2.4.prerm 2006-04-20 01:03:46.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" -o "$1" = "purge" ]; then
+ for i in apache apache-perl apache-ssl; do
+ if [ -e /etc/$i/httpd.conf ]; then
+ modules-config $i disable mod_python quiet
+ fi
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
diff -urN libapache-mod-python-2.7.10.old/debian/rules libapache-mod-python-2.7.10/debian/rules
--- libapache-mod-python-2.7.10.old/debian/rules 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/debian/rules 2006-04-20 00:54:08.000000000 +0200
@@ -48,26 +48,6 @@
# Add here commands to install the package into debian/libapache-mod-python.
#$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python
- # python 2.1
- rm -f config.cache config.status
- export PYTHON_BIN=/usr/bin/python2.1
- -env PYTHON_BIN=/usr/bin/python2.1 \
- ./configure --enable-EAPI --prefix=/usr \
- --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --with-python-version=2.1
- $(MAKE) clean && $(MAKE)
- $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python2.1
-
- # python 2.2
- rm -f config.cache config.status
- export PYTHON_BIN=/usr/bin/python2.2
- -env PYTHON_BIN=/usr/bin/python2.2 \
- ./configure --enable-EAPI --prefix=/usr \
- --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --with-python-version=2.2
- $(MAKE) clean && $(MAKE)
- $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python2.2
-
# python 2.3
rm -f config.cache config.status
export PYTHON_BIN=/usr/bin/python2.3
@@ -78,6 +58,15 @@
$(MAKE) clean && $(MAKE)
$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python2.3
+ # python 2.4
+ rm -f config.cache config.status
+ export PYTHON_BIN=/usr/bin/python2.4
+ -env PYTHON_BIN=/usr/bin/python2.4 \
+ ./configure --enable-EAPI --prefix=/usr \
+ --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+ --with-python-version=2.4
+ $(MAKE) clean && $(MAKE)
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python2.4
# Build architecture-independent files here.
binary-indep: build install
diff -urN libapache-mod-python-2.7.10.old/src/libpython.module libapache-mod-python-2.7.10/src/libpython.module
--- libapache-mod-python-2.7.10.old/src/libpython.module 2006-04-20 01:08:11.000000000 +0200
+++ libapache-mod-python-2.7.10/src/libpython.module 2006-04-20 01:16:29.000000000 +0200
@@ -1,6 +1,6 @@
Name: python_module
ConfigStart
- LIBS="$LIBS -lm /usr/lib/python2.3/config/libpython2.3-pic.a -lpthread -ldl -lutil -lm "
+ LIBS="$LIBS -lm /usr/lib/python2.4/config/libpython2.4-pic.a -lpthread -ldl -lutil -lm "
LDFLAGS=" -Xlinker -export-dynamic "
- INCLUDES="-I/home/peterh/pr/deb/libapache-mod-python-2.7.10/src/include -I/usr/include/apache-1.3 -I/usr/include/python2.3"
+ INCLUDES="-I/tmp/libapache-mod-python-2.7.10/src/include -I/usr/include/apache-1.3 -I/usr/include/python2.4"
ConfigEnd
\ Pas de fin de ligne à la fin du fichier.
pgprtREarDj8N.pgp
Description: PGP signature
