Your message dated Sun, 7 Dec 2014 10:23:04 +0100
with message-id <[email protected]>
and subject line Re: Bug#772445: unblock: armagetronad/0.2.8.3.2-3
has caused the Debian Bug report #772445,
regarding unblock: armagetronad/0.2.8.3.2-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 [email protected]
immediately.)
--
772445: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772445
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Hello,
Please unblock package armagetronad.
The armagetronad-dedicated wrapper script contained some
bashisms that had to be removed since we were using /bin/sh already.
This could have led to unexpected behaviour. I have removed the whole
affected run_continuous function because I was not really convinced
about its usefulness. I believe real monitoring solutions such as
Monit or systemd's built-in features are able to do a better job in this
regard. As a consequence I had to make small adjustments to
/etc/default/armagetronad-dedicated and the init script as well
because a second PID file is not useful anymore.
This is Debian bug
https://bugs.debian.org/772191
I am attaching the debdiff against the version in testing to this bug
report.
unblock armagetronad/0.2.8.3.2-3
Regards,
Markus
diff -Nru armagetronad-0.2.8.3.2/debian/armagetronad-dedicated.default armagetronad-0.2.8.3.2/debian/armagetronad-dedicated.default
--- armagetronad-0.2.8.3.2/debian/armagetronad-dedicated.default 2014-08-28 06:10:51.000000000 +0200
+++ armagetronad-0.2.8.3.2/debian/armagetronad-dedicated.default 2014-12-06 11:03:15.000000000 +0100
@@ -9,7 +9,6 @@
LOGDIR=/var/log
# pidfile names.
NAME=armagetronad-dedicated
-STARTERPIDFILE=$PIDDIR/$NAME-starter.pid
MAINPIDFILE=$PIDDIR/$NAME.pid
# Logfile.
LOGFILE=$LOGDIR/$NAME.log
diff -Nru armagetronad-0.2.8.3.2/debian/armagetronad-dedicated.init armagetronad-0.2.8.3.2/debian/armagetronad-dedicated.init
--- armagetronad-0.2.8.3.2/debian/armagetronad-dedicated.init 2014-08-28 06:10:51.000000000 +0200
+++ armagetronad-0.2.8.3.2/debian/armagetronad-dedicated.init 2014-12-06 11:03:15.000000000 +0100
@@ -46,7 +46,14 @@
run()
{
- /sbin/start-stop-daemon --start --quiet --chuid $ARMAGETRONAD_USER --oknodo --pidfile $STARTERPIDFILE --nicelevel $NICENESS --exec $DAEMON >$LOGFILE &
+ start-stop-daemon \
+ --start \
+ --quiet \
+ --chuid $ARMAGETRONAD_USER \
+ --oknodo \
+ --pidfile $MAINPIDFILE \
+ --nicelevel $NICENESS \
+ --exec $DAEMON >$LOGFILE &
}
case "$1" in
@@ -61,11 +68,9 @@
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
- # Kill both the starter keepalive script and server.
- /sbin/start-stop-daemon --stop --pidfile $STARTERPIDFILE --quiet --oknodo $DAEMON
- /sbin/start-stop-daemon --stop --pidfile $MAINPIDFILE --quiet --oknodo $DAEMON.real
+ start-stop-daemon --stop --pidfile $MAINPIDFILE --quiet --oknodo || return 1
log_end_msg $?
- rm -f $STARTERPIDFILE $MAINPIDFILE
+ rm -f $MAINPIDFILE
;;
restart|force-reload)
$0 stop
diff -Nru armagetronad-0.2.8.3.2/debian/bin/armagetronad-dedicated armagetronad-0.2.8.3.2/debian/bin/armagetronad-dedicated
--- armagetronad-0.2.8.3.2/debian/bin/armagetronad-dedicated 2014-08-29 08:58:53.000000000 +0200
+++ armagetronad-0.2.8.3.2/debian/bin/armagetronad-dedicated 2014-12-06 11:03:15.000000000 +0100
@@ -20,35 +20,6 @@
echo Terminated
}
-run_continuous()
-{
- # local variable for keeping track of start times.
- local STARTDATE_LOG
- echo $$ > $STARTERPIDFILE
- while true; do
- STARTDATE=`date +%s`
- run
-
- # Give up if restarts come too quickly; ten per minute is suspicious.
- OLDESTSTART=${STARTDATE_LOG[1]}
- if [ ! -z "$OLDESTSTART" ]; then
- TIMESPENT=$(($STARTDATE - $OLDESTSTART))
- if [ ${TIMESPENT} -lt 60]; then
- echo "Stopping server, it is restarting too quickly."
- rm -f $STARTERPIDFILE
- rm -f $MAINPIDFILE
- exit
- fi
- fi
-
- # Keep log of past start dates.
- for f in 1 2 3 4 5 6 7 8 9; do
- next=$(( $f + 1))
- STARTDATE_LOG[$f]=${STARTDATE_LOG[$next]}
- done
- STARTDATE_LOG[10]=${STARTDATE}
- done
-}
# Still allow other arguments to be executed, e.g. --doc
if [ "$1" != "" ]; then
@@ -56,5 +27,5 @@
exit 0
fi
-# Run and keep-alive in case of crashes.
-run_continuous
+# Run the server
+run
diff -Nru armagetronad-0.2.8.3.2/debian/changelog armagetronad-0.2.8.3.2/debian/changelog
--- armagetronad-0.2.8.3.2/debian/changelog 2014-08-29 08:58:53.000000000 +0200
+++ armagetronad-0.2.8.3.2/debian/changelog 2014-12-06 11:03:15.000000000 +0100
@@ -1,3 +1,17 @@
+armagetronad (0.2.8.3.2-3) unstable; urgency=medium
+
+ * Fix all remaining bashisms in armagetronad-dedicated wrapper script by
+ removing the run_continuous function. Users are advised to use a real
+ monitoring solution like Monit instead.
+ As a consequence do not use a second PID file for the server and remove the
+ STARTERPIDFILE option from /etc/default/armagetron-dedicated because it is
+ useless now. (Closes: #772191)
+ * armagetronad.desktop: Fix lintian warning desktop-mime-but-no-exec-code by
+ adding %f parameter to Exec key. Add Forwarded header.
+ * debian/copyright: Fix wrong path to public-domain licensed files.
+
+ -- Markus Koschany <[email protected]> Sat, 06 Dec 2014 11:02:22 +0100
+
armagetronad (0.2.8.3.2-2) unstable; urgency=medium
* New maintainer Debian Games Team.
diff -Nru armagetronad-0.2.8.3.2/debian/copyright armagetronad-0.2.8.3.2/debian/copyright
--- armagetronad-0.2.8.3.2/debian/copyright 2014-08-28 06:10:51.000000000 +0200
+++ armagetronad-0.2.8.3.2/debian/copyright 2014-12-06 11:03:15.000000000 +0100
@@ -8,7 +8,7 @@
2000-2011, Armagetron Advanced development team
License: GPL-2+
-Files: src/binreloc/*
+Files: src/thirdparty/binreloc/*
Copyright: Mike Hearn <[email protected]>
Hongli Lai <[email protected]>
License: public-domain
diff -Nru armagetronad-0.2.8.3.2/debian/patches/desktop-file.patch armagetronad-0.2.8.3.2/debian/patches/desktop-file.patch
--- armagetronad-0.2.8.3.2/debian/patches/desktop-file.patch 2014-08-28 06:10:51.000000000 +0200
+++ armagetronad-0.2.8.3.2/debian/patches/desktop-file.patch 2014-12-06 11:03:15.000000000 +0100
@@ -2,17 +2,21 @@
Date: Tue, 26 Aug 2014 23:42:04 +0200
Subject: desktop file
+Forwarded: http://forums3.armagetronad.net/viewtopic.php?f=4&t=23750
---
- desktop/armagetronad.desktop.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ desktop/armagetronad.desktop.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/desktop/armagetronad.desktop.in b/desktop/armagetronad.desktop.in
-index eeee58b..82747b0 100644
+index eeee58b..8b5eb77 100644
--- a/desktop/armagetronad.desktop.in
+++ b/desktop/armagetronad.desktop.in
-@@ -3,9 +3,11 @@ Type=Application
+@@ -1,11 +1,13 @@
+ [Desktop Entry]
+ Type=Application
Name=@progtitle@@progtitle_server@
- Exec=@progname@
+-Exec=@progname@
++Exec=@progname@ %f
Comment=3d light cycle game
-Icon=@[email protected]
+Comment[de]=dreidimensionales Lichtradspiel
--- End Message ---
--- Begin Message ---
Hi,
On Sun, Dec 07, 2014 at 08:48:22AM +0100, Markus Koschany wrote:
> Please unblock package armagetronad.
Unblocked.
Cheers,
Ivo
--- End Message ---
