[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#692496: marked as done (unblock: couriergraph/0.25-4.3)

Your message dated Mon, 12 Nov 2012 20:13:08 +0100
with message-id <20121112191308.GN17465@radis.cristau.org>
and subject line Re: Bug#692496: unblock: couriergraph/0.25-4.3
has caused the Debian Bug report #692496,
regarding unblock: couriergraph/0.25-4.3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
692496: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692496
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi Release-Team

Please unblock package couriergraph

I did a NMU upload for couriergraph.

The upload addresses two RC bugs: One was opened already by Thomas
Goirand <zigo@debian.org>: #689884.

The binary package shipped /var/run. /var/run/servergraph is now
created in initscript.

#692157: It was previously possible to start multiple instances of the
couriergraph daemon. I tried to workaround this checking if pid file
is present and then don't start another instance.

Furhermore a Brazilian Portuguese debconf templates translation update
was added.

Would it be possible to unblock the package for wheezy?

Attached is the debdiff against the package in testing.

unblock couriergraph/0.25-4.2

Regards,
Salvatore

- -- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCgAGBQJQmWxiAAoJEHidbwV/2GP+GSUP/3NPtVZ0m8AWEYJcWJgbxomf
VBCyRm5YZzzm6t4t1RH7l78XU5eEbec0zNkj1pZsAZdlrAYE9IccYGIF6JQSJQab
I5BJl1iEGgTY5/OCq5UVAtLZGmh3GrrsW1hJmIuEW6SljxlCWVhhx9gGYxaQ4D9a
HlqDVAvRt0H9vaCh2IyQo+/8Z64TdVHh5MZ8L0hq58GN77Aq7pdSNTcq2Z4duVaI
10FqTQGN7WvJmEjsQ50pRAp6O7kFDr5AdkZJdZ+vES8hdkXcrwXrbOu0rexKHwxU
MIuNxBI3hH/MiPLStEoiQkEiEuXuRWUUSWmZ4l0M5pswzfCbEDXmSxyPAIygWV71
7nu/Ld2Ts1qfAYxP+ouDlZjkj6O8rV3FHdjej1jVyBVJUmufRgN97nz3zSs21CLj
mIfmH+To8uBPepfFtzfSyS+6WAvgJdmooBIPe/Ze3zhUU7TE4ATxrCCk7Y3iEFFT
GrDrZ3S5N/2IPE8RmJCuuDFw/p9t4FqhhhLHj+UOdS25zqZPDFVqNeQQcniaxd3i
WDJQ1x9x6NXuZwoa/GasbvVnTnlfFJOUSw1FIGAuEz8NVkl+NiKYyjZqORYQSfwR
nxAj9+pSWcWGr3BwryLiQLVtydQQG01xoUpMANlbiGWMIuuaDz1bpeSNEsUZH+CM
F94oJLjpCl4m1ER7S0c6
=dyNC
-----END PGP SIGNATURE-----

Base version: couriergraph_0.25-4.1 from testing
Target version: couriergraph_0.25-4.2 from unstable

No hints in place.

 changelog   |   17 +++++++++++++++++
 dirs        |    1 -
 init        |   24 ++++++++++++++++++------
 po/pt_BR.po |   50 +++++++++++++++++++++-----------------------------
 postinst    |    4 ----
 5 files changed, 56 insertions(+), 40 deletions(-)

diff -u couriergraph-0.25/debian/changelog couriergraph-0.25/debian/changelog
--- couriergraph-0.25/debian/changelog
+++ couriergraph-0.25/debian/changelog
@@ -1,3 +1,20 @@
+couriergraph (0.25-4.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't provide /var/run/servergraph in binary package.
+    Fix "Ships a folder in /var/run or /var/lock (Policy Manual section
+    9.3.2)". Create /var/run/servergraph in initscript if
+    /var/run/servergraph is not present.
+    Thanks to Thomas Goirand <zigo@debian.org> (Closes: #689884)
+  * Check if daemon pid file is present and don't start daemon.
+    Check if daemon pid is present. If pid file is present assume the daemon
+    is still running and do not start another instance.
+    This is otherwise a Debian Policy 9.3.2 violation. (Closes: #692157)
+  * Update Brazilian Portuguese debconf templates translation.
+    Thanks to Adriano Rafael Gomes <adrianorg@gmail.com> (Closes: #662169)
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Fri, 02 Nov 2012 21:22:11 +0100
+
 couriergraph (0.25-4.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u couriergraph-0.25/debian/dirs couriergraph-0.25/debian/dirs
--- couriergraph-0.25/debian/dirs
+++ couriergraph-0.25/debian/dirs
@@ -4 +3,0 @@
-var/run/servergraph
diff -u couriergraph-0.25/debian/init couriergraph-0.25/debian/init
--- couriergraph-0.25/debian/init
+++ couriergraph-0.25/debian/init
@@ -14,7 +14,8 @@
 DESC="Courier login Statistics"
 DAEMON=/usr/sbin/couriergraph.pl
 
-PIDFILE=/var/run/servergraph/couriergraph.pid
+PIDDIR=/var/run/servergraph
+PIDFILE=$PIDDIR/couriergraph.pid
 RRD_DIR=/var/lib/couriergraph
 RRD_NAME=couriergraph
 
@@ -23,14 +24,25 @@
 if [ -f $CONFIG ]; then
         . $CONFIG
 fi
- 
+
+if [ ! -d $PIDDIR ]; then
+	mkdir -p $PIDDIR
+	chown daemon:root $PIDDIR
+fi
+
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--exec $DAEMON -N 15 -c daemon:adm -- \
-		-l $MAIL_LOG -d --daemon_rrd=$RRD_DIR --rrd_name=$RRD_NAME
-	echo "$NAME."
+	# If pid file is present the daemon is probably running
+	if [ -f "$PIDFILE" ]; then
+		echo "already running."
+		exit 1
+	else
+		start-stop-daemon --start --quiet --pidfile $PIDFILE \
+			--exec $DAEMON -N 15 -c daemon:adm -- \
+			-l $MAIL_LOG -d --daemon_rrd=$RRD_DIR --rrd_name=$RRD_NAME
+		echo "$NAME."
+	fi
   ;;
 
   stop)
diff -u couriergraph-0.25/debian/postinst couriergraph-0.25/debian/postinst
--- couriergraph-0.25/debian/postinst
+++ couriergraph-0.25/debian/postinst
@@ -27,7 +27,6 @@
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
-RUNDIR=/var/run/servergraph
 DATADIR=/var/lib/couriergraph
 CACHEDIR=/var/cache/couriergraph
 DEFAULTS=/etc/default/couriergraph
@@ -35,9 +34,6 @@
 case "$1" in
     configure)
 
-	mkdir -p $RUNDIR || true
-	chown daemon:root $RUNDIR
-
 	if [ ! -d $DATADIR ]; then mkdir $DATADIR; fi
 	chown root:adm $DATADIR
 	chmod 775 $DATADIR
diff -u couriergraph-0.25/debian/po/pt_BR.po couriergraph-0.25/debian/po/pt_BR.po
--- couriergraph-0.25/debian/po/pt_BR.po
+++ couriergraph-0.25/debian/po/pt_BR.po
@@ -1,25 +1,19 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /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.
+# Debconf translations for couriergraph.
+# Copyright (C) 2012 THE couriergraph'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the couriergraph package.
+# André Luís Lopes <andrelop@debian.org>, 2004.
+# Adriano Rafael Gomes <adrianorg@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: couriergraph\n"
+"Project-Id-Version: couriergraph 0.25-4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-01-15 23:41+0100\n"
-"PO-Revision-Date: 2004-10-19 18:34+0200\n"
-"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
-"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2012-02-26 13:39-0300\n"
+"Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +22,7 @@
 #. Description
 #: ../templates:1001
 msgid "Should CourierGraph start on boot?"
-msgstr "O CourierGraph deve ser iniciado na inicialização da máquina ?"
+msgstr "O CourierGraph deve ser iniciado na inicialização da máquina?"
 
 #. Type: boolean
 #. Description
@@ -37,9 +31,9 @@
 "Couriergraph can start on boot time as a daemon. Then it will monitor your "
 "mail logfile for changes. This is recommended."
 msgstr ""
-"O CourierGraph pode ser iniciado na inicialização da máquna como um daemon. "
-"Assim o mesmo irá monitorar seu arquivo de logs de e-mails em busca de "
-"mudanças. Este é o método recomendado."
+"O CourierGraph pode ser iniciado na inicialização da máquina como um daemon. "
+"Assim, ele monitorará seu arquivo de log de e-mails em busca de mudanças. "
+"Esse é o método recomendado."
 
 #. Type: boolean
 #. Description
@@ -53,9 +47,8 @@
 #. Type: string
 #. Description
 #: ../templates:2001
-#, fuzzy
 msgid "Logfile to be used by couriergraph:"
-msgstr "Qual arquivo de log deverá ser usado pelo couriergraph ?"
+msgstr "Arquivo de log para ser usado pelo couriergraph:"
 
 #. Type: string
 #. Description
@@ -67,20 +60,19 @@
-"Informe o arquivo de log que deverá ser usado paar criar as bases de dados "
-"para o couriergraph. Em caso de dúvidas, mantenha em branco."
+"Informe o arquivo de log que deverá ser usado para criar as bases de dados "
+"para o couriergraph. Em caso de dúvidas, mantenha o valor padrão."
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
 msgid "Remove RRD files on purge?"
-msgstr "Remover arquivo RRD na remoção do pacote ?"
+msgstr "Remover arquivos RRD ao expurgar o pacote?"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#, fuzzy
 msgid ""
 "Couriergraph keeps its database files under /var/lib/couriergraph. State "
 "whether this directory should be removed completely on purge or not."
 msgstr ""
 "O CourierGraph mantém seus arquivos de bases de dados sob o diretório /var/"
-"lib/couriergraph. Esse diretório deverá ser completamente removido quando o "
-"pacote couriergraph for removido ?"
+"lib/couriergraph. Indique se esse diretório deverá ser completamente "
+"removido quando o pacote couriergraph for expurgado."

--- End Message ---
--- Begin Message --- 
On Mon, Nov 12, 2012 at 19:20:58 +0100, Salvatore Bonaccorso wrote:

> Control: retitle -1 unblock: couriergraph/0.25-4.3
> 
> Hi Julien, Hi Jose
> 
> I have uploade the 0.25-4.3 now directly containing the change to the
> init-script.
> 
> @Jose, have uploaded directly without delaying as I have introduced
> the problem mentioned by Julien in my 0.25-4.2 NMU.
> 
> Attached is the final debdiff.
> 
Unblocked.  The init script's stop action could still do with a fix to
use --name, like start, to avoid killing an unrelated process.  And
probably --retry to wait for the process to actually die, and not need
the sleep in restart.

Oh how I wish sysvinit would just die.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: