[Tts-project] Bug#912749: tmpfiles.d/speech-dispatcher.conf: warnings: Line references path below legacy directory /var/run/...

[Christian Göttsche]

Control: tags -1 patch

/var/run is deprecated, see
https://www.debian.org/doc/debian-policy/ch-opersys.html#file-system-hierarchy

---
 debian/README.Debian              |  2 +-
 debian/patches/systemd-debian     |  4 ++--
 debian/rules                      |  2 +-
 debian/speech-dispatcher.init     |  2 +-
 debian/speech-dispatcher.postinst |  6 +++---
 debian/speech-dispatcher.postrm   |  2 +-
 debian/speech-dispatcher.tmpfile  | 10 +++++-----
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 8aa4fcf..4b8b9be 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -43,7 +43,7 @@ Dispatcher processes.

 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 --git a/debian/patches/systemd-debian b/debian/patches/systemd-debian
index 144bd76..304bde9 100644
--- a/debian/patches/systemd-debian
+++ b/debian/patches/systemd-debian
@@ -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 --git a/debian/rules b/debian/rules
index ee0727a..9664bc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_configure:
         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 --git a/debian/speech-dispatcher.init b/debian/speech-dispatcher.init
index 2529727..2a2306b 100644
--- a/debian/speech-dispatcher.init
+++ b/debian/speech-dispatcher.init
@@ -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
diff --git a/debian/speech-dispatcher.postinst
b/debian/speech-dispatcher.postinst
index aa09513..b70f398 100644
--- a/debian/speech-dispatcher.postinst
+++ b/debian/speech-dispatcher.postinst
@@ -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 @@ if ! id -u $USER_NAME >/dev/null 2>&1; then
           --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 --git a/debian/speech-dispatcher.postrm b/debian/speech-dispatcher.postrm
index 495d909..ffae30f 100644
--- a/debian/speech-dispatcher.postrm
+++ b/debian/speech-dispatcher.postrm
@@ -9,7 +9,7 @@ if test "$1" = "remove"; then
   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 --git a/debian/speech-dispatcher.tmpfile b/debian/speech-dispatcher.tmpfile
index c08af80..6c7f499 100644
--- a/debian/speech-dispatcher.tmpfile
+++ b/debian/speech-dispatcher.tmpfile
@@ -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
-- 
2.24.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-use-run-as-runtime-path.patch
Type: text/x-patch
Size: 5047 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/tts-project/attachments/20191207/6d68aca7/attachment.bin>