[libapache-mod-jk] 32/65: enabled hardening flags; remove Michael Koch from Uploaders

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository libapache-mod-jk.

commit ace2a39ea65cecebc4af0f8b8f537d83e8aa10c5
Author: Tony Mancill <tmancill at debian.org>
Date:   Sat Feb 4 07:29:50 2012 +0000

    enabled hardening flags; remove Michael Koch from Uploaders
---
 debian/changelog                             |  9 ++++++---
 debian/compat                                |  2 +-
 debian/control                               |  2 +-
 debian/patches/0004-compiler-hardening.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 debian/rules                                 |  2 +-
 debian/source.lintian-overrides              |  2 ++
 7 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45a7ea4..cd3d7d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-libapache-mod-jk (1:1.2.32-2) UNRELEASED; urgency=low
+libapache-mod-jk (1:1.2.32-2) unstable; urgency=low
 
   * Team upload.
-  * Remove Michael Koch from Uploaders.  Closes: #654045
+  * Set debian/compat to 9; bump debhelper dependency to 8.1.3.
+  * Modify debian/rules to enable hardening flags 
+    and add patches/0004-compiler-hardening.patch (Closes: #656876)
+  * Remove Michael Koch from Uploaders. (Closes: #654045)
 
- -- tony mancill <tmancill at debian.org>  Sun, 22 Jan 2012 16:34:54 -0800
+ -- tony mancill <tmancill at debian.org>  Sat, 04 Feb 2012 07:17:54 +0000
 
 libapache-mod-jk (1:1.2.32-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index f4b2b20..1d655d2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: httpd
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 8), apache2-threaded-dev, libtool, autotools-dev
+Build-Depends: debhelper (>= 8.1.3~), apache2-threaded-dev, libtool, autotools-dev
 Build-Depends-Indep: xsltproc, lynx
 Standards-Version: 3.9.2
 Homepage: http://tomcat.apache.org/
diff --git a/debian/patches/0004-compiler-hardening.patch b/debian/patches/0004-compiler-hardening.patch
new file mode 100644
index 0000000..990bae5
--- /dev/null
+++ b/debian/patches/0004-compiler-hardening.patch
@@ -0,0 +1,25 @@
+Author: tony mancill <tmancill at debian.org>
+Last-Update: 2012-02-03 
+Description: patch for "error: format not a string literal and no format arguments [-Werror=format-security]" 
+--- a/native/apache-2.0/mod_jk.c.orig	2012-02-04 05:51:31.000000000 +0000
++++ b/native/apache-2.0/mod_jk.c	2012-02-04 06:42:01.018105253 +0000
+@@ -673,15 +673,15 @@
+     }
+ 
+ #if (MODULE_MAGIC_NUMBER_MAJOR >= 20100606)
+-    ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, s, res);
++    ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, s, "%s", res);
+ #else
+-    ap_log_error(file, line, level, 0, s, res);
++    ap_log_error(file, line, level, 0, s, "%s", res);
+ #endif
+     if ( s ) {
+ #if (MODULE_MAGIC_NUMBER_MAJOR >= 20100606)
+-        ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, NULL, res);
++        ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, NULL, "%s", res);
+ #else
+-        ap_log_error(file, line, level, 0, NULL, res);
++        ap_log_error(file, line, level, 0, NULL, "%s", res);
+ #endif
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3b6be9c..f7c7b75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-disable-logo.patch
 0002-debianize-log-directory.patch
 0003-upgrade-info-to-error-message.patch
+0004-compiler-hardening.patch
diff --git a/debian/rules b/debian/rules
index b9dea13..fd7d45e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # Enable LFS
-CFLAGS = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(shell dpkg-buildflags --get CFLAGS)
 
 %:
 	dh $@ --with autotools_dev --sourcedirectory=native
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..c3a8e6e
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+# override: using compat=9 with debhelper 8.1.3 for build-hardening flags
+package-needs-versioned-debhelper-build-depends 9

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git