Bug#871451: stretch-pu: package up-imapproxy/1.2.8~svn20161210-2
I have attached the patch of the changes I intend to (have my sponsor)
upload. This is identical to the changes in 1.2.8~svn20161210-3 in
unstable and testing, except for the version number and date in the
changelog and setting a debian-branch in debian/gbp.conf.
--
Richard
diff -urN debian-2/changelog debian/changelog
--- debian-2/changelog 2016-12-13 18:44:17.000000000 -0600
+++ debian/changelog 2017-08-07 23:59:22.000000000 -0500
@@ -1,3 +1,11 @@
+up-imapproxy (1.2.8~svn20161210-2+deb9u1) stretch; urgency=medium
+
+ * Correct the service file.
+ Thanks to Marc Dequènes (Duck) (Closes: 868150)
+ * Move the pidfile to /run
+
+ -- Richard Laager <rlaager@wiktel.com> Mon, 07 Aug 2017 23:58:28 -0500
+
up-imapproxy (1.2.8~svn20161210-2) unstable; urgency=medium
[ Jose Luis Tallon ]
diff -urN debian-2/gbp.conf debian/gbp.conf
--- debian-2/gbp.conf 2016-12-13 18:44:17.000000000 -0600
+++ debian/gbp.conf 2017-08-07 23:57:54.000000000 -0500
@@ -1,4 +1,5 @@
[DEFAULT]
+debian-branch = stretch
pristine-tar = True
[buildpackage]
diff -urN debian-2/imapproxy.service debian/imapproxy.service
--- debian-2/imapproxy.service 2016-12-13 18:44:17.000000000 -0600
+++ debian/imapproxy.service 2017-07-13 20:12:23.000000000 -0500
@@ -8,3 +8,7 @@
Type=forking
ExecStartPre=/usr/share/imapproxy/prepare-chroot
ExecStart=/usr/sbin/imapproxyd -f /etc/imapproxy.conf
+PIDFile=/run/imapproxy.pid
+
+[Install]
+WantedBy=multi-user.target
diff -urN debian-2/manpages/imapproxyd.8 debian/manpages/imapproxyd.8
--- debian-2/manpages/imapproxyd.8 2016-12-13 18:44:17.000000000 -0600
+++ debian/manpages/imapproxyd.8 2017-08-07 23:58:20.000000000 -0500
@@ -48,7 +48,7 @@
option
.PP
Unless foreground_mode has been enabled, IMAP Proxy will write its PID to to
-a PID-file. It defaults to /var/run/imapproxy.pid, but can be overridden with
+a PID-file. It defaults to /run/imapproxy.pid, but can be overridden with
the
.I -p
option
diff -urN debian-2/patches/move-pidfile-to-run.patch debian/patches/move-pidfile-to-run.patch
--- debian-2/patches/move-pidfile-to-run.patch 1969-12-31 18:00:00.000000000 -0600
+++ debian/patches/move-pidfile-to-run.patch 2017-07-13 21:02:30.000000000 -0500
@@ -0,0 +1,19 @@
+Description: Move pidfile to /run
+ Debian is converting to /run. This particular transition (from /var/run to
+ /run) is currently optional.
+ .
+ See: https://wiki.debian.org/ReleaseGoals/RunDirectory
+Author: Richard Laager <rlaager@wiktel.com>
+Forwarded: no
+Last-Update: 2017-07-13
+--- a/include/imapproxy.h
++++ b/include/imapproxy.h
+@@ -182,7 +182,7 @@
+ #define DEFAULT_CONFIG_FILE "/etc/imapproxy.conf"
+ #endif
+ #ifndef DEFAULT_PID_FILE
+-#define DEFAULT_PID_FILE "/var/run/imapproxy.pid"
++#define DEFAULT_PID_FILE "/run/imapproxy.pid"
+ #endif
+
+ #define LITERAL_PASSWORD 1
diff -urN debian-2/patches/series debian/patches/series
--- debian-2/patches/series 2016-12-13 18:44:17.000000000 -0600
+++ debian/patches/series 2017-07-13 20:17:47.000000000 -0500
@@ -10,3 +10,4 @@
cleanup-names.patch
cleanup-readme.patch
cleanup-imapproxy_conf.patch
+move-pidfile-to-run.patch
Reply to: