tags 633038 + patch
thanks

On Thu, Jul 07, 2011 at 11:36:57PM +0100, Roger Leigh wrote:
> Source: sysklogd
> Version: 1.5-6.1
> Severity: important
> 
> Your package is currently using/lib/init/rw/sendsigs.omit.d
> which is now deprecated and pending removal.  Please update your
> package to use /run/sendsigs.omit.d with a versioned dependency
> on initscripts, as detailed below.

Patch attached.


Regards,
Roger

-- 
  .''`.  Roger Leigh
 : :' :  Debian GNU/Linux             http://people.debian.org/~rleigh/
 `. `'   Printing on GNU/Linux?       http://gutenprint.sourceforge.net/
   `-    GPG Public Key: 0x25BFB848   Please GPG sign your mail.
diff -urN sysklogd-1.5.original/debian/changelog sysklogd-1.5/debian/changelog
--- sysklogd-1.5.original/debian/changelog	2011-12-07 09:53:59.792743369 +0000
+++ sysklogd-1.5/debian/changelog	2011-12-07 10:02:03.998126346 +0000
@@ -1,3 +1,15 @@
+sysklogd (1.5-6.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * /run transition: sysklogd and klogd use /run/sendsigs.omit.d in
+    place of /lib/init/rw/sendsigs.omit.d.  Old files are migrated
+    from /lib/init/rw/sendsigs.omit.d to /run/sendsigs.omit.d in the
+    package postinsts, and both packages depend upon initscripts
+    (>= 2.88dsf-13.3) in order to guarantee the presence of
+    /run/sendsigs.omit.d (Closes: #633038).
+
+ -- Roger Leigh <rle...@debian.org>  Wed, 07 Dec 2011 10:01:28 +0000
+
 sysklogd (1.5-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -urN sysklogd-1.5.original/debian/control sysklogd-1.5/debian/control
--- sysklogd-1.5.original/debian/control	2011-12-07 09:53:59.792743369 +0000
+++ sysklogd-1.5/debian/control	2011-12-07 09:59:15.947999887 +0000
@@ -8,7 +8,7 @@
 Package: sysklogd
 Architecture: any
 Section: admin
-Depends: ${shlibs:Depends}, klogd | linux-kernel-log-daemon, adduser, lsb-base
+Depends: ${shlibs:Depends}, klogd | linux-kernel-log-daemon, adduser, lsb-base, initscripts (>= 2.88dsf-13.3)
 Conflicts: syslogd
 Provides: syslogd, system-log-daemon
 Replaces: syslogd
@@ -21,7 +21,7 @@
 Package: klogd
 Architecture: any
 Section: admin
-Depends: ${shlibs:Depends}, sysklogd | system-log-daemon, adduser, lsb-base
+Depends: ${shlibs:Depends}, sysklogd | system-log-daemon, adduser, lsb-base, initscripts (>= 2.88dsf-13.3)
 Conflicts: sysklogd (<= 1.3-33)
 Provides: linux-kernel-log-daemon
 Replaces: sysklogd
diff -urN sysklogd-1.5.original/debian/postinst sysklogd-1.5/debian/postinst
--- sysklogd-1.5.original/debian/postinst	2011-12-07 09:53:59.792743369 +0000
+++ sysklogd-1.5/debian/postinst	2011-12-07 09:58:07.487138722 +0000
@@ -54,6 +54,11 @@
 
     adduser --system --group --no-create-home --quiet syslog
 
+    # Migrate from /lib/init/rw to /run prior to restart
+    if [ -f /lib/init/rw/sendsigs.omit.d/sysklogd ]; then 
+	mv /lib/init/rw/sendsigs.omit.d/sysklogd /run/sendsigs.omit.d/sysklogd 
+    fi
+
     # restarting daemon
     #
     if [ -f /etc/init.d/sysklogd ]
diff -urN sysklogd-1.5.original/debian/postinst.klogd sysklogd-1.5/debian/postinst.klogd
--- sysklogd-1.5.original/debian/postinst.klogd	2011-12-07 09:53:59.792743369 +0000
+++ sysklogd-1.5/debian/postinst.klogd	2011-12-07 09:58:30.599429071 +0000
@@ -27,6 +27,11 @@
 
     adduser --system --quiet --group --no-create-home klog || true
 
+    # Migrate from /lib/init/rw to /run prior to restart
+    if [ -f /lib/init/rw/sendsigs.omit.d/klogd ]; then
+        mv /lib/init/rw/sendsigs.omit.d/klogd /run/sendsigs.omit.d/klogd
+    fi
+
     # restarting daemon
     #
     if [ -f /etc/init.d/klogd ]
diff -urN sysklogd-1.5.original/debian/postrm sysklogd-1.5/debian/postrm
--- sysklogd-1.5.original/debian/postrm	2011-12-07 09:53:59.792743369 +0000
+++ sysklogd-1.5/debian/postrm	2011-12-07 09:55:27.749461878 +0000
@@ -6,6 +6,6 @@
 then
     update-rc.d sysklogd remove >/dev/null
 
-    test ! -f /lib/init/rw/sendsigs.omit.d/sysklogd || \
-	rm -f /lib/init/rw/sendsigs.omit.d/sysklogd
+    test ! -f /run/sendsigs.omit.d/sysklogd || \
+	rm -f /run/sendsigs.omit.d/sysklogd
 fi
diff -urN sysklogd-1.5.original/debian/postrm.klogd sysklogd-1.5/debian/postrm.klogd
--- sysklogd-1.5.original/debian/postrm.klogd	2011-12-07 09:53:59.792743369 +0000
+++ sysklogd-1.5/debian/postrm.klogd	2011-12-07 09:54:40.017062927 +0000
@@ -7,6 +7,6 @@
   deluser --system --quiet klog || true
   update-rc.d klogd remove >/dev/null
 
-  test ! -f /lib/init/rw/sendsigs.omit.d/klogd || \
-      rm -f /lib/init/rw/sendsigs.omit.d/klogd
+  test ! -f /run/sendsigs.omit.d/klogd || \
+      rm -f /run/sendsigs.omit.d/klogd
 fi
diff -urN sysklogd-1.5.original/debian/rc sysklogd-1.5/debian/rc
--- sysklogd-1.5.original/debian/rc	2011-12-07 09:53:59.792743369 +0000
+++ sysklogd-1.5/debian/rc	2011-12-07 10:05:11.152510567 +0000
@@ -115,9 +115,10 @@
     fix_log_ownership
     start-stop-daemon --start --quiet --pidfile $pidfile --name syslogd --startas $binpath -- $SYSLOGD
     log_end_msg $?
-    test -d /lib/init/rw/sendsigs.omit.d || mkdir -p /lib/init/rw/sendsigs.omit.d
-    test ! -f /lib/init/rw/sendsigs.omit.d/sysklogd || rm -f /lib/init/rw/sendsigs.omit.d/sysklogd
-    ln -s $pidfile /lib/init/rw/sendsigs.omit.d/sysklogd
+    if [ -d /run/sendsigs.omit.d ]; then
+	rm -f /run/sendsigs.omit.d/sysklogd
+	ln -s $pidfile /run/sendsigs.omit.d/sysklogd
+    fi
     ;;
   stop)
     log_begin_msg "Stopping system log daemon..."

Reply via email to