Merge lp:~zulcss/ubuntu/jaunty/mod-auth-mysql/mod-auth-mysql-sru-jaunty-364581 into lp:ubuntu/jaunty/mod-auth-mysql

[Chuck Short]

This fixes the bug in jaunty.

Unmerged revisions

6. By Chuck Short on 2010-03-19

Update changelog

5. By Chuck Short on 2010-03-19

Update debian/control

4. By Chuck Short on 2010-03-19

debian/patches/014-fix-ubuntu-segfault.dpatch: Fixes segfault when running with mod-auth-mysql.

=== modified file 'debian/changelog'
--- debian/changelog	2009-01-21 18:58:04 +0000
+++ debian/changelog	2010-03-19 18:02:26 +0000
@@ -1,3 +1,9 @@
+mod-auth-mysql (4.3.9-11ubuntu1) jaunty-proposed; urgency=low
+
+  * debian/patches/014-fix-ubuntu-segfault.dpatch: Fixes segfault when running with mod-auth-mysql. 
+
+ -- Chuck Short <[e-mail]>  Fri, 19 Mar 2010 13:44:50 -0400
+
 mod-auth-mysql (4.3.9-11) unstable; urgency=medium
 
   * Change section web to net

=== modified file 'debian/control'
--- debian/control	2009-01-21 18:58:04 +0000
+++ debian/control	2010-03-19 18:02:26 +0000
@@ -1,7 +1,8 @@
 Source: mod-auth-mysql
 Section: net
 Priority: optional
-Maintainer: Joey Schulze <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Joey Schulze <[e-mail]>
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 5.0.0), dpatch, libmysqlclient15-dev, apache2-threaded-dev (>= 2.0.50-10)
 

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2009-01-21 18:58:04 +0000
+++ debian/patches/00list	2010-03-19 18:02:26 +0000
@@ -10,3 +10,4 @@
 011-auth_basic
 012-charset
 013-CVE-2008-2384_charset
+014-fix-ubuntu-segfault

=== added file 'debian/patches/014-fix-ubuntu-segfault.dpatch'
--- debian/patches/014-fix-ubuntu-segfault.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/014-fix-ubuntu-segfault.dpatch	2010-03-19 18:02:26 +0000
@@ -0,0 +1,14 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+diff -Naurp mod-auth-mysql-4.3.9.orig/mod_auth_mysql.c mod-auth-mysql-4.3.9/mod_auth_mysql.c
+--- mod-auth-mysql-4.3.9.orig/mod_auth_mysql.c	2004-12-23 08:43:14.000000000 -0500
++++ mod-auth-mysql-4.3.9/mod_auth_mysql.c	2010-03-19 13:42:55.002627154 -0400
+@@ -48,6 +48,7 @@
+ #include <http_log.h>
+ #ifdef APACHE2
+ #include "http_request.h"   /* for ap_hook_(check_user_id | auth_checker)*/
++#include <apr_strings.h>
+ #include <apr_md5.h>
+ #include <apr_sha1.h>
+ #else