diff -Nru speech-dispatcher-0.9.1/debian/changelog speech-dispatcher-0.9.1/debian/changelog --- speech-dispatcher-0.9.1/debian/changelog 2019-12-10 20:03:15.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/changelog 2020-01-19 18:26:24.000000000 +0000 @@ -1,8 +1,27 @@ -speech-dispatcher (0.9.1-3ubuntu1) focal; urgency=medium +speech-dispatcher (0.9.1-4) unstable; urgency=medium - * Don't build speech-dispatcher-festival on i386, it'll be uninstallable. + [ Christian Göttsche ] + * README.Debian, patches/systemd-debian, rules, speech-dispatcher.init, + debian/speech-dispatcher.postinst, speech-dispatcher.postrm, + speech-dispatcher.tmpfile: Use /run instead of /var/run (Closes: #912749). + + [ Steve Langasek ] + * rules: Omit speech-dispatcher-festival on Ubuntu/i386 (Closes: #946554). + + [ Debian Janitor ] + * Trim trailing whitespace. + * debian/copyright: use spaces rather than tabs to start continuation + lines. + * Set upstream metadata fields: Bug-Submit (from ./configure), + Repository, Repository-Browse. + * Set upstream metadata fields: Bug-Database. - -- Steve Langasek Tue, 10 Dec 2019 20:03:15 +0000 + [ Samuel Thibault ] + * speech-dispatcher.init: Create cache dir as well (Closes: #948679). + * patches/no-generic: Prevent generic module from being loaded without a + specific config file. + + -- Samuel Thibault Sun, 19 Jan 2020 19:26:24 +0100 speech-dispatcher (0.9.1-3) unstable; urgency=medium @@ -680,7 +699,7 @@ * Move Python build dependencies from Build-Depends-Indep to Build-Depends; closes: #588107. * Standards 3.9.0 (no real change). - + -- Milan Zamazal Wed, 07 Jul 2010 13:12:13 +0200 speech-dispatcher (0.7-4) unstable; urgency=low @@ -753,7 +772,7 @@ doesn't exist. * init script: Call `start-stop-daemon --start' with --oknodo. * postinst: Don't create speech-dispatcher home directory. - * README.source added. + * README.source added. * debian/rules: Actually pass MAKEFLAGS and other variables to make invocations. * debian/rules: Don't override prefix on install, use DESTDIR instead. @@ -1115,4 +1134,3 @@ * Initial packaging. -- Milan Zamazal Fri, 7 Nov 2003 10:28:54 +0100 - diff -Nru speech-dispatcher-0.9.1/debian/control speech-dispatcher-0.9.1/debian/control --- speech-dispatcher-0.9.1/debian/control 2019-12-10 20:03:15.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/control 2019-12-07 13:59:46.000000000 +0000 @@ -1,8 +1,7 @@ Source: speech-dispatcher Section: sound Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian TTS Team +Maintainer: Debian TTS Team Uploaders: Paul Gevers , Samuel Thibault Build-Depends: diff -Nru speech-dispatcher-0.9.1/debian/copyright speech-dispatcher-0.9.1/debian/copyright --- speech-dispatcher-0.9.1/debian/copyright 2019-11-29 02:08:46.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/copyright 2019-12-16 19:49:31.000000000 +0000 @@ -4,8 +4,8 @@ Files: * Copyright: 2001-2012 Brailcom, o.p.s. - 2008, Bohdan R. Rau - 1995-2012, Free Software Foundation, Inc. + 2008, Bohdan R. Rau + 1995-2012, Free Software Foundation, Inc. License: GPL-2+ Files: doc/* @@ -41,8 +41,8 @@ src/api/c/libspeechd.h src/api/c/libspeechd.c Copyright: 2001-2010, Brailcom, o.p.s. - 2009, Marco Skambraks - 2009, Rui Batista + 2009, Marco Skambraks + 2009, Rui Batista License: LGPL-2.1+ Files: src/modules/festival_client.* diff -Nru speech-dispatcher-0.9.1/debian/patches/no-generic speech-dispatcher-0.9.1/debian/patches/no-generic --- speech-dispatcher-0.9.1/debian/patches/no-generic 1970-01-01 00:00:00.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/patches/no-generic 2020-01-12 16:39:10.000000000 +0000 @@ -0,0 +1,84 @@ +commit d94599143d67b76c943ebb3c2d0d86fcda435841 +Author: Samuel Thibault +Date: Sun Jan 12 17:19:46 2020 +0100 + + Prevent generic module from being loaded without a specific config file + +diff --git a/src/server/module.c b/src/server/module.c +index 44a83907..7f16b394 100644 +--- a/src/server/module.c ++++ b/src/server/module.c +@@ -96,9 +96,11 @@ FUNC_ERRORHANDLER(ignore_errors) + */ + GList *detect_output_modules(const char *dirname, const char *config_dirname) + { +- static const int FNAME_PREFIX_LENGTH = 3; ++#define FNAME_PREFIX "sd_" ++ static const int FNAME_PREFIX_LENGTH = strlen(FNAME_PREFIX); + DIR *module_dir = opendir(dirname); + struct dirent *entry; ++ char *module_name; + char **module_parameters; + GList *modules = NULL; + char *full_path; +@@ -130,7 +132,7 @@ GList *detect_output_modules(const char *dirname, const char *config_dirname) + continue; + } + +- if (strncmp(entry->d_name, "sd_", FNAME_PREFIX_LENGTH) ++ if (strncmp(entry->d_name, FNAME_PREFIX, FNAME_PREFIX_LENGTH) + || (entry->d_name[FNAME_PREFIX_LENGTH] == '\0')) { + MSG(1, + "Module discovery ignoring %s: malformed filename.", +@@ -138,24 +140,24 @@ GList *detect_output_modules(const char *dirname, const char *config_dirname) + continue; + } + +- module_parameters = g_malloc(4 * sizeof(char *)); +- module_parameters[0] = +- g_strdup(entry->d_name + FNAME_PREFIX_LENGTH); +- module_parameters[1] = g_strdup(entry->d_name); +- module_parameters[2] = +- g_strdup_printf("%s.conf", module_parameters[0]); +- module_parameters[3] = +- g_strdup_printf("%s/%s.log", SpeechdOptions.log_dir, +- module_parameters[0]); +- modules = g_list_append(modules, module_parameters); +- +- MSG(5, +- "Module name=%s being inserted into detected_modules list", +- module_parameters[0]); +- +- /* Special-case the generic module: autoload for the various +- * configurations */ +- if (strcmp(module_parameters[0], "generic") == 0) { ++ module_name = entry->d_name + FNAME_PREFIX_LENGTH; ++ if (strcmp(module_name, "generic") != 0) { ++ module_parameters = g_malloc(4 * sizeof(char *)); ++ module_parameters[0] = g_strdup(module_name); ++ module_parameters[1] = g_strdup(entry->d_name); ++ module_parameters[2] = ++ g_strdup_printf("%s.conf", module_parameters[0]); ++ module_parameters[3] = ++ g_strdup_printf("%s/%s.log", SpeechdOptions.log_dir, ++ module_parameters[0]); ++ modules = g_list_append(modules, module_parameters); ++ ++ MSG(5, ++ "Module name=%s being inserted into detected_modules list", ++ module_parameters[0]); ++ } else { ++ /* Special-case the generic module: autoload for the various ++ * configurations */ + full_path = spd_get_path("modules", config_dirname); + MSG(5, "Looking for generic variants configurations in %s", + full_path); +@@ -246,7 +248,7 @@ GList *detect_output_modules(const char *dirname, const char *config_dirname) + g_free(file_path); + + module_parameters = g_malloc(4 * sizeof(char *)); +- module_parameters[1] = g_strdup("sd_generic"); ++ module_parameters[1] = g_strdup(FNAME_PREFIX "generic"); + module_parameters[2] = g_strdup(entry->d_name); + entry->d_name[len - strlen(".conf")] = '\0'; + module_parameters[0] = g_strdup(entry->d_name); diff -Nru speech-dispatcher-0.9.1/debian/patches/series speech-dispatcher-0.9.1/debian/patches/series --- speech-dispatcher-0.9.1/debian/patches/series 2019-12-03 00:53:57.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/patches/series 2020-01-12 16:20:09.000000000 +0000 @@ -2,3 +2,4 @@ systemd-debian mbrola-paths man +no-generic diff -Nru speech-dispatcher-0.9.1/debian/patches/systemd-debian speech-dispatcher-0.9.1/debian/patches/systemd-debian --- speech-dispatcher-0.9.1/debian/patches/systemd-debian 2019-11-29 02:08:46.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/patches/systemd-debian 2019-12-07 16:44:57.000000000 +0000 @@ -10,8 +10,8 @@ Type=forking -ExecStart=@bindir@/speech-dispatcher -d +User=speech-dispatcher -+PIDFile=/var/run/speech-dispatcher/speech-dispatcher.pid -+ExecStart=@bindir@/speech-dispatcher -d --pid-file /var/run/speech-dispatcher/speech-dispatcher.pid ++PIDFile=/run/speech-dispatcher/speech-dispatcher.pid ++ExecStart=@bindir@/speech-dispatcher -d --pid-file /run/speech-dispatcher/speech-dispatcher.pid ExecReload=/bin/kill -HUP $MAINPID [Install] diff -Nru speech-dispatcher-0.9.1/debian/README.Debian speech-dispatcher-0.9.1/debian/README.Debian --- speech-dispatcher-0.9.1/debian/README.Debian 2019-11-29 02:08:46.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/README.Debian 2019-12-07 16:44:57.000000000 +0000 @@ -43,7 +43,7 @@ If you want to run Speech Dispatcher as a system wide process, set RUN option in /etc/default/speech-dispatcher to `yes', and set the SPEECHD_SOCKET environment -variable to /var/run/speech-dispatcher/speechd.sock before starting clients. +variable to /run/speech-dispatcher/speechd.sock before starting clients. * Log file permissions diff -Nru speech-dispatcher-0.9.1/debian/rules speech-dispatcher-0.9.1/debian/rules --- speech-dispatcher-0.9.1/debian/rules 2019-12-10 20:03:15.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/rules 2019-12-10 23:17:21.000000000 +0000 @@ -20,7 +20,7 @@ sed < config/modules/$$i.in > config/modules/$$i -e "s/\$$DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/" ; \ done dh_auto_configure -- --with-module-bindir=\$${prefix}/lib/speech-dispatcher-modules \ - pidpath=/var/run/speech-dispatcher/ $(NAS) + pidpath=/run/speech-dispatcher/ $(NAS) override_dh_auto_install: dh_auto_install --destdir=debian/tmp diff -Nru speech-dispatcher-0.9.1/debian/speech-dispatcher.init speech-dispatcher-0.9.1/debian/speech-dispatcher.init --- speech-dispatcher-0.9.1/debian/speech-dispatcher.init 2019-11-29 02:08:46.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/speech-dispatcher.init 2020-01-12 15:43:05.000000000 +0000 @@ -14,7 +14,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/speech-dispatcher -PIDFILE=/var/run/speech-dispatcher/speech-dispatcher.pid +PIDFILE=/run/speech-dispatcher/speech-dispatcher.pid NAME=speech-dispatcher DESC='Speech Dispatcher' USER=speech-dispatcher @@ -32,8 +32,10 @@ [ -e $SDDIR ] || ln -s $PIDDIR $SDDIR LOGDIR=$SDDIR/log [ -e $LOGDIR ] || ln -s /var/log/speech-dispatcher $LOGDIR - LOGDIR2=$PIDDIR/.cache/speech-dispatcher/log - [ -e $LOGDIR2 ] || ln -s /var/log/speech-dispatcher $LOGDIR2 + CACHEDIR=$SDDIR/.cache + [ -e $CACHEDIR ] || install -d -ospeech-dispatcher -gaudio -m750 $CACHEDIR + CACHEDIR2=$CACHEDIR/speech-dispatcher + [ -e $CACHEDIR2 ] || ln -s $SSDIR $CACHEDIR2 start-stop-daemon --oknodo --start --quiet --chuid $USER --pidfile $PIDFILE \ --exec $DAEMON -- --pid-file $PIDFILE } diff -Nru speech-dispatcher-0.9.1/debian/speech-dispatcher.postinst speech-dispatcher-0.9.1/debian/speech-dispatcher.postinst --- speech-dispatcher-0.9.1/debian/speech-dispatcher.postinst 2019-12-07 12:50:33.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/speech-dispatcher.postinst 2019-12-07 16:44:57.000000000 +0000 @@ -2,7 +2,7 @@ set -e USER_NAME=speech-dispatcher -HOME_DIR=/var/run/speech-dispatcher +HOME_DIR=/run/speech-dispatcher if ! id -u $USER_NAME >/dev/null 2>&1; then adduser --quiet --system --ingroup audio \ @@ -10,8 +10,8 @@ --shell /bin/false --disabled-login \ --gecos 'Speech Dispatcher' $USER_NAME elif ! test -d $HOME_DIR; then - if test -d /var/run/speechd; then - mv /var/run/speechd $HOME_DIR + if test -d /run/speechd; then + mv /run/speechd $HOME_DIR else mkdir $HOME_DIR fi diff -Nru speech-dispatcher-0.9.1/debian/speech-dispatcher.postrm speech-dispatcher-0.9.1/debian/speech-dispatcher.postrm --- speech-dispatcher-0.9.1/debian/speech-dispatcher.postrm 2019-12-07 12:50:41.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/speech-dispatcher.postrm 2019-12-07 16:44:57.000000000 +0000 @@ -9,7 +9,7 @@ if id -u $USER_NAME >/dev/null 2>&1; then deluser --quiet $USER_NAME fi - rm -rf /var/run/speech-dispatcher + rm -rf /run/speech-dispatcher fi if test "$1" = "purge"; then diff -Nru speech-dispatcher-0.9.1/debian/speech-dispatcher.tmpfile speech-dispatcher-0.9.1/debian/speech-dispatcher.tmpfile --- speech-dispatcher-0.9.1/debian/speech-dispatcher.tmpfile 2019-11-29 02:08:46.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/speech-dispatcher.tmpfile 2019-12-07 16:44:57.000000000 +0000 @@ -1,5 +1,5 @@ -d /var/run/speech-dispatcher 0750 speech-dispatcher audio - -d /var/run/speech-dispatcher/.cache 0750 speech-dispatcher audio - -L /var/run/speech-dispatcher/.speech-dispatcher - speech-dispatcher audio - /var/run/speech-dispatcher -L /var/run/speech-dispatcher/.cache/speech-dispatcher - speech-dispatcher audio - /var/run/speech-dispatcher -L /var/run/speech-dispatcher/log - speech-dispatcher audio - /var/log/speech-dispatcher +d /run/speech-dispatcher 0750 speech-dispatcher audio - +d /run/speech-dispatcher/.cache 0750 speech-dispatcher audio - +L /run/speech-dispatcher/.speech-dispatcher - speech-dispatcher audio - /run/speech-dispatcher +L /run/speech-dispatcher/.cache/speech-dispatcher - speech-dispatcher audio - /run/speech-dispatcher +L /run/speech-dispatcher/log - speech-dispatcher audio - /var/log/speech-dispatcher diff -Nru speech-dispatcher-0.9.1/debian/upstream/metadata speech-dispatcher-0.9.1/debian/upstream/metadata --- speech-dispatcher-0.9.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ speech-dispatcher-0.9.1/debian/upstream/metadata 2020-01-14 19:06:22.000000000 +0000 @@ -0,0 +1,4 @@ +Bug-Database: https://github.com/brailcom/speechd/issues +Bug-Submit: speechd-discuss@nongnu.org +Repository: https://github.com/brailcom/speechd.git +Repository-Browse: https://github.com/brailcom/speechd