[Python-modules-commits] r29005 - in packages/mod-wsgi/trunk/debian (3 files)

[fgeyer at users.alioth.debian.org]

    Date: Wednesday, May 21, 2014 @ 17:50:18
  Author: fgeyer
Revision: 29005

Drop fix_crash_daemon_mode.patch, applied upstream.

Modified:
  packages/mod-wsgi/trunk/debian/changelog
  packages/mod-wsgi/trunk/debian/patches/series
Deleted:
  packages/mod-wsgi/trunk/debian/patches/fix_crash_daemon_mode.patch

Modified: packages/mod-wsgi/trunk/debian/changelog
===================================================================
--- packages/mod-wsgi/trunk/debian/changelog	2014-05-21 17:47:21 UTC (rev 29004)
+++ packages/mod-wsgi/trunk/debian/changelog	2014-05-21 17:50:18 UTC (rev 29005)
@@ -2,6 +2,7 @@
 
   * New upstream release.
     - Fixes CVE-2014-0240: Local privilege escalation when using daemon mode.
+  * Drop fix_crash_daemon_mode.patch, applied upstream.
 
  -- Felix Geyer <fgeyer at debian.org>  Wed, 21 May 2014 19:35:23 +0200
 

Deleted: packages/mod-wsgi/trunk/debian/patches/fix_crash_daemon_mode.patch
===================================================================
--- packages/mod-wsgi/trunk/debian/patches/fix_crash_daemon_mode.patch	2014-05-21 17:47:21 UTC (rev 29004)
+++ packages/mod-wsgi/trunk/debian/patches/fix_crash_daemon_mode.patch	2014-05-21 17:50:18 UTC (rev 29005)
@@ -1,21 +0,0 @@
-Description: Scoreboard handle in daemon mode should be set to NULL for
- Apache 2.4 to avoid crash in lingering close.
-Origin: upstream, https://code.google.com/p/modwsgi/source/detail?r=20979c8abd2f722d210d419b96c85e46a36e2d75
-Bug-Debian: http://bugs.debian.org/719304
-
---- a/mod_wsgi.c
-+++ b/mod_wsgi.c
-@@ -10599,7 +10599,13 @@
-      * will add their own input/output filters to the chain.
-      */
- 
-+#if AP_MODULE_MAGIC_AT_LEAST(20110619,0)
-+    /* For 2.4 a NULL sbh pointer should work. */
-+    sbh = NULL;
-+#else
-+    /* For 2.2 a dummy sbh pointer is needed. */
-     ap_create_sb_handle(&sbh, p, -1, 0);
-+#endif
- 
-     c = (conn_rec *)apr_pcalloc(p, sizeof(conn_rec));
- 

Modified: packages/mod-wsgi/trunk/debian/patches/series
===================================================================
--- packages/mod-wsgi/trunk/debian/patches/series	2014-05-21 17:47:21 UTC (rev 29004)
+++ packages/mod-wsgi/trunk/debian/patches/series	2014-05-21 17:50:18 UTC (rev 29005)
@@ -1,2 +1 @@
 python-config.patch
-fix_crash_daemon_mode.patch