base-passwd: Regenerate the patches
PATCH v2 1/2 base-passwd: Regenerate the patches
---
PATCHv2: No changes.
.../0001-Add-a-shutdown-group.patch | 26 +++++++++++++++
...nstead-of-bin-bash-for-the-root-user.patch | 23 +++++++++++++
...t-since-we-do-not-have-an-etc-shadow.patch | 21 ++++++++++++
...nput-group-for-the-dev-input-devices.patch | 23 +++++++++++++
.../{kvm.patch => 0005-Add-kvm-group.patch} | 2 +-
...006-Disable-shell-for-default-users.patch} | 5 +--
...able-generation-of-the-documentation.patch | 32 +++++++++++++++++++
.../base-passwd/add_shutdown.patch | 19 -----------
.../base-passwd/disable-docs.patch | 24 --------------
.../base-passwd/base-passwd/input.patch | 22 -------------
.../base-passwd/base-passwd/nobash.patch | 15 ---------
.../base-passwd/base-passwd/noshadow.patch | 14 --------
.../base-passwd/base-passwd_3.5.29.bb | 14 ++++----
13 files changed, 134 insertions(+), 106 deletions(-)
create mode 100644 meta/recipes-core/base-passwd/base-passwd/0001-Add-a-shutdown-group.patch
create mode 100644 meta/recipes-core/base-passwd/base-passwd/0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch
create mode 100644 meta/recipes-core/base-passwd/base-passwd/0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch
create mode 100644 meta/recipes-core/base-passwd/base-passwd/0004-Add-an-input-group-for-the-dev-input-devices.patch
rename meta/recipes-core/base-passwd/base-passwd/{kvm.patch => 0005-Add-kvm-group.patch} (88%)
rename meta/recipes-core/base-passwd/base-passwd/{disable-shell.patch => 0006-Disable-shell-for-default-users.patch} (96%)
create mode 100644 meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch
delete mode 100644 meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch
delete mode 100644 meta/recipes-core/base-passwd/base-passwd/disable-docs.patch
delete mode 100644 meta/recipes-core/base-passwd/base-passwd/input.patch
delete mode 100644 meta/recipes-core/base-passwd/base-passwd/nobash.patch
delete mode 100644 meta/recipes-core/base-passwd/base-passwd/noshadow.patchmeta/recipes-core/base-passwd/base-passwd/0001-Add-a-shutdown-group.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 8f3ace87df3aaad85946c22cae240532ea3e73b8 Mon Sep 17 00:00:00 2001 +From: Saul Wold <[email protected]> +Date: Fri, 29 Apr 2022 13:32:27 +0000 +Subject: [PATCH] Add a shutdown group + +We need to have a shutdown group to allow the shutdown icon to work +correctly. Any users that want to use shutdown like the xuser should +be added to this group. + +Upstream-Status: Inappropriate [Embedded] +Signed-off-by: Saul Wold <[email protected]> +--- + group.master | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/group.master b/group.master +index ad1dd2d..1b5e2fb 100644 +--- a/group.master ++++ b/group.master +@@ -35,5 +35,6 @@ sasl:*:45: + plugdev:*:46: + staff:*:50: + games:*:60: ++shutdown:*:70: + users:*:100: + nogroup:*:65534:
meta/recipes-core/base-passwd/base-passwd/0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch new file +23 -0
@@ -0,0 +1,23 @@ +From 4411fc0df77566d52bee11ec0bad4be30a96e99e Mon Sep 17 00:00:00 2001 +From: Scott Garman <[email protected]> +Date: Fri, 29 Apr 2022 13:32:27 +0000 +Subject: [PATCH] Use /bin/sh instead of /bin/bash for the root user + +/bin/bash may not be included in some images such as minimal. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Scott Garman <[email protected]> +--- + passwd.master | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/passwd.master b/passwd.master +index a01a6aa..b54ff51 100644 +--- a/passwd.master ++++ b/passwd.master +@@ -1,4 +1,4 @@ +-root:*:0:0:root:/root:/bin/bash ++root:*:0:0:root:/root:/bin/sh + daemon:*:1:1:daemon:/usr/sbin:/bin/sh + bin:*:2:2:bin:/bin:/bin/sh + sys:*:3:3:sys:/dev:/bin/sh
meta/recipes-core/base-passwd/base-passwd/0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch new file +21 -0
@@ -0,0 +1,21 @@ +From 13a1a284a134d18a454625a5b4485c0d99079ae9 Mon Sep 17 00:00:00 2001 +From: Scott Garman <[email protected]> +Date: Fri, 29 Apr 2022 13:32:28 +0000 +Subject: [PATCH] Remove "*" for root since we do not have an /etc/shadow + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Scott Garman <[email protected]> +--- + passwd.master | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/passwd.master b/passwd.master +index b54ff51..e1c32ff 100644 +--- a/passwd.master ++++ b/passwd.master +@@ -1,4 +1,4 @@ +-root:*:0:0:root:/root:/bin/sh ++root::0:0:root:/root:/bin/sh + daemon:*:1:1:daemon:/usr/sbin:/bin/sh + bin:*:2:2:bin:/bin:/bin/sh + sys:*:3:3:sys:/dev:/bin/sh
meta/recipes-core/base-passwd/base-passwd/0004-Add-an-input-group-for-the-dev-input-devices.patch new file +23 -0
@@ -0,0 +1,23 @@ +From c5f012750f8102ff54af73ccc2d2b7bfa1f26db4 Mon Sep 17 00:00:00 2001 +From: Darren Hart <[email protected]> +Date: Fri, 29 Apr 2022 13:32:28 +0000 +Subject: [PATCH] Add an input group for the /dev/input/* devices + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Darren Hart <[email protected]> +--- + group.master | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/group.master b/group.master +index 1b5e2fb..cea9d60 100644 +--- a/group.master ++++ b/group.master +@@ -12,6 +12,7 @@ uucp:*:10: + man:*:12: + proxy:*:13: + kmem:*:15: ++input:*:19: + dialout:*:20: + fax:*:21: + voice:*:22:
meta/recipes-core/base-passwd/base-passwd/0005-Add-kvm-group.patch renamed from meta/recipes-core/base-passwd/base-passwd/kvm.patch +1 -1
@@ -1,4 +1,4 @@ -From 6355278b9f744291864c373a32a8da8f84aaaf37 Mon Sep 17 00:00:00 2001 +From 6cf19461fb31d7a7a3010629aae9aab49c26a01b Mon Sep 17 00:00:00 2001 From: Jacob Kroon <[email protected]> Date: Wed, 30 Jan 2019 04:53:48 +0000 Subject: [PATCH] Add kvm group
meta/recipes-core/base-passwd/base-passwd/0006-Disable-shell-for-default-users.patch renamed from meta/recipes-core/base-passwd/base-passwd/disable-shell.patch +1 -4
@@ -1,4 +1,4 @@ -From 91e0db96741359173ddf2be083aafcc1a3c32472 Mon Sep 17 00:00:00 2001 +From f35eb24213475d3024ad45297fd855c6abfbbac0 Mon Sep 17 00:00:00 2001 From: Jiaqing Zhao <[email protected]> Date: Mon, 18 Apr 2022 11:22:43 +0800 Subject: [PATCH] Disable shell for default users
@@ -52,6 +52,3 @@ index e1c32ff..0cd5ffd 100644 +irc:*:39:39:ircd:/var/run/ircd:/sbin/nologin +gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/sbin/nologin +nobody:*:65534:65534:nobody:/nonexistent:/sbin/nologin --- -2.32.0 -
meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 7ccf8227cb10d78f1958a7a7feed75a390a6b133 Mon Sep 17 00:00:00 2001 +From: Saul Wold <[email protected]> +Date: Fri, 29 Apr 2022 13:32:28 +0000 +Subject: [PATCH] Disable generation of the documentation + +It uses tools currently not supported by OE-Core. It uses sgmltools +and po4a. + +Upstream-Status: Inappropriate [OE-Core specific] +Signed-off-by: Saul Wold <[email protected]> +--- + Makefile.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 9ba097c..d3ea47c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -25,13 +25,10 @@ gen_configure = config.cache config.status config.log \ + confdefhs.h config.h Makefile + + all: update-passwd +- $(MAKE) -C doc all +- $(MAKE) -C man all + + install: all + mkdir -p $(DESTDIR)$(sbindir) + $(INSTALL) update-passwd $(DESTDIR)$(sbindir)/ +- $(MAKE) -C man install + + update-passwd.o: version.h +
meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch deleted +0 -19
@@ -1,19 +0,0 @@ - -We need to have a shutdown group to allow the shutdown icon -to work correctly. Any users that want to use shutdown like -the xuser should be added to this group. - -Upstream-Status: Inappropriate [Embedded] - -Signed-off-by: Saul Wold <[email protected]> -Index: base-passwd-3.5.26/group.master -=================================================================== ---- base-passwd-3.5.26.orig/group.master -+++ base-passwd-3.5.26/group.master -@@ -36,5 +36,6 @@ sasl:*:45: - plugdev:*:46: - staff:*:50: - games:*:60: -+shutdown:*:70: - users:*:100: - nogroup:*:65534:
meta/recipes-core/base-passwd/base-passwd/disable-docs.patch deleted +0 -24
@@ -1,24 +0,0 @@ -Disable documentation for now as it uses tools currently not supported -by OE-Core. It uses sgmltools and po4a. - -Upstream-Status: Inappropriate [OE-Core specific] -Signed-off-by: Saul Wold <[email protected]> - -Index: base-passwd-3.5.28/Makefile.in -=================================================================== ---- base-passwd-3.5.28.orig/Makefile.in -+++ base-passwd-3.5.28/Makefile.in -@@ -25,13 +25,10 @@ gen_configure = config.cache config.stat - confdefhs.h config.h Makefile - - all: update-passwd -- $(MAKE) -C doc all -- $(MAKE) -C man all - - install: all - mkdir -p $(DESTDIR)$(sbindir) - $(INSTALL) update-passwd $(DESTDIR)$(sbindir)/ -- $(MAKE) -C man install - - update-passwd.o: version.h -
meta/recipes-core/base-passwd/base-passwd/input.patch deleted +0 -22
@@ -1,22 +0,0 @@ -Add an input group for the /dev/input/* devices. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Darren Hart <[email protected]> - ---- - group.master | 1 + - 1 file changed, 1 insertion(+) - -Index: base-passwd-3.5.26/group.master -=================================================================== ---- base-passwd-3.5.26.orig/group.master -+++ base-passwd-3.5.26/group.master -@@ -12,6 +12,7 @@ uucp:*:10: - man:*:12: - proxy:*:13: - kmem:*:15: -+input:*:19: - dialout:*:20: - fax:*:21: - voice:*:22:
meta/recipes-core/base-passwd/base-passwd/nobash.patch deleted +0 -15
@@ -1,15 +0,0 @@ -use /bin/sh instead of /bin/bash, since the latter may not be included in -some images such as minimal - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Scott Garman <[email protected]> - ---- base-passwd/passwd.master~nobash -+++ base-passwd/passwd.master -@@ -1,4 +1,4 @@ --root:*:0:0:root:/root:/bin/bash -+root:*:0:0:root:/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh
meta/recipes-core/base-passwd/base-passwd/noshadow.patch deleted +0 -14
@@ -1,14 +0,0 @@ -remove "*" for root since we don't have a /etc/shadow so far. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Scott Garman <[email protected]> - ---- base-passwd/passwd.master~nobash -+++ base-passwd/passwd.master -@@ -1,4 +1,4 @@ --root:*:0:0:root:/root:/bin/sh -+root::0:0:root:/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh
meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +7 -7
@@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" RECIPE_NO_UPDATE_REASON = "Version 3.5.38 requires cdebconf for update-passwd utility" SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.gz \ - file://add_shutdown.patch \ - file://nobash.patch \ - file://noshadow.patch \ - file://input.patch \ - file://disable-docs.patch \ - file://kvm.patch \ - file://disable-shell.patch \ + file://0001-Add-a-shutdown-group.patch \ + file://0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch \ + file://0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch \ + file://0004-Add-an-input-group-for-the-dev-input-devices.patch \ + file://0005-Add-kvm-group.patch \ + file://0006-Disable-shell-for-default-users.patch \ + file://0007-Disable-generation-of-the-documentation.patch \ " SRC_URI[md5sum] = "6beccac48083fe8ae5048acd062e5421"
PATCH v2 2/2 base-passwd: Update to 3.5.52
* Add a patch to allow the use of debconf to be disabled.
* Replace 0007-Disable-generation-of-the-documentation.patch with a new patch to disable the generation of the documentation using a configuration option.
* Replace 0006-Disable-shell-for-default-users.patch with a sed expression that uses a variable, NOLOGIN, to specify what command to use for users that are not expected to login. This allows to use some other command than "nologin", e.g., "false". Also, by using ${base_sbindir}, it adheres to usrmerge being configured.
---
PATCHv2: Updated the Upstream-Status.
...nstead-of-bin-bash-for-the-root-user.patch | 8 +-
...t-since-we-do-not-have-an-etc-shadow.patch | 8 +-
...0006-Disable-shell-for-default-users.patch | 54 --------
...ble-to-build-without-debconf-support.patch | 129 ++++++++++++++++++
...able-generation-of-the-documentation.patch | 32 -----
...-to-disable-the-generation-of-the-do.patch | 46 +++++++
...passwd_3.5.29.bb => base-passwd_3.5.52.bb} | 18 ++-
7 files changed, 194 insertions(+), 101 deletions(-)
delete mode 100644 meta/recipes-core/base-passwd/base-passwd/0006-Disable-shell-for-default-users.patch
create mode 100644 meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch
delete mode 100644 meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch
create mode 100644 meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch
rename meta/recipes-core/base-passwd/{base-passwd_3.5.29.bb => base-passwd_3.5.52.bb} (89%)meta/recipes-core/base-passwd/base-passwd/0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch +4 -4
@@ -12,12 +12,12 @@ Signed-off-by: Scott Garman <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/passwd.master b/passwd.master -index a01a6aa..b54ff51 100644 +index 7cd4e24..041685a 100644 --- a/passwd.master +++ b/passwd.master @@ -1,4 +1,4 @@ -root:*:0:0:root:/root:/bin/bash +root:*:0:0:root:/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh + daemon:*:1:1:daemon:/usr/sbin:/usr/sbin/nologin + bin:*:2:2:bin:/bin:/usr/sbin/nologin + sys:*:3:3:sys:/dev:/usr/sbin/nologin
meta/recipes-core/base-passwd/base-passwd/0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch +4 -4
@@ -10,12 +10,12 @@ Signed-off-by: Scott Garman <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/passwd.master b/passwd.master -index b54ff51..e1c32ff 100644 +index 041685a..31a84d4 100644 --- a/passwd.master +++ b/passwd.master @@ -1,4 +1,4 @@ -root:*:0:0:root:/root:/bin/sh +root::0:0:root:/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh + daemon:*:1:1:daemon:/usr/sbin:/usr/sbin/nologin + bin:*:2:2:bin:/bin:/usr/sbin/nologin + sys:*:3:3:sys:/dev:/usr/sbin/nologin
meta/recipes-core/base-passwd/base-passwd/0006-Disable-shell-for-default-users.patch deleted +0 -54
54 lines not on this page · raw message
meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch new file +129 -0
129 lines not on this page · raw message
meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 7ccf8227cb10d78f1958a7a7feed75a390a6b133 Mon Sep 17 00:00:00 2001 -From: Saul Wold <[email protected]> -Date: Fri, 29 Apr 2022 13:32:28 +0000 -Subject: [PATCH] Disable generation of the documentation - -It uses tools currently not supported by OE-Core. It uses sgmltools -and po4a. - -Upstream-Status: Inappropriate [OE-Core specific] -Signed-off-by: Saul Wold <[email protected]> ---- - Makefile.in | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 9ba097c..d3ea47c 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -25,13 +25,10 @@ gen_configure = config.cache config.status config.log \ - confdefhs.h config.h Makefile - - all: update-passwd -- $(MAKE) -C doc all -- $(MAKE) -C man all - - install: all - mkdir -p $(DESTDIR)$(sbindir) - $(INSTALL) update-passwd $(DESTDIR)$(sbindir)/ -- $(MAKE) -C man install - - update-passwd.o: version.h -
meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch new file +46 -0
46 lines not on this page · raw message
meta/recipes-core/base-passwd/base-passwd_3.5.52.bb renamed from meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +11 -7
@@ -5,27 +5,30 @@ SECTION = "base" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" -RECIPE_NO_UPDATE_REASON = "Version 3.5.38 requires cdebconf for update-passwd utility" - -SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.gz \ +SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.xz \ file://0001-Add-a-shutdown-group.patch \ file://0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch \ file://0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch \ file://0004-Add-an-input-group-for-the-dev-input-devices.patch \ file://0005-Add-kvm-group.patch \ - file://0006-Disable-shell-for-default-users.patch \ - file://0007-Disable-generation-of-the-documentation.patch \ + file://0006-Make-it-possible-to-build-without-debconf-support.patch \ + file://0007-Make-it-possible-to-disable-the-generation-of-the-do.patch \ " -SRC_URI[md5sum] = "6beccac48083fe8ae5048acd062e5421" -SRC_URI[sha256sum] = "f0b66388b2c8e49c15692439d2bee63bcdd4bbbf7a782c7f64accc55986b6a36" +SRC_URI[sha256sum] = "5dfec6556b5a16ecf14dd3f7c95b591d929270289268123f31a3d6317f95ccea" # the package is taken from launchpad; that source is static and goes stale # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/" +S = "${WORKDIR}/work" + inherit autotools +EXTRA_OECONF += "--disable-debconf --disable-docs" + +NOLOGIN ?= "${base_sbindir}/nologin" + do_install () { install -d -m 755 ${D}${sbindir} install -o root -g root -p -m 755 ${B}/update-passwd ${D}${sbindir}/
@@ -37,6 +40,7 @@ do_install () { install -d -m 755 ${D}${datadir}/base-passwd install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/ sed -i 's#:/root:#:${ROOT_HOME}:#' ${D}${datadir}/base-passwd/passwd.master + sed -i 's#/usr/sbin/nologin#${NOLOGIN}#' ${D}${datadir}/base-passwd/passwd.master install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/ install -d -m 755 ${D}${docdir}/${BPN}
Re: [OE-core] [PATCHv2 2/2] base-passwd: Update to 3.5.52
Quoted 10 lines · Peter Kjellerstedt
* Add a patch to allow the use of debconf to be disabled.
* Replace 0007-Disable-generation-of-the-documentation.patch with a new patch to disable the generation of the documentation using a configuration option.
* Replace 0006-Disable-shell-for-default-users.patch with a sed expression that uses a variable, NOLOGIN, to specify what command to use for users that are not expected to login. This allows to use some other command than "nologin", e.g., "false". Also, by using ${base_sbindir}, it adheres to usrmerge being configured.
Quoted 4 lines
Signed-off-by Peter Kjellerstedt <[email protected]>---
PATCHv2: Updated the Upstream-Status.
Sorry, this had already made it through testing and into the tree before I saw this. Could you send the delta please?
Thanks,
Richard