diff --git a/meta/recipes-core/base-passwd/base-passwd/0001-Add-a-shutdown-group.patch b/meta/recipes-core/base-passwd/base-passwd/0001-Add-a-shutdown-group.patch index e50efc9623..f0e1539ca7 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0001-Add-a-shutdown-group.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0001-Add-a-shutdown-group.patch @@ -1,4 +1,4 @@ -From 8f3ace87df3aaad85946c22cae240532ea3e73b8 Mon Sep 17 00:00:00 2001 +From 6f714635792a14fd3ee8d2ce0318c0185add5c00 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 29 Apr 2022 13:32:27 +0000 Subject: [PATCH] Add a shutdown group @@ -14,10 +14,10 @@ Signed-off-by: Saul Wold 1 file changed, 1 insertion(+) diff --git a/group.master b/group.master -index ad1dd2d..1b5e2fb 100644 +index 3e7bf1c..72108a8 100644 --- a/group.master +++ b/group.master -@@ -35,5 +35,6 @@ sasl:*:45: +@@ -34,5 +34,6 @@ sasl:*:45: plugdev:*:46: staff:*:50: games:*:60: diff --git a/meta/recipes-core/base-passwd/base-passwd/0001-base-passwd-Add-the-sgx-group.patch b/meta/recipes-core/base-passwd/base-passwd/0001-base-passwd-Add-the-sgx-group.patch index e1340e1b70..d50136b24e 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0001-base-passwd-Add-the-sgx-group.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0001-base-passwd-Add-the-sgx-group.patch @@ -1,4 +1,4 @@ -From 9e57771d138ac423d5139b984b8c869122ce4976 Mon Sep 17 00:00:00 2001 +From ff622d69e9c06c00dacdffc163a383f8d2903475 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Fri, 28 Jul 2023 10:28:57 +0100 Subject: [PATCH] base-passwd: Add the sgx group @@ -17,7 +17,7 @@ Signed-off-by: Alex Kiernan 1 file changed, 1 insertion(+) diff --git a/group.master b/group.master -index d34d2b832d43..e54fd1d2c6dc 100644 +index d34d2b8..e54fd1d 100644 --- a/group.master +++ b/group.master @@ -34,6 +34,7 @@ video:*:44: diff --git a/meta/recipes-core/base-passwd/base-passwd/0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch b/meta/recipes-core/base-passwd/base-passwd/0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch index 09f8cfea9c..0fa6b8138d 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch @@ -1,4 +1,4 @@ -From 4411fc0df77566d52bee11ec0bad4be30a96e99e Mon Sep 17 00:00:00 2001 +From c30862c6892d17ae2f4578101dcb050250956cec Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Fri, 29 Apr 2022 13:32:27 +0000 Subject: [PATCH] Use /bin/sh instead of /bin/bash for the root user @@ -12,7 +12,7 @@ Signed-off-by: Scott Garman 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/passwd.master b/passwd.master -index 7cd4e24..041685a 100644 +index 90514a5..bd3efc2 100644 --- a/passwd.master +++ b/passwd.master @@ -1,4 +1,4 @@ diff --git a/meta/recipes-core/base-passwd/base-passwd/0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch b/meta/recipes-core/base-passwd/base-passwd/0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch index 06222ab04c..4be487cc3f 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch @@ -1,4 +1,4 @@ -From 13a1a284a134d18a454625a5b4485c0d99079ae9 Mon Sep 17 00:00:00 2001 +From 0d35229f01e3a38a27338320e67c4cb5652a3249 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Fri, 29 Apr 2022 13:32:28 +0000 Subject: [PATCH] Remove "*" for root since we do not have an /etc/shadow @@ -10,7 +10,7 @@ Signed-off-by: Scott Garman 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/passwd.master b/passwd.master -index 041685a..31a84d4 100644 +index bd3efc2..66e9033 100644 --- a/passwd.master +++ b/passwd.master @@ -1,4 +1,4 @@ diff --git a/meta/recipes-core/base-passwd/base-passwd/0004-Add-an-input-group-for-the-dev-input-devices.patch b/meta/recipes-core/base-passwd/base-passwd/0004-Add-an-input-group-for-the-dev-input-devices.patch index 394a0f01d3..a3502c3d86 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0004-Add-an-input-group-for-the-dev-input-devices.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0004-Add-an-input-group-for-the-dev-input-devices.patch @@ -1,4 +1,4 @@ -From c5f012750f8102ff54af73ccc2d2b7bfa1f26db4 Mon Sep 17 00:00:00 2001 +From d2cdd4c8d7332d05ac86fb0625e8c2b3c7bf7728 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 29 Apr 2022 13:32:28 +0000 Subject: [PATCH] Add an input group for the /dev/input/* devices @@ -10,7 +10,7 @@ Signed-off-by: Darren Hart 1 file changed, 1 insertion(+) diff --git a/group.master b/group.master -index 1b5e2fb..cea9d60 100644 +index 72108a8..7d794b2 100644 --- a/group.master +++ b/group.master @@ -12,6 +12,7 @@ uucp:*:10: diff --git a/meta/recipes-core/base-passwd/base-passwd/0005-Add-kvm-group.patch b/meta/recipes-core/base-passwd/base-passwd/0005-Add-kvm-group.patch index 72e6ee333c..4f8278e5cd 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0005-Add-kvm-group.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0005-Add-kvm-group.patch @@ -1,4 +1,4 @@ -From 6cf19461fb31d7a7a3010629aae9aab49c26a01b Mon Sep 17 00:00:00 2001 +From 07af34abb10b1455e065cfb1ce7ce766614da7e8 Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Wed, 30 Jan 2019 04:53:48 +0000 Subject: [PATCH] Add kvm group @@ -10,10 +10,10 @@ Signed-off-by: Jacob Kroon 1 file changed, 1 insertion(+) diff --git a/group.master b/group.master -index cea9d60..5b62284 100644 +index 7d794b2..7fdd8bf 100644 --- a/group.master +++ b/group.master -@@ -34,6 +34,7 @@ utmp:*:43: +@@ -33,6 +33,7 @@ utmp:*:43: video:*:44: sasl:*:45: plugdev:*:46: diff --git a/meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch b/meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch index d77122789d..91bbb453e3 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch @@ -1,3 +1,7 @@ +From 3c88afb923de603d126f89f2979b2cd232a180c8 Mon Sep 17 00:00:00 2001 +From: Louis Rannou +Date: Thu, 15 Jun 2023 13:43:55 +0200 +Subject: [PATCH] base-passwd: add the wheel group We need to have a wheel group which has some system privileges to consult the systemd journal or manage printers with cups. @@ -7,11 +11,15 @@ Upstream says the group does not exist by default. Upstream-Status: Inappropriate [enable feature] Signed-off-by: Louis Rannou -Index: base-passwd-3.5.26/group.master -=================================================================== ---- base-passwd-3.5.29.orig/group.master -+++ base-passwd-3.5.29/group.master -@@ -38,5 +38,6 @@ +--- + group.master | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/group.master b/group.master +index 7fdd8bf..d34d2b8 100644 +--- a/group.master ++++ b/group.master +@@ -37,5 +37,6 @@ kvm:*:47: staff:*:50: games:*:60: shutdown:*:70: diff --git a/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.8.bb similarity index 98% rename from meta/recipes-core/base-passwd/base-passwd_3.6.3.bb rename to meta/recipes-core/base-passwd/base-passwd_3.6.8.bb index bf50b01fd5..a072791dcf 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.6.8.bb @@ -15,7 +15,7 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar file://0001-base-passwd-Add-the-sgx-group.patch \ " -SRC_URI[sha256sum] = "83575327d8318a419caf2d543341215c046044073d1afec2acc0ac4d8095ff39" +SRC_URI[sha256sum] = "fab3d0e6e8b641e116bda9bd5f7a7ed24482384c1513f6a369b506327fbc8dde" # 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