Merge ~ogayot/ubuntu/+source/sysvinit:merge-lp2018596-mantic into ubuntu/+source/sysvinit:ubuntu/devel

[Olivier Gayot]

Unmerged commits

c5340e8... by Olivier Gayot on 2023-05-06

update-maintainer

9d7a972... by Olivier Gayot on 2023-05-06

reconstruct-changelog

df46bc4... by Olivier Gayot on 2023-05-06

merge-changelogs

d5a5210... by Olivier Gayot on 2023-02-16

d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu

79e137f... by Olivier Gayot on 2023-02-16

Adjust debian/rules to fix an arch: all build failure

898b912... by Olivier Gayot on 2023-02-16

When building for Ubuntu, skip all binaries except for sysvinit-utils

Fix absence of changelog.Debian.gz in sysvinit-utils binary package

af20629... by Mark Hindley <email address hidden> on 2023-04-03

3.06-4 (patches unapplied)

Imported using git-ubuntu import.

fd5546f... by Mark Hindley <email address hidden> on 2023-03-30

3.06-3 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index a05f3c6..319c2ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+<<<<<<< debian/changelog
+=======
+sysvinit (3.06-4ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2018596). Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils
+    - Adjust debian/rules to fix an arch: all build failure
+    - d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
+
+ -- Olivier Gayot <[e-mail]>  Sun, 07 May 2023 01:04:33 +0200
+
+sysvinit (3.06-4) unstable; urgency=medium
+
+  * Add Romanian debconf translations with thanks to Remus-Gabriel Chelu
+    <[e-mail]>.  (Closes: #1033723)
+
+ -- Mark Hindley <[e-mail]>  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 <[e-mail]>  Thu, 30 Mar 2023 13:59:53 +0100
+
+>>>>>>> debian/changelog
 sysvinit (3.06-2ubuntu1) lunar; urgency=medium
 
   * Merge with Debian unstable (LP: #2007421). Remaining changes:
diff --git a/debian/patches/0001-Fix-pidof-not-following-symlinks-regression.patch b/debian/patches/0001-Fix-pidof-not-following-symlinks-regression.patch
new file mode 100644
index 0000000..80184a0
--- /dev/null
+++ b/debian/patches/0001-Fix-pidof-not-following-symlinks-regression.patch
@@ -0,0 +1,27 @@
+From 93da64d13380b29fd330608493615f8877525494 Mon Sep 17 00:00:00 2001
+From: Jesse <[e-mail]>
+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 --git a/debian/patches/0008-Fixed-memory-initialization-error-in-pidof.patch b/debian/patches/0008-Fixed-memory-initialization-error-in-pidof.patch
new file mode 100644
index 0000000..efc553b
--- /dev/null
+++ b/debian/patches/0008-Fixed-memory-initialization-error-in-pidof.patch
@@ -0,0 +1,21 @@
+From: Jesse <[e-mail]>
+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 --git a/debian/patches/series b/debian/patches/series
index bc9942e..136598d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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 --git a/debian/po/ro.po b/debian/po/ro.po
new file mode 100644
index 0000000..e560551
--- /dev/null
+++ b/debian/po/ro.po
@@ -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 <[e-mail]>, 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: [e-mail]\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 <[e-mail]>\n"
+"Language-Team: Romanian <[e-mail]>\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ță."