tags 500259 + patch pending
thanks
Hi Jochen,
I'm NMU ing gmediaserver as below.
Kind regards
T.
diff -u gmediaserver-0.13.0/debian/changelog
gmediaserver-0.13.0/debian/changelog
--- gmediaserver-0.13.0/debian/changelog
+++ gmediaserver-0.13.0/debian/changelog
@@ -1,3 +1,15 @@
+gmediaserver (0.13.0-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Move signal changing until after the filescan so we actually
+ terminate when people think better of starting the service.
+ It will be missing a log message about being killed, but that
+ is better than to keep running because we would miss a log
+ message.
+ Closes: #500259
+
+ -- Thomas Viehmann <[EMAIL PROTECTED]> Sat, 11 Oct 2008 11:11:37 +0200
+
gmediaserver (0.13.0-3) unstable; urgency=low
* Fix stop levels in LSB header.
diff -u gmediaserver-0.13.0/debian/patches/00list
gmediaserver-0.13.0/debian/patches/00list
--- gmediaserver-0.13.0/debian/patches/00list
+++ gmediaserver-0.13.0/debian/patches/00list
@@ -3,0 +4 @@
+04_dont_blog_signals_if_not_processing_them.dpatch
only in patch2:
unchanged:
---
gmediaserver-0.13.0.orig/debian/patches/04_dont_blog_signals_if_not_processing_them.dpatch
+++
gmediaserver-0.13.0/debian/patches/04_dont_blog_signals_if_not_processing_them.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_dont_blog_signals_if_not_processing_them.dpatch by Thomas Viehmann
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't block signals before the (possibly long) scan during which
+## DP: they (in particular SIGTERM) would be ignored.
+## DP: See Debian bug #500259
+
[EMAIL PROTECTED]@
+--- gmediaserver-0.13.0~/src/main.c
++++ gmediaserver-0.13.0/src/main.c
+@@ -403,6 +403,17 @@
+ if (!background)
+ write_pid_file(pidfilename, getpid(), false);
+
++ if (!init_metadata()) {
++ finish_logging(false);
++ exit(EXIT_FAILURE);
++ }
++
++ if (!scan_entries(argv+optind, argc-optind, 0)) {
++ finish_metadata();
++ finish_logging(false);
++ exit(EXIT_FAILURE);
++ }
++
+ signalaction.sa_handler = dummy_signal_handler;
+ if (sigemptyset(&signalaction.sa_mask) < 0)
+ die(_("cannot empty signal set - %s\n"), errstr);
+@@ -428,17 +439,6 @@
+ if (sigprocmask(SIG_BLOCK, &signalset, NULL) < 0)
+ die(_("cannot block signals - %s\n"), errstr);
+
+- if (!init_metadata()) {
+- finish_logging(false);
+- exit(EXIT_FAILURE);
+- }
+-
+- if (!scan_entries(argv+optind, argc-optind, 0)) {
+- finish_metadata();
+- finish_logging(false);
+- exit(EXIT_FAILURE);
+- }
+-
+ init_contentdir();
+
+ init_upnp(listenip, listenport);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
