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

Proposed by Scott Moser
Status: Merged
Merged at revision: 42
Proposed branch: lp:~smoser/ubuntu/oneiric/nagios-plugins/lp837085
Merge into: lp:ubuntu/oneiric/nagios-plugins
Diff against target: 58 lines (+26/-1)
4 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
debian/patches/00list (+1/-0)
debian/patches/90_hardened_build_fixes.dpatch (+18/-0)
To merge this branch: bzr merge lp:~smoser/ubuntu/oneiric/nagios-plugins/lp837085
Reviewer Review Type Date Requested Status
Kees Cook Approve
Review via email: mp+74309@code.launchpad.net
To post a comment you must log in.
Scott Moser (smoser) wrote :

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

Kees Cook (kees) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-05-28 00:23:29 +0000
3+++ debian/changelog 2011-09-06 21:05:30 +0000
4@@ -1,3 +1,9 @@
5+nagios-plugins (1.4.15-4ubuntu2) UNRELEASED; urgency=low
6+
7+ * re-enable hardened builds (LP: #837085)
8+
9+ -- Scott Moser <smoser@ubuntu.com> Tue, 06 Sep 2011 16:08:53 -0400
10+
11 nagios-plugins (1.4.15-4ubuntu1) oneiric; urgency=low
12
13 * Merge from debian unstable (LP: #789347). Remaining changes:
14
15=== modified file 'debian/control'
16--- debian/control 2011-05-28 00:23:29 +0000
17+++ debian/control 2011-09-06 21:05:30 +0000
18@@ -4,7 +4,7 @@
19 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
20 XSBC-Original-Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
21 Uploaders: Jan Wagner <waja@cyconet.org>, Alexander Wirt <formorer@debian.org>
22-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
23+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
24 Homepage: http://nagiosplug.sourceforge.net
25 Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagios-plugins/
26 Vcs-Svn: svn://svn.debian.org/pkg-nagios/nagios-plugins/trunk/
27
28=== modified file 'debian/patches/00list'
29--- debian/patches/00list 2011-05-28 00:23:29 +0000
30+++ debian/patches/00list 2011-09-06 21:05:30 +0000
31@@ -7,3 +7,4 @@
32 12_check_snmp_1.4.15_regression.dpatch
33 13_check_smtp_greeting.dpatch
34 14_check_icmp_multiple_ips.dpatch
35+90_hardened_build_fixes.dpatch
36
37=== added file 'debian/patches/90_hardened_build_fixes.dpatch'
38--- debian/patches/90_hardened_build_fixes.dpatch 1970-01-01 00:00:00 +0000
39+++ debian/patches/90_hardened_build_fixes.dpatch 2011-09-06 21:05:30 +0000
40@@ -0,0 +1,18 @@
41+#! /bin/sh /usr/share/dpatch/dpatch-run
42+## 99_hardened_build_fixes.dpatch by Scott Moser <smoser@ubuntu.com>
43+##
44+## DP: Fix issues reported by hardened build (LP: #837085)
45+
46+@DPATCH@
47+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
48+--- oneiric~/plugins/check_radius.c 2011-09-06 15:31:36.000000000 -0400
49++++ oneiric/plugins/check_radius.c 2011-09-06 16:07:15.821875492 -0400
50+@@ -211,7 +211,7 @@
51+ if (result == OK_RC)
52+ die (STATE_OK, _("Auth OK"));
53+ (void)snprintf(msg, sizeof(msg), _("Unexpected result code %d"), result);
54+- die (STATE_UNKNOWN, msg);
55++ die (STATE_UNKNOWN, "%s", msg);
56+ }
57+
58+

Subscribers

People subscribed via source and target branches

to all changes: