[Python-modules-commits] r6444 - in packages/mod-wsgi/branches/backports.org/debian (8 files)
bzed at users.alioth.debian.org
bzed at users.alioth.debian.org
Wed Sep 3 23:37:14 UTC 2008
Date: Wednesday, September 3, 2008 @ 23:37:12
Author: bzed
Revision: 6444
* Rebuild for etch-backports.
* New upstream release (Closes: #496067). This upload covers the changes of
mod-wsgi 2.2 and 2.3.
mod-wsgi 2.2 is mainly bugfix-releases. The only exception is a backport
of one function from 3.0 which allows the setting of process names on *BSD
- this does not affect Linux.
mod-wsgi 2.3 fixes regressions which were introduced in 2.2.
Here follows a list of the bugfixes in 2.2:
1. Fix bug whereby if mod_python is loaded at same time as mod_wsgi the
WSGIImportScript directive can cause Apache child processes to crash.
For details see: http://code.google.com/p/modwsgi/issues/detail?id=91
2. Fix bug where mod_wsgi daemon process startup could fail due to old
stale UNIX listener socket file as described in:
http://code.google.com/p/modwsgi/issues/detail?id=77
3. Fix bug where listener socket file descriptors for daemon processes
were being leaked in Apache parent process on a graceful restart.
Also fixes problem where UNIX listener socket was left in filesystem
on both graceful restart and graceful shutdown. For details see:
http://code.google.com/p/modwsgi/issues/detail?id=95
4. Fix bug where response was truncated when a null character appeared
as first character in block of data being returned from
wsgi.file_wrapper.
Only occurred when code fell back to using iteration over supplied
file like object, rather than optimised method such as sendfile().
http://code.google.com/p/modwsgi/issues/detail?id=100
The following regressions/bugs of 2.2 were fixed in 2.3:
1. Fixed problem introduced in version 2.2 of mod_wsgi whereby use of
daemon mode would cause CGI scripts to fail. It is quite possible
that the bug could also have caused failures with other Apache
modules that relied on registering of cleanup functions against
Apache configuration memory pool.
2. (does not affect Linux)
When using setproctitle() on BSD systems, first argument should be
a printf style format string with values to fill out per format as
additional arguments. Code was supplying value to be displayed as
format string which meant that if it contained any printf type format
sequences, could cause process to crash as corresponding arguments
wouldn't have ben provided.
* Calling pyversions in postinst requires that 'python' is installed *and*
configured, so it would need to be added to Pre-Depends. As this is kinda
ugly, we ship the symlink to the module for the right Python version now
in the package. I assume that this will really fix #483197 now, I'm quite
sure that the broken link results from an error message of the
unconfigured python/pyversions. Shipping the symlink also makes sure that
it is available while Apache is configured (which may happen before
mod-wsgi is configured). (Closes: #483197, #491478)
* Drop the parts from the maintainer scripts which renamed the wsgi config
files (see #456737 for details) - as mod-wsgi was not released with Etch
and the fix was for a long enough time in testing, it should be safe to
remove them before Lenny.
* New upstream release.
* debian/libapache2-mod-wsgi.rtupdate:
- Fixing bashism. Thanks to Vitaliyi (Closes: #483197)
* debian/copyright:
- Removing full text of the Apache License, linking to
/usr/share/common-licenses/Apache-2.0 instead.
* debian/wsgi.conf:
- Removing WSGIPythonExecutable directive from the example configuration
as it does not exist in 2.X versions of mod-wsgi. Thanks to Martin
Tomasek for the report. (Closes: #488982)
Modified:
packages/mod-wsgi/branches/backports.org/debian/changelog
packages/mod-wsgi/branches/backports.org/debian/control
packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.postinst
packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.postrm
packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.prerm
packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.rtupdate
packages/mod-wsgi/branches/backports.org/debian/rules
packages/mod-wsgi/branches/backports.org/debian/wsgi.conf
Modified: packages/mod-wsgi/branches/backports.org/debian/changelog
===================================================================
--- packages/mod-wsgi/branches/backports.org/debian/changelog 2008-09-02 16:24:06 UTC (rev 6443)
+++ packages/mod-wsgi/branches/backports.org/debian/changelog 2008-09-03 23:37:12 UTC (rev 6444)
@@ -1,9 +1,90 @@
-mod-wsgi (2.0-1~bpo40+1) etch-backports; urgency=low
+mod-wsgi (2.3-1~bpo40+1) etch-backports; urgency=low
- * Backport of the new stable 2.0 release.
+ * Rebuild for etch-backports.
- -- Bernd Zeimetz <bzed at debian.org> Thu, 27 Mar 2008 23:43:18 +0100
+ -- Bernd Zeimetz <bzed at debian.org> Thu, 04 Sep 2008 01:33:00 +0200
+mod-wsgi (2.3-1) unstable; urgency=low
+
+ * New upstream release (Closes: #496067). This upload covers the changes of
+ mod-wsgi 2.2 and 2.3.
+ mod-wsgi 2.2 is mainly bugfix-releases. The only exception is a backport
+ of one function from 3.0 which allows the setting of process names on *BSD
+ - this does not affect Linux.
+ mod-wsgi 2.3 fixes regressions which were introduced in 2.2.
+
+ Here follows a list of the bugfixes in 2.2:
+ 1. Fix bug whereby if mod_python is loaded at same time as mod_wsgi the
+ WSGIImportScript directive can cause Apache child processes to crash.
+ For details see: http://code.google.com/p/modwsgi/issues/detail?id=91
+
+ 2. Fix bug where mod_wsgi daemon process startup could fail due to old
+ stale UNIX listener socket file as described in:
+ http://code.google.com/p/modwsgi/issues/detail?id=77
+
+ 3. Fix bug where listener socket file descriptors for daemon processes
+ were being leaked in Apache parent process on a graceful restart.
+ Also fixes problem where UNIX listener socket was left in filesystem
+ on both graceful restart and graceful shutdown. For details see:
+ http://code.google.com/p/modwsgi/issues/detail?id=95
+
+ 4. Fix bug where response was truncated when a null character appeared
+ as first character in block of data being returned from
+ wsgi.file_wrapper.
+ Only occurred when code fell back to using iteration over supplied
+ file like object, rather than optimised method such as sendfile().
+ http://code.google.com/p/modwsgi/issues/detail?id=100
+
+ The following regressions/bugs of 2.2 were fixed in 2.3:
+
+ 1. Fixed problem introduced in version 2.2 of mod_wsgi whereby use of
+ daemon mode would cause CGI scripts to fail. It is quite possible
+ that the bug could also have caused failures with other Apache
+ modules that relied on registering of cleanup functions against
+ Apache configuration memory pool.
+
+ 2. (does not affect Linux)
+ When using setproctitle() on BSD systems, first argument should be
+ a printf style format string with values to fill out per format as
+ additional arguments. Code was supplying value to be displayed as
+ format string which meant that if it contained any printf type format
+ sequences, could cause process to crash as corresponding arguments
+ wouldn't have ben provided.
+
+ -- Bernd Zeimetz <bzed at debian.org> Sat, 23 Aug 2008 19:27:48 +0200
+
+mod-wsgi (2.1-2) unstable; urgency=medium
+
+ * Calling pyversions in postinst requires that 'python' is installed *and*
+ configured, so it would need to be added to Pre-Depends. As this is kinda
+ ugly, we ship the symlink to the module for the right Python version now
+ in the package. I assume that this will really fix #483197 now, I'm quite
+ sure that the broken link results from an error message of the
+ unconfigured python/pyversions. Shipping the symlink also makes sure that
+ it is available while Apache is configured (which may happen before
+ mod-wsgi is configured). (Closes: #483197, #491478)
+ * Drop the parts from the maintainer scripts which renamed the wsgi config
+ files (see #456737 for details) - as mod-wsgi was not released with Etch
+ and the fix was for a long enough time in testing, it should be safe to
+ remove them before Lenny.
+
+ -- Bernd Zeimetz <bzed at debian.org> Mon, 21 Jul 2008 01:20:43 +0200
+
+mod-wsgi (2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/libapache2-mod-wsgi.rtupdate:
+ - Fixing bashism. Thanks to Vitaliyi (Closes: #483197)
+ * debian/copyright:
+ - Removing full text of the Apache License, linking to
+ /usr/share/common-licenses/Apache-2.0 instead.
+ * debian/wsgi.conf:
+ - Removing WSGIPythonExecutable directive from the example configuration
+ as it does not exist in 2.X versions of mod-wsgi. Thanks to Martin
+ Tomasek for the report. (Closes: #488982)
+
+ -- Bernd Zeimetz <bzed at debian.org> Mon, 07 Jul 2008 00:37:50 +0200
+
mod-wsgi (2.0-1) unstable; urgency=low
* New upstream version.
Modified: packages/mod-wsgi/branches/backports.org/debian/control
===================================================================
--- packages/mod-wsgi/branches/backports.org/debian/control 2008-09-02 16:24:06 UTC (rev 6443)
+++ packages/mod-wsgi/branches/backports.org/debian/control 2008-09-03 23:37:12 UTC (rev 6444)
@@ -4,6 +4,7 @@
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Bernd Zeimetz <bzed at debian.org>, Piotr Ożarowski <piotr at debian.org>
Build-Depends: debhelper (>= 5), python-all-dev, apache2-threaded-dev, dpatch
+Homepage: http://www.modwsgi.org/
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/python-modules/packages/mod-wsgi/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/?op=log
@@ -18,6 +19,3 @@
web applications written in Python) compliant interface for hosting Python
based web applications within Apache. The adapter provides significantly
better performance than using existing WSGI adapters for mod_python or CGI.
- .
- Homepage: http://www.modwsgi.org/
-
Modified: packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.postinst
===================================================================
--- packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.postinst 2008-09-02 16:24:06 UTC (rev 6443)
+++ packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.postinst 2008-09-03 23:37:12 UTC (rev 6444)
@@ -2,11 +2,6 @@
set -e
-/usr/share/python/runtime.d/libapache2-mod-wsgi.rtupdate \
- rtupdate \
- pouet \
- $(pyversions -d)
-
apache_force_reload() {
if apache2ctl configtest 2>/dev/null; then
invoke-rc.d apache2 force-reload || true
@@ -15,19 +10,6 @@
fi
}
-# mod-wsgi.{load,conf} renamed to wsgi.{load,conf} in 1.3-2 / 2.0~c4-2:
-# remove old mod-wsgi.* files
-test -e /etc/apache2/mods-available/mod-wsgi.load && rm -f /etc/apache2/mods-available/mod-wsgi.load
-test -L /etc/apache2/mods-enabled/mod-wsgi.conf && rm -f /etc/apache2/mods-enabled/mod-wsgi.conf
-# use old config file if possible
-test -e /etc/apache2/mods-available/mod-wsgi.conf && mv -f /etc/apache2/mods-available/mod-wsgi.conf \
- /etc/apache2/mods-available/wsgi.conf
-# enable wsgi module if mod-wsgi was enabled
-if [ -L /etc/apache2/mods-enabled/mod-wsgi.load ]; then
- rm -f /etc/apache2/mods-enabled/mod-wsgi.load
- a2enmod wsgi >/dev/null || true
-fi
-
if [ -z "$2" ]; then
if [ -e /etc/apache2/apache2.conf ]; then
a2enmod wsgi >/dev/null || true
Modified: packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.postrm
===================================================================
--- packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.postrm 2008-09-02 16:24:06 UTC (rev 6443)
+++ packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.postrm 2008-09-03 23:37:12 UTC (rev 6444)
@@ -1,27 +1,5 @@
#! /bin/sh
-# mod-wsgi.{load,conf} renamed to wsgi.{load,conf} in 1.3-2 / 2.0~c4-2
-version_with_old_module_name() {
- dpkg --compare-versions "$1" lt-nl "1.3-2" && return 0
- dpkg --compare-versions "$1" lt-nl "2.0~c4-2" && dpkg --compare-versions "$1" gt-nl "2.0~c1" && return 0
- return 1
-}
-restore_mod_wsgi() {
- a2dismod wsgi || true
- # downgrading to package with old module name -- we have to restore pseudo conffile
- echo "LoadModule wsgi_module /usr/lib/apache2/modules/mod_wsgi.so" > /etc/apache2/mods-available/mod-wsgi.load
- if [ -e /etc/apache2/mods-available/wsgi.conf ]; then
- mv /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-available/mod-wsgi.conf
- fi
- if [ -e /etc/apache2/mods-available/wsgi.load ]; then
- rm -f /etc/apache2/mods-available/wsgi.load
- fi
-}
-if version_with_old_module_name $2; then
- test ! -e /etc/apache2/mods-available/mod-wsgi.load && restore_mod_wsgi
-fi
-
-
if [ "$1" = "purge" -o "$1" = "remove" ]; then
# remove pseudo conffile
test -e /etc/apache2/mods-available/wsgi.load && rm -f /etc/apache2/mods-available/wsgi.load
Modified: packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.prerm
===================================================================
--- packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.prerm 2008-09-02 16:24:06 UTC (rev 6443)
+++ packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.prerm 2008-09-03 23:37:12 UTC (rev 6444)
@@ -6,8 +6,6 @@
a2dismod wsgi || true
fi
-rm -f /usr/lib/apache2/modules/mod_wsgi.so
-
#DEBHELPER#
exit 0
Modified: packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.rtupdate
===================================================================
--- packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.rtupdate 2008-09-02 16:24:06 UTC (rev 6443)
+++ packages/mod-wsgi/branches/backports.org/debian/libapache2-mod-wsgi.rtupdate 2008-09-03 23:37:12 UTC (rev 6444)
@@ -3,6 +3,6 @@
set -e
if [ "$1" = rtupdate ]; then
- new_version=${3#python}
+ new_version=`echo ${3} | sed 's,^python,,'`
ln -sf mod_wsgi.so-${new_version} /usr/lib/apache2/modules/mod_wsgi.so
fi
Modified: packages/mod-wsgi/branches/backports.org/debian/rules
===================================================================
--- packages/mod-wsgi/branches/backports.org/debian/rules 2008-09-02 16:24:06 UTC (rev 6443)
+++ packages/mod-wsgi/branches/backports.org/debian/rules 2008-09-03 23:37:12 UTC (rev 6444)
@@ -11,6 +11,7 @@
APXS2=/usr/bin/apxs2
PYVERS=$(shell pyversions -vs)
+PYDEFAULT=$(shell pyversions -dv)
PYMIN=$(shell echo $(PYVERS) | awk '{print $$1}')
PYMAX=$(shell echo $(PYVERS) | LANG=C awk '{print $$NF+0.1}')
@@ -60,7 +61,7 @@
install -d -m 755 debian/$(PACKAGE)/usr/share/python/runtime.d
install -m 755 debian/*.rtupdate debian/$(PACKAGE)/usr/share/python/runtime.d/
dh_installman
- dh_link
+ dh_link usr/lib/apache2/modules/mod_wsgi.so-$(PYDEFAULT) usr/lib/apache2/modules/mod_wsgi.so
dh_strip
dh_compress
dh_fixperms
Modified: packages/mod-wsgi/branches/backports.org/debian/wsgi.conf
===================================================================
--- packages/mod-wsgi/branches/backports.org/debian/wsgi.conf 2008-09-02 16:24:06 UTC (rev 6443)
+++ packages/mod-wsgi/branches/backports.org/debian/wsgi.conf 2008-09-03 23:37:12 UTC (rev 6444)
@@ -33,22 +33,6 @@
#WSGIPythonOptimize 0
- #WSGIPythonExecutable: Absolute path to Python executable, overriding
- # the PYTHONEXECUTABLE environment variable.
- #WSGIPythonHome: Absolute path to Python prefix/exec_prefix directories,
- # overriding the PYTHONHOME environment variable.
- #
- #You need to take care of these variables if /usr/bin/python does
- #not point to Debian's default Python version as provided by the
- #package 'python' on your system, or if you have multiple versions of
- #Python installed in different locations in the file system, especially
- #different installations of the same major/minor version, and the
- #installation that Apache finds in its PATH is not the desired one.
-
- #WSGIPythonExecutable file-path
- #WSGIPythonHome prefix|prefix:exec_prefix
-
-
#WSGIPythonPath: Additional directories to search for Python modules,
# overriding the PYTHONPATH environment variable.
#
More information about the Python-modules-commits
mailing list