[Pkg-nagios-changes] nsca/debian changelog, 1.4, 1.5 control, 1.3, 1.4 nsca.init, 1.1, 1.2 rules, 1.2, 1.3

[seanius at haydn.debian.org]

Update of /cvsroot/pkg-nagios/nsca/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv2349/debian

Modified Files:
	changelog control nsca.init rules 
Log Message:
ready for next upload

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- changelog	3 Nov 2005 10:27:18 -0000	1.4
+++ changelog	5 Dec 2005 10:51:00 -0000	1.5
@@ -1,10 +1,16 @@
-nsca (2.4-5) UNRELEASED; urgency=low
+nsca (2.4-5) unstable; urgency=low
 
   * Sean Finney:
     - include a simple init script for those who would prefer to avoid
-      using inetd.
+      using inetd (closes: #336712).  for the time being, inetd is still
+      the default so no runlevel symlinks are installed, but this may
+      change in the future.
+    - include a patch to let nsca run without forking to the background;
+      this is necessary for the above feature.
+    - default to using /etc/send_nsca.cfg instead of ./send_nsca.cfg.
+      thanks to Juraj Bednar for pointing this out (closes: #342017).
 
- -- sean finney <seanius at debian.org>  Thu, 03 Nov 2005 11:25:35 +0100
+ -- sean finney <seanius at debian.org>  Mon, 05 Dec 2005 11:50:24 +0100
 
 nsca (2.4-4) unstable; urgency=low
 

Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control	29 Oct 2005 12:10:30 -0000	1.3
+++ control	5 Dec 2005 10:51:00 -0000	1.4
@@ -4,7 +4,7 @@
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
 Uploaders: sean finney <seanius at debian.org>, Cajus Pollmeier <cajus at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: libmcrypt-dev, debmake
+Build-Depends: libmcrypt-dev, debmake, dpatch
 
 Package: nsca
 Architecture: any

Index: nsca.init
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/nsca.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nsca.init	3 Nov 2005 10:27:18 -0000	1.1
+++ nsca.init	5 Dec 2005 10:51:00 -0000	1.2
@@ -3,14 +3,17 @@
 # simple debian init script for nsca
 # by sean finney <seanius at debian.org>
 
-# note that nsca does not have any way to support a pidfile, it seems,
-# so there is very little error checking.  patches welcome.
-
 DAEMON=/usr/sbin/nsca
 NAME=nsca
 DESC="Nagios Service Check Acceptor"
 CONF=/etc/nsca.cfg
-OPTS="--daemon -c $CONF"
+OPTS="-f --daemon -c $CONF"
+PIDFILE="/var/run/nsca.pid"
+
+###
+
+SSDOPTS="--pidfile $PIDFILE --make-pidfile"
+SSD="/sbin/start-stop-daemon $SSDOPTS"
 
 if [ ! -x $DAEMON ]; then
 	exit 0
@@ -24,12 +27,12 @@
 case "$1" in
 start)
 	echo -n "Starting $DESC: "
-	$DAEMON $OPTS || die "ERROR: could not start $NAME."
+	$SSD -S -b --exec $DAEMON -- $OPTS || die "ERROR: could not start $NAME."
 	echo "$NAME."
 ;;
 stop)
 	echo -n "Stopping $DESC: "
-	pkill -u nagios -fx "$DAEMON $OPTS" || die "ERROR: could not stop $NAME."
+	$SSD -K --exec $DAEMON -- $OPTS || die "ERROR: could not stop $NAME."
 	echo "$NAME."
 ;;
 restart)

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rules	3 Nov 2005 10:27:18 -0000	1.2
+++ rules	5 Dec 2005 10:51:00 -0000	1.3
@@ -4,13 +4,15 @@
 
 package=nsca
 
-build:
+include /usr/share/dpatch/dpatch.make
+
+build: patch-stamp
 	$(checkdir)
 	./configure --with-nsca-user=nagios --with-nsca-grp=nogroup --with-nsca-port=5667 --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib/nagios
 	$(MAKE) all
 	touch build
 
-clean:
+clean: unpatch
 	$(checkdir)
 	-rm -f build
 	-$(MAKE) distclean
@@ -35,6 +37,7 @@
 	cp src/send_nsca debian/tmp/usr/sbin
 	cp send_nsca.cfg nsca.cfg debian/tmp/etc
 	cp debian/nsca.init debian/tmp/etc/init.d/nsca
+	chmod a+x debian/tmp/etc/init.d/nsca
 
 	# Remove obsolete stuff
 	rm -rf tmp/debian/usr/local