[SCM] Debian packaging of libapache2-mod-perl2 branch, master, updated. debian/2.0.5-5-2-g067fc83

[Dominic Hargreaves]

The following commit has been merged in the master branch:
commit 067fc831c983c3e65297b5a355a2f43c394b074d
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sun Mar 11 22:18:10 2012 +0000

    Apply patch from Niko Tyni fixing FTBFS with -Werror=format-security (Closes: #661540)

diff --git a/debian/changelog b/debian/changelog
index b319380..01226f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libapache2-mod-perl2 (2.0.5-6) UNRELEASED; urgency=low
   WAITS-FOR: debhelper 9 hardening flags fix (#662666)
 
   * Bump debhelper compat level to 9
+  * Apply patch from Niko Tyni fixing FTBFS with -Werror=format-security
+    (Closes: #661540)
 
  -- Dominic Hargreaves <dom at earth.li>  Sun, 11 Mar 2012 20:06:11 +0000
 
diff --git a/debian/patches/262-format-security.patch b/debian/patches/262-format-security.patch
new file mode 100644
index 0000000..702877e
--- /dev/null
+++ b/debian/patches/262-format-security.patch
@@ -0,0 +1,63 @@
+From 94bdae4a6c6e480e9b287813be2fd1eb01fd7bd3 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Fri, 9 Mar 2012 22:26:37 +0200
+Subject: [PATCH] Use controlled format strings for Perl_croak()
+
+This fixed builds with gcc -Werror=format-security.
+---
+ xs/APR/Pool/APR__Pool.h                     |    2 +-
+ xs/Apache2/ServerUtil/Apache2__ServerUtil.h |    2 +-
+ xs/Apache2/SubProcess/Apache2__SubProcess.h |    4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/xs/APR/Pool/APR__Pool.h b/xs/APR/Pool/APR__Pool.h
+index 4ea8da3..058864f 100644
+--- a/xs/APR/Pool/APR__Pool.h
++++ b/xs/APR/Pool/APR__Pool.h
+@@ -312,7 +312,7 @@ static apr_status_t mpxs_cleanup_run(void *data)
+ #endif
+ 
+     if (SvTRUE(ERRSV)) {
+-        Perl_croak(aTHX_ SvPV_nolen(ERRSV));
++        Perl_croak(aTHX_ "%s", SvPV_nolen(ERRSV));
+     }
+ 
+     /* the return value is ignored by apr_pool_destroy anyway */
+diff --git a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h b/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
+index ced1c38..c64a140 100644
+--- a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
++++ b/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
+@@ -80,7 +80,7 @@ static apr_status_t mpxs_cleanup_run(void *data)
+     }
+ 
+     if (SvTRUE(ERRSV)) {
+-        Perl_croak(aTHX_ SvPV_nolen(ERRSV));
++        Perl_croak(aTHX_ "%s", SvPV_nolen(ERRSV));
+     }
+ 
+     /* the return value is ignored by apr_pool_destroy anyway */
+diff --git a/xs/Apache2/SubProcess/Apache2__SubProcess.h b/xs/Apache2/SubProcess/Apache2__SubProcess.h
+index aca73a3..ae9807f 100644
+--- a/xs/Apache2/SubProcess/Apache2__SubProcess.h
++++ b/xs/Apache2/SubProcess/Apache2__SubProcess.h
+@@ -135,7 +135,7 @@ MP_STATIC XS(MPXS_modperl_spawn_proc_prog)
+     const char *usage = "Usage: spawn_proc_prog($r, $command, [\\@argv])";
+ 
+     if (items < 2) {
+-        Perl_croak(aTHX_ usage);
++        Perl_croak(aTHX_ "%s", usage);
+     }
+ 
+     SP -= items;
+@@ -156,7 +156,7 @@ MP_STATIC XS(MPXS_modperl_spawn_proc_prog)
+                 av_items = len+1;
+             }
+             else {
+-                Perl_croak(aTHX_ usage);
++                Perl_croak(aTHX_ "%s", usage);
+             }
+         }
+ 
+-- 
+1.7.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index afda126..c5f518b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ avoid-db-linkage.patch
 250-lfs-perl-5.14.patch
 260-perl-5.13-reference-counting-bug.patch
 261-another-perl-5.13-reference-counting-bug.patch
+262-format-security.patch

-- 
Debian packaging of libapache2-mod-perl2