Merge lp:~smoser/ubuntu/oneiric/nagios-plugins/lp837085 into lp:ubuntu/oneiric/nagios-plugins

[Scott Moser]

[Scott Moser (smoser)]

I'd like someone to comment on the usage of patch name 90_*.
the rest i believe is good.

[Kees Cook (kees)]

Looks good. The 90* is fine, that's pretty standard for splitting Ubuntu patches away from Debian's.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-28 00:23:29 +0000
+++ debian/changelog	2011-09-06 21:05:30 +0000
@@ -1,3 +1,9 @@
+nagios-plugins (1.4.15-4ubuntu2) UNRELEASED; urgency=low
+
+  * re-enable hardened builds (LP: #837085)
+
+ -- Scott Moser <[e-mail]>  Tue, 06 Sep 2011 16:08:53 -0400
+
 nagios-plugins (1.4.15-4ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable (LP: #789347).  Remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2011-05-28 00:23:29 +0000
+++ debian/control	2011-09-06 21:05:30 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Core Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian Nagios Maintainer Group <[e-mail]>
 Uploaders: Jan Wagner <[e-mail]>, Alexander Wirt <[e-mail]>
-Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), perl, autotools-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk
+Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), perl, autotools-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk, hardening-wrapper
 Homepage: http://nagiosplug.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagios-plugins/
 Vcs-Svn: svn://svn.debian.org/pkg-nagios/nagios-plugins/trunk/
 
=== modified file 'debian/patches/00list'
--- debian/patches/00list	2011-05-28 00:23:29 +0000
+++ debian/patches/00list	2011-09-06 21:05:30 +0000
@@ -7,3 +7,4 @@
 12_check_snmp_1.4.15_regression.dpatch
 13_check_smtp_greeting.dpatch
 14_check_icmp_multiple_ips.dpatch
+90_hardened_build_fixes.dpatch
 
=== added file 'debian/patches/90_hardened_build_fixes.dpatch'
--- debian/patches/90_hardened_build_fixes.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/90_hardened_build_fixes.dpatch	2011-09-06 21:05:30 +0000
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_hardened_build_fixes.dpatch by Scott Moser <[e-mail]>
+##
+## DP: Fix issues reported by hardened build (LP: #837085)
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' oneiric~/plugins/check_radius.c oneiric/plugins/check_radius.c
+--- oneiric~/plugins/check_radius.c	2011-09-06 15:31:36.000000000 -0400
++++ oneiric/plugins/check_radius.c	2011-09-06 16:07:15.821875492 -0400
+@@ -211,7 +211,7 @@
+ 	if (result == OK_RC)
+ 		die (STATE_OK, _("Auth OK"));
+ 	(void)snprintf(msg, sizeof(msg), _("Unexpected result code %d"), result);
+-	die (STATE_UNKNOWN, msg);
++	die (STATE_UNKNOWN, "%s", msg);
+ }
+ 
+