--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: sysvinit@packages.debian.org
Control: affects -1 + src:sysvinit
Release Team,
Please consider unblocking package sysvinit
The version in sid fixes a regression recently reported in #1033311 (pidof not
matching pathnames which are symlinks) and also has a new debconf translation.
[ Reason ]
- cherry pick upstream patches to fix a regression caused by incorrect memory
initialisation (#1033311)
- New debconf Romanian translation (#1033723)
[ Impact ]
Regression in #1033311 would not be fixed and Romanian debconf translations
would not be available.
[ Tests ]
Reporter of #1033311 has tested the fix and confirmed resolution[1].
[ Risks ]
Although sysvinit-utils is Essential, I consider the risk is low and the benefit
of fixing #1033311 is significant.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiffs against the package in testing
[ Other info ]
The fix for #1033311 was uploaded in 3.06-3 and has already been in unstable for
5 days.
unblock sysvinit/3.06-4
Thanks
Mark
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1033311#149
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .changes but not in first
-----------------------------------------
-rw-r--r-- root/root /usr/lib/debug/.build-id/7d/b2c2611f9e478474cf82dfeab6aa760f65a8be.debug
Files in first .changes but not in second
-----------------------------------------
-rw-r--r-- root/root /usr/lib/debug/.build-id/f7/c7a26070fae0ea19e066675c08fa7e3bf05585.debug
Control files of package bootlogd: lines which differ (wdiff format)
--------------------------------------------------------------------
Version: [-3.06-2-] {+3.06-4+}
Control files of package bootlogd-dbgsym: lines which differ (wdiff format)
---------------------------------------------------------------------------
Depends: bootlogd (= [-3.06-2)-] {+3.06-4)+}
Version: [-3.06-2-] {+3.06-4+}
Control files of package initscripts: lines which differ (wdiff format)
-----------------------------------------------------------------------
Version: [-3.06-2-] {+3.06-4+}
Control files of package sysv-rc: lines which differ (wdiff format)
-------------------------------------------------------------------
Version: [-3.06-2-] {+3.06-4+}
Control files of package sysvinit-core: lines which differ (wdiff format)
-------------------------------------------------------------------------
Installed-Size: [-342-] {+343+}
Version: [-3.06-2-] {+3.06-4+}
Control files of package sysvinit-core-dbgsym: lines which differ (wdiff format)
--------------------------------------------------------------------------------
Depends: sysvinit-core (= [-3.06-2)-] {+3.06-4)+}
Version: [-3.06-2-] {+3.06-4+}
Control files of package sysvinit-utils: lines which differ (wdiff format)
--------------------------------------------------------------------------
Version: [-3.06-2-] {+3.06-4+}
Control files of package sysvinit-utils-dbgsym: lines which differ (wdiff format)
---------------------------------------------------------------------------------
Build-Ids: {+7db2c2611f9e478474cf82dfeab6aa760f65a8be+} f7694b57b3d2e7921327b4d215648310a9c63829 [-f7c7a26070fae0ea19e066675c08fa7e3bf05585-]
Depends: sysvinit-utils (= [-3.06-2)-] {+3.06-4)+}
Installed-Size: [-52-] {+53+}
Version: [-3.06-2-] {+3.06-4+}
diff -Nru sysvinit-3.06/debian/changelog sysvinit-3.06/debian/changelog
--- sysvinit-3.06/debian/changelog 2022-12-18 17:00:20.000000000 +0000
+++ sysvinit-3.06/debian/changelog 2023-04-03 07:25:22.000000000 +0100
@@ -1,3 +1,19 @@
+sysvinit (3.06-4) unstable; urgency=medium
+
+ * Add Romanian debconf translations with thanks to Remus-Gabriel Chelu
+ <remusgabriel.chelu@disroot.org>. (Closes: #1033723)
+
+ -- Mark Hindley <leepen@debian.org> Mon, 03 Apr 2023 07:25:22 +0100
+
+sysvinit (3.06-3) unstable; urgency=medium
+
+ * Cherry pick hunk from upstream to fix regression in pidof not matching
+ symlinks. (Closes: #1033311)
+ * Cherry pick upstream patch to fix memory initialisation in pidof.
+ (Closes: #1033311)
+
+ -- Mark Hindley <leepen@debian.org> Thu, 30 Mar 2023 13:59:53 +0100
+
sysvinit (3.06-2) unstable; urgency=medium
* Upload to unstable.
diff -Nru sysvinit-3.06/debian/patches/0001-Fix-pidof-not-following-symlinks-regression.patch sysvinit-3.06/debian/patches/0001-Fix-pidof-not-following-symlinks-regression.patch
--- sysvinit-3.06/debian/patches/0001-Fix-pidof-not-following-symlinks-regression.patch 1970-01-01 01:00:00.000000000 +0100
+++ sysvinit-3.06/debian/patches/0001-Fix-pidof-not-following-symlinks-regression.patch 2023-04-03 07:25:22.000000000 +0100
@@ -0,0 +1,27 @@
+From 93da64d13380b29fd330608493615f8877525494 Mon Sep 17 00:00:00 2001
+From: Jesse <jsmith@resonatingmedia.com>
+Date: Wed, 29 Mar 2023 10:34:45 -0300
+Subject: [PATCH] Accepted patch from Mark Hindle which avoids clearing
+ realpath information in pidof when trying to find matching executables.
+
+---
+ src/killall5.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/killall5.c b/src/killall5.c
+index 9ab0782a..6f7528ad 100644
+--- a/src/killall5.c
++++ b/src/killall5.c
+@@ -740,8 +740,8 @@ PIDQ_HEAD *pidof(char *prog)
+ return NULL;
+
+ /* Try to stat the executable. */
++ memset(real_path, 0, sizeof(real_path));
+ if ( (prog[0] == '/') && ( realpath(prog, real_path) ) ) {
+- memset(&real_path[0], 0, sizeof(real_path));
+ dostat++;
+ }
+
+--
+2.39.2
+
diff -Nru sysvinit-3.06/debian/patches/0008-Fixed-memory-initialization-error-in-pidof.patch sysvinit-3.06/debian/patches/0008-Fixed-memory-initialization-error-in-pidof.patch
--- sysvinit-3.06/debian/patches/0008-Fixed-memory-initialization-error-in-pidof.patch 1970-01-01 01:00:00.000000000 +0100
+++ sysvinit-3.06/debian/patches/0008-Fixed-memory-initialization-error-in-pidof.patch 2023-04-03 07:25:22.000000000 +0100
@@ -0,0 +1,21 @@
+From: Jesse <jsmith@resonatingmedia.com>
+Date: Fri, 24 Mar 2023 11:18:02 -0300
+Subject: Fixed memory initialization error in pidof.
+
+Fix provided by Markus Fischer.
+---
+ src/killall5.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/killall5.c b/src/killall5.c
+index ccc43e9..9aafd27 100644
+--- a/src/killall5.c
++++ b/src/killall5.c
+@@ -662,6 +662,7 @@ int readproc()
+ /* Try to stat the executable. */
+ snprintf(path, sizeof(path), "/proc/%s/exe", d->d_name);
+ p->pathname = (char *)xmalloc(PATH_MAX);
++ memset(p->pathname, 0, PATH_MAX);
+ if (readlink(path, p->pathname, PATH_MAX) == -1) {
+ p->pathname = NULL;
+ }
diff -Nru sysvinit-3.06/debian/patches/series sysvinit-3.06/debian/patches/series
--- sysvinit-3.06/debian/patches/series 2022-12-18 17:00:20.000000000 +0000
+++ sysvinit-3.06/debian/patches/series 2023-04-03 07:25:22.000000000 +0100
@@ -1,6 +1,8 @@
+0001-Fix-pidof-not-following-symlinks-regression.patch
set-po4a-keep.patch
11_run_nologin.patch
0002-Fix-FTBFS-on-kfreebsd-any.patch
0005-workaround-gcc-lintian.patch
fstab-decode.man.patch
fix-shutdown-time-docs.diff
+0008-Fixed-memory-initialization-error-in-pidof.patch
diff -Nru sysvinit-3.06/debian/po/ro.po sysvinit-3.06/debian/po/ro.po
--- sysvinit-3.06/debian/po/ro.po 1970-01-01 01:00:00.000000000 +0100
+++ sysvinit-3.06/debian/po/ro.po 2023-04-03 07:25:22.000000000 +0100
@@ -0,0 +1,69 @@
+# Mesajele în limba română pentru pachetul sysvinit.
+# Romanian translation of sysvinit.
+# Copyright © 2023 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the sysvinit package.
+#
+# Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2023.
+#
+# Cronologia traducerii fișierului „sysvinit”:
+# Traducerea inițială, făcută de R-GC, pentru versiunea sysvinit 3.06-2(2018-10-26).
+# Actualizare a traducerii pentru versiunea Y, făcută de X, Y(anul).
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sysvinit 3.06-2\n"
+"Report-Msgid-Bugs-To: sysvinit@packages.debian.org\n"
+"POT-Creation-Date: 2018-10-26 08:14+0000\n"
+"PO-Revision-Date: 2023-03-26 17:16+0200\n"
+"Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n"
+"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && "
+"n%100<=19) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 3.2.2\n"
+
+#. Type: boolean
+#. Description
+#: ../sysvinit-core.templates:1001
+msgid "Update getty pathnames and add hurd-console?"
+msgstr "Doriți să actualizați căile „getty” și adăugați consola „hurd”?"
+
+#. Type: boolean
+#. Description
+#: ../sysvinit-core.templates:1001
+msgid ""
+"Your /etc/inittab seems to use /libexec/getty as getty and/or to miss hurd-"
+"console entry. The default inittab has been changed, however your /etc/inittab "
+"has been modified. Note that sysvinit has not been used to boot an Hurd system "
+"for long, so any errors in that file would not have shown up earlier."
+msgstr ""
+"„/etc/inittab” pare să folosească «/libexec/getty» ca «getty» și/sau să-i "
+"lipsească intrarea „hurd-console”. Fișierul „inittab” implicit a fost schimbat, "
+"însă fișierul dvs. „/etc/inittab” nu a fost modificat. Rețineți că sysvinit nu "
+"a fost folosit pentru a porni un sistem Hurd de mult timp, astfel încât orice "
+"eroare din acel fișier nu ar fi apărut mai devreme."
+
+#. Type: boolean
+#. Description
+#: ../sysvinit-core.templates:1001
+msgid ""
+"If you allow this change, a backup will be stored in /etc/inittab.dpkg-old."
+msgstr ""
+"Dacă permiteți această modificare, o copie de rezervă va fi stocată în „/etc/"
+"inittab.dpkg-old”."
+
+#. Type: boolean
+#. Description
+#: ../sysvinit-core.templates:1001
+msgid ""
+"If you don't allow this change, an updated inittab will be written to /etc/"
+"inittab.dpkg-new. Please review the changes and update your /etc/inittab "
+"accordingly."
+msgstr ""
+"Dacă nu permiteți această modificare, un inittab actualizat va fi scris în „/"
+"etc/inittab.dpkg-new”. Vă rugăm să examinați modificările și să vă actualizați "
+"fișierul „/etc/inittab” în consecință."
--- End Message ---