tags 604053 + pending
thanks

Dear maintainer,

I've prepared an NMU for nsca (versioned as 2.7.2+nmu1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
Xavier Oswald <[email protected]>
GNU/Linux Debian Developer - http://www.debian.org/
GPG key ID: 0x464B8DE3
diff -Nru nsca-2.7.2/debian/changelog nsca-2.7.2+nmu1/debian/changelog
--- nsca-2.7.2/debian/changelog	2009-03-21 22:26:18.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/changelog	2010-11-28 11:52:51.000000000 +0100
@@ -1,3 +1,11 @@
+nsca (2.7.2+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix nsca starting as daemon when disabled in debconf and using an unusual
+    PID (Closes: #604053).
+
+ -- Xavier Oswald <[email protected]>  Sun, 28 Nov 2010 10:59:05 +0100
+
 nsca (2.7.2) unstable; urgency=low
 
   * New upstream version (Closes: #466353)
diff -Nru nsca-2.7.2/debian/nsca.init nsca-2.7.2+nmu1/debian/nsca.init
--- nsca-2.7.2/debian/nsca.init	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/nsca.init	2010-11-28 13:32:59.000000000 +0100
@@ -19,10 +19,7 @@
 
 ###
 
-# obviously if the daemon doesn't exist we should stop now
-if [ ! -x $DAEMON ]; then
-	exit 0
-fi
+test -f $DAEMON || exit 0
 
 # grab an arbitrary config setting from nsca.cfg
 get_config(){
@@ -48,8 +45,8 @@
 	SSD_STOPOPTS="--pidfile $PIDFILE"
 fi
 
-SSD_START="/sbin/start-stop-daemon --oknodo -S $SSD_STARTOPTS --exec $DAEMON"
-SSD_STOP="/sbin/start-stop-daemon --oknodo -K $SSD_STOPOPTS --exec $DAEMON"
+SSD_START="start-stop-daemon --start  --chuid nobody --oknodo -S $SSD_STARTOPTS --exec $DAEMON"
+SSD_STOP="start-stop-daemon --stop --oknodo -K $SSD_STOPOPTS --exec $DAEMON"
 
 die(){
 	echo $@
diff -Nru nsca-2.7.2/debian/po/cs.po nsca-2.7.2+nmu1/debian/po/cs.po
--- nsca-2.7.2/debian/po/cs.po	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/cs.po	2010-11-28 12:28:20.000000000 +0100
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2006-08-10 21:39+0200\n"
 "Last-Translator: Martin Sin <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/po/de.po nsca-2.7.2+nmu1/debian/po/de.po
--- nsca-2.7.2/debian/po/de.po	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/de.po	2010-11-28 12:28:20.000000000 +0100
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2007-03-10 18:06+0100\n"
 "Last-Translator: Helge Kreutzmann <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/po/es.po nsca-2.7.2+nmu1/debian/po/es.po
--- nsca-2.7.2/debian/po/es.po	2009-03-21 21:26:43.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/es.po	2010-11-28 12:28:20.000000000 +0100
@@ -36,6 +36,7 @@
 "PO-Revision-Date: 2009-02-01 12:13+0100\n"
 "Last-Translator: Fernando González de Requena <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,7 +55,10 @@
 "The nsca daemon is the process that handles results service checks sent via "
 "send_nsca on remote hosts.  Typically the nsca daemon is only needed on "
 "hosts that run the nagios daemon."
-msgstr "El demonio nsca es el proceso que maneja los resultados de la comprobación de servicios enviada a máquinas remotas a través de send_nsca. Normalmente sólo se necesita el demonio nsca en máquinas que ejecuten el demonio nagios."
+msgstr ""
+"El demonio nsca es el proceso que maneja los resultados de la comprobación "
+"de servicios enviada a máquinas remotas a través de send_nsca. Normalmente "
+"sólo se necesita el demonio nsca en máquinas que ejecuten el demonio nagios."
 
 #. Type: boolean
 #. Description
@@ -66,5 +70,10 @@
 "central nagios host, you should not choose this option.  If you wish to run "
 "nsca as a service through inetd/xinetd, you should also not choose this "
 "option."
-msgstr "Debería escoger esta opción si el sistema en el que está instalando nsca ejecuta tambien el demonio nagios. No debería escogerla si está instalando nsca en un sistema remoto «satélite» con la intención de enviar comprobaciones de servicios a un servidor central nagios. Tampoco debería escoger esta opción si desea ejecutar nsca como un servicio a través de inetd/xinetd."
-
+msgstr ""
+"Debería escoger esta opción si el sistema en el que está instalando nsca "
+"ejecuta tambien el demonio nagios. No debería escogerla si está instalando "
+"nsca en un sistema remoto «satélite» con la intención de enviar "
+"comprobaciones de servicios a un servidor central nagios. Tampoco debería "
+"escoger esta opción si desea ejecutar nsca como un servicio a través de "
+"inetd/xinetd."
diff -Nru nsca-2.7.2/debian/po/eu.po nsca-2.7.2+nmu1/debian/po/eu.po
--- nsca-2.7.2/debian/po/eu.po	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/eu.po	2010-11-28 12:28:20.000000000 +0100
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2008-04-10 11:50+0200\n"
 "Last-Translator: Piarres Beobide <[email protected]>\n"
 "Language-Team: Euskara <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/po/fi.po nsca-2.7.2+nmu1/debian/po/fi.po
--- nsca-2.7.2/debian/po/fi.po	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/fi.po	2010-11-28 12:28:20.000000000 +0100
@@ -6,6 +6,7 @@
 "PO-Revision-Date: 2008-04-19 23:14+0200\n"
 "Last-Translator: Esko Arajärvi <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/po/fr.po nsca-2.7.2+nmu1/debian/po/fr.po
--- nsca-2.7.2/debian/po/fr.po	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/fr.po	2010-11-28 12:28:20.000000000 +0100
@@ -7,8 +7,8 @@
 # /usr/share/doc/po-debconf/README-trans
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: nsca 2.5-2\n"
@@ -17,6 +17,7 @@
 "PO-Revision-Date: 2006-04-10 12:40+0200\n"
 "Last-Translator: Sylvain Archenault <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/po/gl.po nsca-2.7.2+nmu1/debian/po/gl.po
--- nsca-2.7.2/debian/po/gl.po	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/gl.po	2010-11-28 12:28:20.000000000 +0100
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2008-04-19 12:04+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/po/ja.po nsca-2.7.2+nmu1/debian/po/ja.po
--- nsca-2.7.2/debian/po/ja.po	2009-03-21 22:26:53.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/ja.po	2010-11-28 12:28:20.000000000 +0100
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2009-01-06 06:26+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/po/nl.po nsca-2.7.2+nmu1/debian/po/nl.po
--- nsca-2.7.2/debian/po/nl.po	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/nl.po	2010-11-28 12:28:20.000000000 +0100
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2007-10-19 20:24+0100\n"
 "Last-Translator: Bart Cornelis <[email protected]>\n"
 "Language-Team: debian-l10n-dutch <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/po/pt.po nsca-2.7.2+nmu1/debian/po/pt.po
--- nsca-2.7.2/debian/po/pt.po	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/pt.po	2010-11-28 12:28:20.000000000 +0100
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2007-08-02 02:58+0100\n"
 "Last-Translator: Américo Monteiro <[email protected]>\n"
 "Language-Team: Portuguese <[email protected]>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/po/ru.po nsca-2.7.2+nmu1/debian/po/ru.po
--- nsca-2.7.2/debian/po/ru.po	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/ru.po	2010-11-28 12:28:20.000000000 +0100
@@ -11,12 +11,13 @@
 "PO-Revision-Date: 2008-04-26 09:33+0400\n"
 "Last-Translator: Yuri Kozlov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: boolean
 #. Description
diff -Nru nsca-2.7.2/debian/po/sv.po nsca-2.7.2+nmu1/debian/po/sv.po
--- nsca-2.7.2/debian/po/sv.po	2009-03-21 22:26:53.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/po/sv.po	2010-11-28 12:28:20.000000000 +0100
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2008-10-26 20:00+0100\n"
 "Last-Translator: Martin Bagge <[email protected]>\n"
 "Language-Team: swedish <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru nsca-2.7.2/debian/postinst nsca-2.7.2+nmu1/debian/postinst
--- nsca-2.7.2/debian/postinst	2009-03-12 05:53:50.000000000 +0100
+++ nsca-2.7.2+nmu1/debian/postinst	2010-11-28 13:28:20.000000000 +0100
@@ -6,8 +6,7 @@
 
 case "$1" in
 configure)
-	db_get nsca/run-nsca-daemon
-	new_runnsca="$RET"
+	db_get nsca/run-nsca-daemon && new_runnsca="$RET"
 	;;
 abort-upgrade|abort-remove|abort-deconfigure)
 	exit 0
@@ -68,6 +67,10 @@
 		fi
 	fi
 
+	if [ "$new_runnsca" = "false" ]; then
+		exit 0
+	fi
+
 	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
 		invoke-rc.d nsca start
 	else

Attachment: signature.asc
Description: Digital signature

Reply via email to