[Pkg-nagios-changes] [pkg-nagircbot] 01/01: sync with latest packaging
John Morrissey
jwm-guest at alioth.debian.org
Sat Sep 14 17:19:37 UTC 2013
This is an automated email from the git hooks/post-receive script.
jwm-guest pushed a commit to branch master
in repository pkg-nagircbot.
commit a741e3b0b3c0201f98543bfa27b069552cd7918c
Author: John Morrissey <jwm at horde.net>
Date: Sat Sep 14 13:19:20 2013 -0400
sync with latest packaging
---
debian/changelog | 15 +++++-
debian/control | 6 +--
debian/copyright | 2 +-
debian/init.d | 2 +-
debian/patches/11hardening-flags | 22 ++++++++
debian/patches/21non-debug-build | 16 ++++++
debian/patches/22fix-T-numargs-segfault | 88 +++++++++++++++++++++++++++++++
debian/patches/debian-changes-0.0.33-2 | 4 ++
debian/patches/series | 4 +-
9 files changed, 151 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index add24aa..1a813b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,20 @@
+nagircbot (0.0.33-3) unstable; urgency=low
+
+ * Add patch 22fix-T-numargs-segfault to avoid a segfault when too few
+ values are supplied to the -T option. (Closes: #716627)
+ * Bump Standards-Version to 3.9.4 (no changes necessary).
+ * Orphan this package; there are better alternatives now.
+
+ -- John Morrissey <jwm at horde.net> Sat, 31 Aug 2013 13:10:17 -0400
+
nagircbot (0.0.33-2) unstable; urgency=low
- * Bump Standards-Version to 3.9.2 (no changes necessary).
+ * Bump Standards-Version to 3.9.3 (no changes necessary).
* Really disable the debug build option this time.
+ * Avoid hard coded PID file path in init script.
+ * Use official/non-DEP URL for machine-readable debian/copyright.
- -- John Morrissey <jwm at horde.net> Wed, 24 Aug 2011 13:29:50 -0500
+ -- John Morrissey <jwm at horde.net> Thu, 21 Jun 2012 11:26:51 -0400
nagircbot (0.0.33-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index c1a53ad..17a0a18 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
Source: nagircbot
Section: net
Priority: extra
-Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Uploaders: John Morrissey <jwm at horde.net>
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Uploaders: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
Build-Depends: debhelper (>= 7), libssl-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Homepage: http://www.vanheusden.com/nagircbot/
Package: nagircbot
diff --git a/debian/copyright b/debian/copyright
index d041904..4c7ac50 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: Folkert van Heusden <folkert at vanheusden.com>
Source: http://www.vanheusden.com/nagircbot/
diff --git a/debian/init.d b/debian/init.d
index 772543a..7f0171c 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -111,7 +111,7 @@ running() {
}
start_server() {
- start_daemon -p "$PIDFILE" "$DAEMON" -P /var/run/nagircbot.pid \
+ start_daemon -p "$PIDFILE" "$DAEMON" -P "$PIDFILE" \
-z "$USER" -Xf "$STATUSFILE" \
-s "$SERVER" -n "$NICK" -c "$CHANNEL" $OPTIONS
}
diff --git a/debian/patches/11hardening-flags b/debian/patches/11hardening-flags
new file mode 100644
index 0000000..abcce04
--- /dev/null
+++ b/debian/patches/11hardening-flags
@@ -0,0 +1,22 @@
+Description: Enable hardening flags (http://wiki.debian.org/Hardening)
+Author: John Morrissey <jwm at horde.net>
+Last-Update: 2012-06-21
+
+Index: nagircbot-0.0.33/Makefile
+===================================================================
+--- nagircbot-0.0.33.orig/Makefile 2012-06-21 15:48:16.000000000 +0000
++++ nagircbot-0.0.33/Makefile 2012-06-21 15:53:53.000000000 +0000
+@@ -3,9 +3,11 @@
+ VERSION=0.0.33
+
+ DEBUG=-g -D_DEBUG #-fprofile-arcs -ftest-coverage #-pg -g
++CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+ CXXFLAGS += -Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
+-CFLAGS += ${CXXFLAGS}
+-LDFLAGS += $(DEBUG) -lcrypto -lssl -lstdc++
++CFLAGS += ${CXXFLAGS} $(shell dpkg-buildflags --get CFLAGS)
++CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS)
++LDFLAGS += $(DEBUG) -lcrypto -lssl -lstdc++ $(shell dpkg-buildflags --get LDFLAGS)
+
+ DESTDIR ?=
+ prefix ?= /usr/local
diff --git a/debian/patches/21non-debug-build b/debian/patches/21non-debug-build
new file mode 100644
index 0000000..c9021e3
--- /dev/null
+++ b/debian/patches/21non-debug-build
@@ -0,0 +1,16 @@
+Description: Disable debug build to avoid excessive CPU consumption in
+ the debug build's memory allocation tracking code.
+Author: John Morrissey <jwm at horde.net>
+Last-Update: 2012-06-21
+
+--- nagircbot-0.0.33.orig/Makefile
++++ nagircbot-0.0.33/Makefile
+@@ -2,7 +2,7 @@
+
+ VERSION=0.0.33
+
+-DEBUG=-g -D_DEBUG #-fprofile-arcs -ftest-coverage #-pg -g
++DEBUG=-g #-D_DEBUG -fprofile-arcs -ftest-coverage #-pg -g
+ CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+ CXXFLAGS += -Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
+ CFLAGS += ${CXXFLAGS} $(shell dpkg-buildflags --get CFLAGS)
diff --git a/debian/patches/22fix-T-numargs-segfault b/debian/patches/22fix-T-numargs-segfault
new file mode 100644
index 0000000..271d396
--- /dev/null
+++ b/debian/patches/22fix-T-numargs-segfault
@@ -0,0 +1,88 @@
+Description: Tighten up option parsing for -T, avoiding a segfault if
+ too few values are supplied
+Author: John Morrissey <jwm at horde.net>
+Last-Update: 2013-08-31
+
+--- nagircbot-0.0.33/anna.cpp.orig 2013-08-31 12:59:15.000000000 -0400
++++ nagircbot-0.0.33/anna.cpp 2013-08-31 13:00:35.448761396 -0400
+@@ -900,24 +900,74 @@
+ char *dummy = optarg;
+
+ max_time_last_host_update = atoi(dummy);
+- dummy = strchr(dummy, ',') + 1;
++ dummy = strchr(dummy, ',');
++ if (!dummy)
++ {
++ fprintf(stderr, "-T: argument must have seven comma-separated integers\n");
++ usage();
++ return 1;
++ }
+
++ dummy++;
+ max_time_oldest_host_update = atoi(dummy);
+- dummy = strchr(dummy, ',') + 1;
++ dummy = strchr(dummy, ',');
++ if (!dummy)
++ {
++ fprintf(stderr, "-T: argument must have seven comma-separated integers\n");
++ usage();
++ return 1;
++ }
+
++ dummy++;
+ max_time_last_host_check = atoi(dummy);
+- dummy = strchr(dummy, ',') + 1;
++ dummy = strchr(dummy, ',');
++ if (!dummy)
++ {
++ fprintf(stderr, "-T: argument must have seven comma-separated integers\n");
++ usage();
++ return 1;
++ }
+
++ dummy++;
+ max_time_oldest_host_check = atoi(dummy);
+- dummy = strchr(dummy, ',') + 1;
++ dummy = strchr(dummy, ',');
++ if (!dummy)
++ {
++ fprintf(stderr, "-T: argument must have seven comma-separated integers\n");
++ usage();
++ return 1;
++ }
+
++ dummy++;
+ max_time_last_service_check = atoi(dummy);
+- dummy = strchr(dummy, ',') + 1;
++ dummy = strchr(dummy, ',');
++ if (!dummy)
++ {
++ fprintf(stderr, "-T: argument must have seven comma-separated integers\n");
++ usage();
++ return 1;
++ }
+
++ dummy++;
+ max_time_oldest_service_check = atoi(dummy);
+- dummy = strchr(dummy, ',') + 1;
++ dummy = strchr(dummy, ',');
++ if (!dummy)
++ {
++ fprintf(stderr, "-T: argument must have seven comma-separated integers\n");
++ usage();
++ return 1;
++ }
+
++ dummy++;
+ max_time_oldest_next_service_check = atoi(dummy);
++ dummy = strchr(dummy, ',');
++ if (dummy)
++ {
++ /* There are more comma-separated items left. */
++ fprintf(stderr, "-T: argument must have seven comma-separated integers\n");
++ usage();
++ return 1;
++ }
+ break;
+ }
+
diff --git a/debian/patches/debian-changes-0.0.33-2 b/debian/patches/debian-changes-0.0.33-2
index a5691db..ff8218d 100644
--- a/debian/patches/debian-changes-0.0.33-2
+++ b/debian/patches/debian-changes-0.0.33-2
@@ -35,3 +35,7 @@ Last-Update: <YYYY-MM-DD>
CXXFLAGS += -Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
CFLAGS += ${CXXFLAGS}
LDFLAGS += $(DEBUG) -lcrypto -lssl -lstdc++
+--- /dev/null
++++ nagircbot-0.0.33/.gitignore
+@@ -0,0 +1 @@
++.pc
diff --git a/debian/patches/series b/debian/patches/series
index e692f7b..3d1b047 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
10add-destdir-support
+11hardening-flags
20fix-non-debug-build
-debian-changes-0.0.33-2
+21non-debug-build
+22fix-T-numargs-segfault
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagircbot.git
More information about the Pkg-nagios-changes
mailing list