From patchwork Tue Dec 17 11:12:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 54238 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B289AE7717F for ; Tue, 17 Dec 2024 11:12:57 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web11.79326.1734433968249098962 for ; Tue, 17 Dec 2024 03:12:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bisdn-de.20230601.gappssmtp.com header.s=20230601 header.b=agYyRxGS; spf=none, err=SPF record not found (domain: bisdn.de, ip: 209.85.221.52, mailfrom: jonas.gorski@bisdn.de) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-385e971a2a0so316635f8f.1 for ; Tue, 17 Dec 2024 03:12:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bisdn-de.20230601.gappssmtp.com; s=20230601; t=1734433966; x=1735038766; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+hRU8jfeZ1p8jIoaa9qKJcYXFSmpISc//kHxRr+xuTc=; b=agYyRxGSO3yov/nm1KbLdNj8BKj/wSUx56KTAhMfcC0UMg8aDJfLVt5Eia9nysNJxg YyF0c/uEJQ7LiIxw+NMEhAOZHj9pX+3x5Rc4c5oGMTVgSsRBOAeVThNdefF+tbs2O5F/ YcwBn1CCHqvdDC7gmI3tnJwYOQK9O02nVvMZyUU8XgHvlSQ3TWZUr9Yc5U70vdQkur9P auEcndrqKsNn1GLDxLVMOmxAVqk6TyQgzu3nWfawAJ8tpjsIme74I2CghKjme0LVjQyC o//R2O2vNeqr7WHSyhNDFIOExfmMY2XO6MU7PUublib++9xKiOtDKJ/bzblFyauz3kcN lAMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734433966; x=1735038766; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+hRU8jfeZ1p8jIoaa9qKJcYXFSmpISc//kHxRr+xuTc=; b=bkrv+9UWvoNqs/yWiAWu5fyUNAiNIOJvVtYa7LjzR7YC0R7E16QAy1+/xICSsFONXD 1S1Dv8dU+dfm1G7YP0YhMFbPEA9DHnTJy2eZIhj+ykKOqsEIfa+lGIaKaquAl0vzovq1 bdJPrFl5veJ7aQdEu2EEPH1E5kVML61wdtvMx9O38nYk4cXKas8ddxg/5FPAJk0lPFnf c7tR/ZbooilyzqxGA+XqLFM6WZBki9DIv7fIU304JfOy1CD/raN1Vz4py6aSRkCZ8CkS hnPnJ3Us9nK5LmfyY+BP5zXjlLyI3g8HQ6nbed2JEnkwJvAM8XprlvTF5O+BJEopNGx6 HtBA== X-Gm-Message-State: AOJu0YyLfK+GFKMpyQEesgyPMAVj1ts9gCLk4MuM9o86fs+8VSyb87kR bsSJPEbaL67usx3a2rCogP9fGA77TgMJJZEok6HEOnEB6tsNjE4GYV05gZB4+tV1p/tLi9KdBko BCtGrEDpWLh33bLt9FaYNQBxzjZTP4TdGhODif+TBrY67eYcqv1PgEgAG+h9z8I3fpfHnr35SFv wo/rE90lKt X-Gm-Gg: ASbGncs35ArbPeuauKSaIdsmgACGLAbfvdfW245vCIlFdtr/GbrfdHo6wKaoyyEhvn3 KVh23yQpuXRvCOw0dIahTNWjcqLZy7gi8dzbILuNqf70OHJDRAkYiHzhd4TmnvNZUnbMO3LdeTT LWdLgZw3I52Yqmb5X/6pa0jPHq1phYFewu9X0vZj8vXOPQaXqbinaZ17MDy7vZKQk/8RGQsG3Vy zuLgPTcLhozVB83n5aoHzlwYW4JnrcxVzteOSpnVPkLWAJ0ezviv7BAYEkDI4YfI7w27YXUb/NS /voVOc1xeimr7G0Jyc02ikYWLco0WtE2xw== X-Google-Smtp-Source: AGHT+IGXrjlfdTAKDKhAJWE12C+3ci05JTq49jcw5XwBL9n2r8S8GkWk6pnWgTfZM6BBqOkM5Kj+2w== X-Received: by 2002:a5d:5f88:0:b0:376:2e3e:e6d4 with SMTP id ffacd0b85a97d-3888e0acb25mr4893920f8f.5.1734433966014; Tue, 17 Dec 2024 03:12:46 -0800 (PST) Received: from localhost (dslb-084-060-024-069.084.060.pools.vodafone-ip.de. [84.60.24.69]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c8060566sm10738101f8f.102.2024.12.17.03.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 03:12:45 -0800 (PST) From: Jonas Gorski To: openembedded-core@lists.openembedded.org Cc: Peter Kjellerstedt , Luca Ceresoli , Richard Purdie Subject: [PATCH kirkstone 1/6] base-passwd: Regenerate the patches Date: Tue, 17 Dec 2024 12:12:24 +0100 Message-ID: <20241217111229.60698-2-jonas.gorski@bisdn.de> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217111229.60698-1-jonas.gorski@bisdn.de> References: <20241217111229.60698-1-jonas.gorski@bisdn.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Dec 2024 11:12:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208833 From: Peter Kjellerstedt Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 6515d96c12b080b9e7f344799e26dba3b98e17e2) Signed-off-by: Jonas Gorski --- .../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.patch 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 new file mode 100644 index 000000000000..e50efc9623f8 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/0001-Add-a-shutdown-group.patch @@ -0,0 +1,26 @@ +From 8f3ace87df3aaad85946c22cae240532ea3e73b8 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 + +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 +--- + 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: 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 new file mode 100644 index 000000000000..ea0256684be9 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch @@ -0,0 +1,23 @@ +From 4411fc0df77566d52bee11ec0bad4be30a96e99e 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 + +/bin/bash may not be included in some images such as minimal. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Scott Garman +--- + 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 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 new file mode 100644 index 000000000000..88cc5be66ca5 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch @@ -0,0 +1,21 @@ +From 13a1a284a134d18a454625a5b4485c0d99079ae9 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 + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Scott Garman +--- + 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 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 new file mode 100644 index 000000000000..394a0f01d323 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/0004-Add-an-input-group-for-the-dev-input-devices.patch @@ -0,0 +1,23 @@ +From c5f012750f8102ff54af73ccc2d2b7bfa1f26db4 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 + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Darren Hart +--- + 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: diff --git a/meta/recipes-core/base-passwd/base-passwd/kvm.patch b/meta/recipes-core/base-passwd/base-passwd/0005-Add-kvm-group.patch similarity index 88% rename from meta/recipes-core/base-passwd/base-passwd/kvm.patch rename to meta/recipes-core/base-passwd/base-passwd/0005-Add-kvm-group.patch index 113d5151e7a9..72e6ee333c9b 100644 --- a/meta/recipes-core/base-passwd/base-passwd/kvm.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0005-Add-kvm-group.patch @@ -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 Date: Wed, 30 Jan 2019 04:53:48 +0000 Subject: [PATCH] Add kvm group diff --git a/meta/recipes-core/base-passwd/base-passwd/disable-shell.patch b/meta/recipes-core/base-passwd/base-passwd/0006-Disable-shell-for-default-users.patch similarity index 96% rename from meta/recipes-core/base-passwd/base-passwd/disable-shell.patch rename to meta/recipes-core/base-passwd/base-passwd/0006-Disable-shell-for-default-users.patch index bfaa786018a3..2bcb829d9c32 100644 --- a/meta/recipes-core/base-passwd/base-passwd/disable-shell.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0006-Disable-shell-for-default-users.patch @@ -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 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 - diff --git a/meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch b/meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch new file mode 100644 index 000000000000..4a19f91c35a0 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch @@ -0,0 +1,32 @@ +From 7ccf8227cb10d78f1958a7a7feed75a390a6b133 Mon Sep 17 00:00:00 2001 +From: Saul Wold +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 +--- + 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 + diff --git a/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch b/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch deleted file mode 100644 index 5f357d88957c..000000000000 --- a/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch +++ /dev/null @@ -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 -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: diff --git a/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch b/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch deleted file mode 100644 index 14c08b748476..000000000000 --- a/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch +++ /dev/null @@ -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 - -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 - diff --git a/meta/recipes-core/base-passwd/base-passwd/input.patch b/meta/recipes-core/base-passwd/base-passwd/input.patch deleted file mode 100644 index 3abbcad5d593..000000000000 --- a/meta/recipes-core/base-passwd/base-passwd/input.patch +++ /dev/null @@ -1,22 +0,0 @@ -Add an input group for the /dev/input/* devices. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Darren Hart - ---- - 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: diff --git a/meta/recipes-core/base-passwd/base-passwd/nobash.patch b/meta/recipes-core/base-passwd/base-passwd/nobash.patch deleted file mode 100644 index b5a692295b06..000000000000 --- a/meta/recipes-core/base-passwd/base-passwd/nobash.patch +++ /dev/null @@ -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 - ---- 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 diff --git a/meta/recipes-core/base-passwd/base-passwd/noshadow.patch b/meta/recipes-core/base-passwd/base-passwd/noshadow.patch deleted file mode 100644 index e27bf7d9becc..000000000000 --- a/meta/recipes-core/base-passwd/base-passwd/noshadow.patch +++ /dev/null @@ -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 - ---- 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 diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index ef7792ae49c7..e5615991363e 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb @@ -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" From patchwork Tue Dec 17 11:12:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 54242 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDB3DE7718B for ; Tue, 17 Dec 2024 11:12:57 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web10.79051.1734433969036401587 for ; Tue, 17 Dec 2024 03:12:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bisdn-de.20230601.gappssmtp.com header.s=20230601 header.b=vQULiphP; spf=none, err=SPF record not found (domain: bisdn.de, ip: 209.85.221.41, mailfrom: jonas.gorski@bisdn.de) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-385e971a2a0so316638f8f.1 for ; Tue, 17 Dec 2024 03:12:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bisdn-de.20230601.gappssmtp.com; s=20230601; t=1734433967; x=1735038767; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qLY6poj+hTM+BfyKMQ3pQKevyA/LsdCQhYg4kePNS0A=; b=vQULiphPdwlqgzRF/1KhmFtD6LjAGBOIQKA/kYJCdv+buQwKiMy7TefzPYPVV4NjtL AeMU4ZBkbG7QPtlNtfXKeFRaJv1u6G73+l8vEPQeeEOLq2wVY66vEnnPdhdHxSjW3bqy +eHJ7SVESmt7BPSVWv7Kw/Pzsbn+8PUWDyGclg96TFkEFnlDw5nXCZH3jitEEHfp4A9e iFUk6w8c+/LrQRo1r2m6NXnf4BRPFw+pHh7Xlb7KUTuz7VtLlp9nLdTWDfbQd+Ijqtcg mYjafW493hP0BpZAA6Pdq/WSIP522u87hOlGm/DU/PNGZnxRjheIFgprY5TNVLeqvVji VedQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734433967; x=1735038767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qLY6poj+hTM+BfyKMQ3pQKevyA/LsdCQhYg4kePNS0A=; b=wxZVvU3/aIUUmAjOrfcz9Mv63y+NskRHbHQIMG/z1LEYrHGtQ5MRZrPdZlGEuZX5cR A+85MwMf0ze3lLivXInJOyi3/oU2GCVIQukSdUtpy0/iEohtwnDwVaL5ueAtl212OkZA tURCgBELUFnWDRYWCdZTxvpKCrLD0RTvWsk57Ftt44BCkD+pdiW4PIHh3r9qGZ/kE1RF Q+/GhCoMRlL54wLHdGMULcGuVu2/pQq/fhRBIlfTPuLBcn1foa84DXHs5YeVagWnWrU7 9Q5GZ1T3cvexOGBJMXUFZ3i2EQbZmy7131JyVrTibglJCCPsfoP9C59kmalCiPCovpSO HSGw== X-Gm-Message-State: AOJu0Yzji+GpYfon++uE+mQeFX8AjUTgR5BVbYSn6W0XwAsKH1iVn2Ux AL2C0iknYYYysv6dc1qgtW8Vx9z0jOSQ2pBDSv1pO/g8mQP3hOw69UXMHjgLarlkYKKlIUdPMyl yVLPFTbL8tneWpDxr8+IvTgJHdria15UBHwN7Ks+/93bb/KcWhf2Fh55+Euzboe3Yf9EkFfipW2 3IEqDktxpY X-Gm-Gg: ASbGnctD7V3im8J+MA4KwoEwNWeTkjyYYSrvxDbAHe5AMH5ImK22oVz2FZKu5ZCAHp3 KxAPwPWB4vCvByO1TmiH63U7r7PQX1weh2nHMYLM3zoOmCziRmQgyKNf+BGBYzqddOe4ooSdn5y Vx/1kXNZiJOg9TulJfRUbdwF8mzkWH58yBDkZIJ+UJFSaA7tNdg7p+L6Na/3/eqXlfLRGIJluP2 ccuMg+v7z5XDsc4TRsHzIv8s75FYE0iTp4QqCaPigJiBo3it+WzW1L67Mpk+Xwiu8P5AFCQOvL2 D2p6ripYpAXL1BzsEQ3oUIS3eYGfAPri8g== X-Google-Smtp-Source: AGHT+IECE03EdS3nzHapNqY4KpPfE2JsLqRE4/OfXSKmjiPYq3KsedQ59TalLb24NzhCx+1mJ/CVAw== X-Received: by 2002:a5d:59a3:0:b0:385:faaa:9cfe with SMTP id ffacd0b85a97d-3889ad3422cmr4963352f8f.12.1734433967268; Tue, 17 Dec 2024 03:12:47 -0800 (PST) Received: from localhost (dslb-084-060-024-069.084.060.pools.vodafone-ip.de. [84.60.24.69]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c801ad9asm10728586f8f.58.2024.12.17.03.12.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 03:12:46 -0800 (PST) From: Jonas Gorski To: openembedded-core@lists.openembedded.org Cc: Peter Kjellerstedt , Luca Ceresoli , Richard Purdie Subject: [PATCH kirkstone 2/6] base-passwd: Update to 3.5.52 Date: Tue, 17 Dec 2024 12:12:25 +0100 Message-ID: <20241217111229.60698-3-jonas.gorski@bisdn.de> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217111229.60698-1-jonas.gorski@bisdn.de> References: <20241217111229.60698-1-jonas.gorski@bisdn.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Dec 2024 11:12:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208834 From: 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. Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit e7abf63cc8bdc61c8d978b3c21a38e17716fc292) Signed-off-by: Jonas Gorski --- ...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%) 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 ea0256684be9..09f8cfea9c64 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 @@ -12,12 +12,12 @@ Signed-off-by: Scott Garman 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 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 88cc5be66ca5..06222ab04cef 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 @@ -10,12 +10,12 @@ Signed-off-by: Scott Garman 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 diff --git a/meta/recipes-core/base-passwd/base-passwd/0006-Disable-shell-for-default-users.patch b/meta/recipes-core/base-passwd/base-passwd/0006-Disable-shell-for-default-users.patch deleted file mode 100644 index 2bcb829d9c32..000000000000 --- a/meta/recipes-core/base-passwd/base-passwd/0006-Disable-shell-for-default-users.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f35eb24213475d3024ad45297fd855c6abfbbac0 Mon Sep 17 00:00:00 2001 -From: Jiaqing Zhao -Date: Mon, 18 Apr 2022 11:22:43 +0800 -Subject: [PATCH] Disable shell for default users - -Change the shell of all global static users other than root (which -retains /bin/sh) and sync (as /bin/sync is rather harmless) to -/sbin/nologin (as /usr/sbin/nologin does not exist in openembedded) - -Upstream-Status: Backport [https://launchpad.net/ubuntu/+source/base-passwd/3.5.30] -Signed-off-by: Jiaqing Zhao ---- - passwd.master | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - -diff --git a/passwd.master b/passwd.master -index e1c32ff..0cd5ffd 100644 ---- a/passwd.master -+++ b/passwd.master -@@ -1,18 +1,18 @@ - 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:/sbin/nologin -+bin:*:2:2:bin:/bin:/sbin/nologin -+sys:*:3:3:sys:/dev:/sbin/nologin - sync:*:4:65534:sync:/bin:/bin/sync --games:*:5:60:games:/usr/games:/bin/sh --man:*:6:12:man:/var/cache/man:/bin/sh --lp:*:7:7:lp:/var/spool/lpd:/bin/sh --mail:*:8:8:mail:/var/mail:/bin/sh --news:*:9:9:news:/var/spool/news:/bin/sh --uucp:*:10:10:uucp:/var/spool/uucp:/bin/sh --proxy:*:13:13:proxy:/bin:/bin/sh --www-data:*:33:33:www-data:/var/www:/bin/sh --backup:*:34:34:backup:/var/backups:/bin/sh --list:*:38:38:Mailing List Manager:/var/list:/bin/sh --irc:*:39:39:ircd:/var/run/ircd:/bin/sh --gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh --nobody:*:65534:65534:nobody:/nonexistent:/bin/sh -+games:*:5:60:games:/usr/games:/sbin/nologin -+man:*:6:12:man:/var/cache/man:/sbin/nologin -+lp:*:7:7:lp:/var/spool/lpd:/sbin/nologin -+mail:*:8:8:mail:/var/mail:/sbin/nologin -+news:*:9:9:news:/var/spool/news:/sbin/nologin -+uucp:*:10:10:uucp:/var/spool/uucp:/sbin/nologin -+proxy:*:13:13:proxy:/bin:/sbin/nologin -+www-data:*:33:33:www-data:/var/www:/sbin/nologin -+backup:*:34:34:backup:/var/backups:/sbin/nologin -+list:*:38:38:Mailing List Manager:/var/list:/sbin/nologin -+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 diff --git a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch new file mode 100644 index 000000000000..61ed1641a126 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch @@ -0,0 +1,129 @@ +From 236d6c8c0dd7e15d9a9795813b94bc87ce09eec5 Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt +Date: Fri, 29 Apr 2022 19:32:29 +0200 +Subject: [PATCH] Make it possible to build without debconf support + +Not all systems have the debconfclient library available. + +Upstream-Status: Submitted [https://salsa.debian.org/debian/base-passwd/-/merge_requests/11] +Signed-off-by: Peter Kjellerstedt +--- + Makefile.am | 1 - + configure.ac | 13 +++++++++++++ + update-passwd.c | 15 +++++++++++++++ + 3 files changed, 28 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 223916f..4bdd769 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,6 @@ SUBDIRS = doc man + sbin_PROGRAMS = update-passwd + + update_passwd_SOURCES = update-passwd.c +-update_passwd_LDADD = -ldebconfclient + + pkgdata_DATA = passwd.master group.master + +diff --git a/configure.ac b/configure.ac +index 9d1ace5..1e35ad1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,19 @@ AC_SYS_LARGEFILE + dnl Scan for things we need + AC_CHECK_FUNCS([putgrent]) + ++dnl Check for debconf ++AC_MSG_CHECKING([whether to enable debconf support]) ++AC_ARG_ENABLE([debconf], ++ [AS_HELP_STRING([--disable-debconf], [disable support for debconf])], ++ [], ++ [enable_debconf=yes]) ++AC_MSG_RESULT($enable_debconf) ++AS_IF([test "x$enable_debconf" != xno], ++ [AC_CHECK_LIB([debconfclient], [debconfclient_new], [], ++ [AC_MSG_ERROR( ++ [debconf support not available (use --disable-debconf to disable)])]) ++ AC_DEFINE([HAVE_DEBCONF], [1], [Define if you have libdebconfclient])]) ++ + dnl Finally output everything + AC_CONFIG_FILES([Makefile doc/Makefile man/Makefile]) + AC_OUTPUT +diff --git a/update-passwd.c b/update-passwd.c +index 3f3dffa..5b49740 100644 +--- a/update-passwd.c ++++ b/update-passwd.c +@@ -39,7 +39,9 @@ + #include + #include + ++#ifdef HAVE_DEBCONF + #include ++#endif + + #define DEFAULT_PASSWD_MASTER "/usr/share/base-passwd/passwd.master" + #define DEFAULT_GROUP_MASTER "/usr/share/base-passwd/group.master" +@@ -143,6 +145,7 @@ int flag_debconf = 0; + const char* user_domain = DEFAULT_DEBCONF_DOMAIN; + const char* group_domain = DEFAULT_DEBCONF_DOMAIN; + ++#ifdef HAVE_DEBCONF + struct debconfclient* debconf = NULL; + + /* Abort the program if talking to debconf fails. Use ret exactly once. */ +@@ -162,6 +165,10 @@ struct debconfclient* debconf = NULL; + DEBCONF_CHECK(debconf_register(debconf, (template), (question))) + #define DEBCONF_SUBST(question, var, value) \ + DEBCONF_CHECK(debconf_subst(debconf, (question), (var), (value))) ++#else ++#define DEBCONF_REGISTER(template, question) ++#define DEBCONF_SUBST(question, var, value) ++#endif + + + /* malloc() with out-of-memory checking. +@@ -621,6 +628,7 @@ void version() { + * flag. Aborts the problem on any failure. + */ + int ask_debconf(const char* priority, const char* question) { ++#ifdef HAVE_DEBCONF + int ret; + const char* response; + +@@ -640,6 +648,9 @@ int ask_debconf(const char* priority, const char* question) { + return 1; + else + return 0; ++#else ++ return 0; ++#endif + } + + +@@ -1427,6 +1438,7 @@ int main(int argc, char** argv) { + /* If DEBIAN_HAS_FRONTEND is set in the environment, we're running under + * debconf. Enable debconf prompting unless --dry-run was also given. + */ ++#ifdef HAVE_DEBCONF + if (getenv("DEBIAN_HAS_FRONTEND")!=NULL && !opt_dryrun) { + debconf=debconfclient_new(); + if (debconf==NULL) { +@@ -1435,6 +1447,7 @@ int main(int argc, char** argv) { + } + flag_debconf=1; + } ++#endif + + if (read_passwd(&master_accounts, master_passwd)!=0) + return 2; +@@ -1480,8 +1493,10 @@ int main(int argc, char** argv) { + if (!unlock_files()) + return 5; + ++#ifdef HAVE_DEBCONF + if (debconf!=NULL) + debconfclient_delete(debconf); ++#endif + + if (opt_dryrun) + return flag_dirty; diff --git a/meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch b/meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch deleted file mode 100644 index 4a19f91c35a0..000000000000 --- a/meta/recipes-core/base-passwd/base-passwd/0007-Disable-generation-of-the-documentation.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7ccf8227cb10d78f1958a7a7feed75a390a6b133 Mon Sep 17 00:00:00 2001 -From: Saul Wold -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 ---- - 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 - diff --git a/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch b/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch new file mode 100644 index 000000000000..2bec065cdbdf --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch @@ -0,0 +1,46 @@ +From 63e8270141a296843cfe1daba38e1969ac6d75ae Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt +Date: Sat, 30 Apr 2022 00:35:34 +0200 +Subject: [PATCH] Make it possible to disable the generation of the + documentation + +Not all systems have docbook and po4a available. + +Upstream-Status: Submitted [https://salsa.debian.org/debian/base-passwd/-/merge_requests/11] +Signed-off-by: Peter Kjellerstedt +--- + Makefile.am | 2 ++ + configure.ac | 9 +++++++++ + 2 files changed, 11 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 4bdd769..97b4f42 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,6 @@ ++if ENABLE_DOCS + SUBDIRS = doc man ++endif + + sbin_PROGRAMS = update-passwd + +diff --git a/configure.ac b/configure.ac +index 1e35ad1..b98374e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,6 +27,15 @@ AS_IF([test "x$enable_debconf" != xno], + [debconf support not available (use --disable-debconf to disable)])]) + AC_DEFINE([HAVE_DEBCONF], [1], [Define if you have libdebconfclient])]) + ++dnl Check whether to build the documentation ++AC_MSG_CHECKING([whether to build the documentation]) ++AC_ARG_ENABLE([docs], ++ [AC_HELP_STRING([--disable-docs], [do not build and install documentation])], ++ [], ++ [enable_docs=yes]) ++AC_MSG_RESULT($enable_docs) ++AM_CONDITIONAL(ENABLE_DOCS, test "x$enable_docs" = xyes) ++ + dnl Finally output everything + AC_CONFIG_FILES([Makefile doc/Makefile man/Makefile]) + AC_OUTPUT diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb similarity index 89% rename from meta/recipes-core/base-passwd/base-passwd_3.5.29.bb rename to meta/recipes-core/base-passwd/base-passwd_3.5.52.bb index e5615991363e..f89752c07710 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb @@ -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} From patchwork Tue Dec 17 11:12:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 54241 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE7D6E77188 for ; Tue, 17 Dec 2024 11:12:57 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web11.79327.1734433970456797248 for ; Tue, 17 Dec 2024 03:12:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bisdn-de.20230601.gappssmtp.com header.s=20230601 header.b=peUco+OG; spf=none, err=SPF record not found (domain: bisdn.de, ip: 209.85.221.42, mailfrom: jonas.gorski@bisdn.de) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-385e971a2a0so316640f8f.1 for ; Tue, 17 Dec 2024 03:12:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bisdn-de.20230601.gappssmtp.com; s=20230601; t=1734433969; x=1735038769; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lf0GY98f8dwqhADLcF5Vg1ElRt8lUes0v3wrR1kK99Q=; b=peUco+OGl8onh5Le4nX4RkXVMN7Iljg+2tmghh8vOB2e+plWTC8gw1pcosVty9GmiO QzJoK5culzGLn7Bxtm/7jzTMSr4WAe1/Zewe399/m1t+irozmKa03zgc212oKn3tzhOd 7YVwzNG1A8Qs1icfJNhwUE9Rva6wRTpfYEZki27f/bJb1A4cn4+mhvfzmhiRMDs2uXRu 9PfMrocv7i5HRzNCs0i1WVJ0BYwJA0L+Y07Ma2wivABh5gHV+sM3nz5QFSNjatsFXkmp f6ZgZWbaMDIz1KuexZ1bUKJyV1fxDJgvY+YqQy5F2lLqpiEG3zk+MwRw7bgMDlOTMIG5 fwsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734433969; x=1735038769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lf0GY98f8dwqhADLcF5Vg1ElRt8lUes0v3wrR1kK99Q=; b=HzqNH5HN73SdTT7AJk8W8Omx6AUtv353PmrGNjlLFGdt6KdifHt7WDp+vdsOF1AvIz oqlbt0cNrAeVlopo66fEEz6eKjnk4TOWkAys+KtbjDs3clZ19gVL4L9+Ni/TK172xxUb vZSXj4HjM3RLRv3DGDcQBASxWNLWEZjmVK+kuo53k8kb55bc4AG5q9xz+x/N+WMTBjWH nDOPqfsFUHY6xWscHbC+Y4vn2Os8cM2QMhf6X2HYw9dwVLlizs/ZpnRA0+ZlPt0bK/hJ 9IzhnHhkws3tYHTCb+oJIwBtgC2Aoj2Ct8rv7oeVqxFnPxaeaPxaLaSQbhGk4nsO7Trj apvQ== X-Gm-Message-State: AOJu0YxoEUvGU18XvD1SiAjk3uJwmEDCSByrfB1g3v4Zk9a6r/68pK+E 19L1kZJRUJyUQo/XL8a4YO8wc/hZh947ddGg7eRZwKfpeAHYMw/hV6lCBs0Pn6Vqf2PKIEXv0p5 UHrL597eEQrPldgodNlEKnN3lT5aljpIQd8prelDdbx1Exc7nCiOwOWhmrRYFQ2w3LLXQgwSNnK OMfCtNsFTR X-Gm-Gg: ASbGncv+qFBk+CnpYBEtn1SrufIQDv0pQM1nwlpXnrLqxqm3d/SzylY7LpNCLBlMTPJ eUQzprHhmK9s9nCbi1S2bi/+UKznbeVwfidCqulwpMgGAoR6mtLqovKD2H5Z4XWJTPbnCSnRX/v GTISTZwd33hFmt6bX1Lm9oCCVTmMpSJsqxbweKWnjMFNL/C250gUsveLgX/HDNgbw2s7Z4lOoSx m5HFmdxlV5ruSTeXmpKokGX2JJKVKAcxTw6Yw9itEuUaJKgwlAV0f3cJQl4MEUMgSlbxLSkMa5y tdTy8q/D2/ruz7W2PA6QauhdjqBCkTwWHQ== X-Google-Smtp-Source: AGHT+IHRquRWXiE5TLeCR6DlCVvsMjatdbDuHrgK7FW68i0h9QHyztPp070sK01jnzIm4TTiBfvkEQ== X-Received: by 2002:a05:6000:481c:b0:386:3c21:b1f7 with SMTP id ffacd0b85a97d-3888e0bb65cmr5087247f8f.7.1734433968771; Tue, 17 Dec 2024 03:12:48 -0800 (PST) Received: from localhost (dslb-084-060-024-069.084.060.pools.vodafone-ip.de. [84.60.24.69]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c80120bcsm11134591f8f.5.2024.12.17.03.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 03:12:48 -0800 (PST) From: Jonas Gorski To: openembedded-core@lists.openembedded.org Cc: Peter Kjellerstedt , Luca Ceresoli , Richard Purdie Subject: [PATCH kirkstone 3/6] base-passwd: Update the status for two patches Date: Tue, 17 Dec 2024 12:12:26 +0100 Message-ID: <20241217111229.60698-4-jonas.gorski@bisdn.de> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217111229.60698-1-jonas.gorski@bisdn.de> References: <20241217111229.60698-1-jonas.gorski@bisdn.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Dec 2024 11:12:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208835 From: Peter Kjellerstedt The two patches to disable use of debconf and generation of documentation have been merged upstream. Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit aca8844d7c05b4ba937625e59275d3f7953d3da7) Signed-off-by: Jonas Gorski --- ...0006-Make-it-possible-to-build-without-debconf-support.patch | 2 +- ...7-Make-it-possible-to-disable-the-generation-of-the-do.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch index 61ed1641a126..6e236993f51d 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make it possible to build without debconf support Not all systems have the debconfclient library available. -Upstream-Status: Submitted [https://salsa.debian.org/debian/base-passwd/-/merge_requests/11] +Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/c72aa5dd25a952da25e307761f4526db2c8c39ec] Signed-off-by: Peter Kjellerstedt --- Makefile.am | 1 - diff --git a/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch b/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch index 2bec065cdbdf..5c6359914362 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Make it possible to disable the generation of the Not all systems have docbook and po4a available. -Upstream-Status: Submitted [https://salsa.debian.org/debian/base-passwd/-/merge_requests/11] +Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/2a6d16e595c93084e279d0dcbef37d960b44fd1a] Signed-off-by: Peter Kjellerstedt --- Makefile.am | 2 ++ From patchwork Tue Dec 17 11:12:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 54240 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE89CE7718A for ; Tue, 17 Dec 2024 11:12:57 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web10.79052.1734433972000569830 for ; Tue, 17 Dec 2024 03:12:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bisdn-de.20230601.gappssmtp.com header.s=20230601 header.b=UZZ7yx8v; spf=none, err=SPF record not found (domain: bisdn.de, ip: 209.85.128.47, mailfrom: jonas.gorski@bisdn.de) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-436230de7a3so6001055e9.0 for ; Tue, 17 Dec 2024 03:12:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bisdn-de.20230601.gappssmtp.com; s=20230601; t=1734433970; x=1735038770; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6MCRe266Aw6bhgXJdVLIOt72oGQTnJ+d7cXTnwa4h6w=; b=UZZ7yx8vFqgbRRkC8v0XnFpjX7WB8mxMpEUexOVTD8HtKzfo6gDOo7ggNWH3quSFfQ aOHlkV6QOLST+qaSyCqkoFQHSCZQNy18oFi94W4YrNNUg93LaxeyRYygpFBmxfbnue1i OFXsaYpLj/NtlKKYEcDVn/ZJgnEx0II87cAwsAL7jEImVRutrliIcGlnI9BntWq44+gi dXlfF+vimfs5qxckkXKUtFDGj3l2v1n5Ifmr4+cKCpwF6ypTTPu/exGFc9lVrZ7cdl1l UyrqwxSKSLMSvXl5Mfm8xV4vCi1luQRrevRysetMdvnPm7yWQzs1fw+NGPvRQsa/XNP9 GdUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734433970; x=1735038770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6MCRe266Aw6bhgXJdVLIOt72oGQTnJ+d7cXTnwa4h6w=; b=EWlxgw1zooTMBfFnDzT5n3vm/cyMUSfUWal/IXVdmoOFR7cnx2Cmo7MzLYpWX/Ps3u NewyIVkxtgyHQgzNP+bQByselIUEdjyLHMngenAjn+hG25Uc7aayghFuwvQydCCld/no FlN53vx5AnOCs/ZNcYcRuFohzhaeMDGBD4UWtenWBTPZ2ysAPC99XbSdyZbkN09sGMpL 1aPhKdmPyoLjqbiS4t2WFECqJGLBrrnjqk1wMHJC/zxmbBY11wICGWTBAAoD1oSAVqev 45LgC6PaxsO+KP1wUAqcYg2db5FuBVWBxxVMslkUSG9OYlhYpWY427m35aYJytQTdGQ6 PtHA== X-Gm-Message-State: AOJu0YzT/gqnLBUL4CCPDk+5ooKMzWZVnC4ieUK/w872bAqOBI5uqH+p 6QolZ8fppKdjO5EoygOiSnAoJ+nIXymNb/uJchlehBuRxsQx2MiZojDAhxpWj5ThQXRgZ0xMZil SKnp0fpgKx2dfaCg+SKo+/Ar5ksCLA/uAyGbeOo7554aOyKpIa9upfx5GDE3vqRDnMzRvBrQxIA /beGQE4qc3 X-Gm-Gg: ASbGncv9Nh80Pk8HPQYILkN9Gdf9NLM6D+MtzIld2noPtincHFe89uN5mCHy97oWmNa Rs2seI6cV438NWHQ5JbNDG0ijzrMQ33CxlUhIWaQZ0fOAAoJm3dlKOKyZBxduBjoBB7VkEgB+iB Un8Je4aVJS68LasQNmfpPVx2aJWYQ7L2UamzxT4Liday56sME9xSzpA4vJBPlurOo9JV/Ak7ham Z04SW2WKLSRLT6pTVCwThrQUEIaFs4tzLoJlxh6y6jSslhMMEhs71JL1JYbkbIoxDKw2q7ZFwtf AbpX3mxcGd8U33yZpDT7WDxp+Gd4m+a5qg== X-Google-Smtp-Source: AGHT+IENvpsyrcltmdHwM2uEprrLYslE6prJ2cKeYpo03v4amhF5z4qc8JbnbQzhUR2PbTn1yqkSpA== X-Received: by 2002:a05:600c:358f:b0:436:17f4:9b3d with SMTP id 5b1f17b1804b1-4362aaa1c24mr53772795e9.4.1734433970278; Tue, 17 Dec 2024 03:12:50 -0800 (PST) Received: from localhost (dslb-084-060-024-069.084.060.pools.vodafone-ip.de. [84.60.24.69]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c80121d4sm11107512f8f.2.2024.12.17.03.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 03:12:49 -0800 (PST) From: Jonas Gorski To: openembedded-core@lists.openembedded.org Cc: Louis Rannou , Richard Purdie Subject: [PATCH kirkstone 4/6] base-passwd: add the wheel group Date: Tue, 17 Dec 2024 12:12:27 +0100 Message-ID: <20241217111229.60698-5-jonas.gorski@bisdn.de> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217111229.60698-1-jonas.gorski@bisdn.de> References: <20241217111229.60698-1-jonas.gorski@bisdn.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Dec 2024 11:12:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208836 From: Louis Rannou The wheel group is not declared while it can be used to access the systemd journal and to configure printers in CUPS. It can also be used for su and sudo permissions. So far it was created later in the rootfs postcommand systemd_create_users. Signed-off-by: Louis Rannou Signed-off-by: Richard Purdie (cherry picked from commit bebe52ae9576393ebb9d7405fc77fba21e84ba5b) Signed-off-by: Jonas Gorski --- .../base-passwd/0008-Add-wheel-group.patch | 20 +++++++++++++++++++ .../base-passwd/base-passwd_3.5.52.bb | 1 + 2 files changed, 21 insertions(+) create mode 100644 meta/recipes-core/base-passwd/base-passwd/0008-Add-wheel-group.patch diff --git a/meta/recipes-core/base-passwd/base-passwd/0008-Add-wheel-group.patch b/meta/recipes-core/base-passwd/base-passwd/0008-Add-wheel-group.patch new file mode 100644 index 000000000000..00eaec38a294 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/0008-Add-wheel-group.patch @@ -0,0 +1,20 @@ + +We need to have a wheel group which has some system privileges to consult the +systemd journal or manage printers with cups. + +Upstream status 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 @@ + staff:*:50: + games:*:60: + shutdown:*:70: ++wheel:*:80: + users:*:100: + nogroup:*:65534: diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb index f89752c07710..66b5a0e7dc6a 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb @@ -13,6 +13,7 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar file://0005-Add-kvm-group.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 \ + file://0008-Add-wheel-group.patch \ " SRC_URI[sha256sum] = "5dfec6556b5a16ecf14dd3f7c95b591d929270289268123f31a3d6317f95ccea" From patchwork Tue Dec 17 11:12:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 54239 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B14F4E77187 for ; Tue, 17 Dec 2024 11:12:57 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web10.79053.1734433973124680120 for ; Tue, 17 Dec 2024 03:12:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bisdn-de.20230601.gappssmtp.com header.s=20230601 header.b=N9QqE43D; spf=none, err=SPF record not found (domain: bisdn.de, ip: 209.85.221.47, mailfrom: jonas.gorski@bisdn.de) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-385e971a2a0so316646f8f.1 for ; Tue, 17 Dec 2024 03:12:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bisdn-de.20230601.gappssmtp.com; s=20230601; t=1734433971; x=1735038771; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8+7+VR1GiiIuTVze+rcTjuGiHUiUk0AN0+G9ySlb7u4=; b=N9QqE43D0JbxSl9K7+teud5UyqV2vUy+3a0shyGkZ0/GSYytxnBEng68jSOy7NjfJ+ 24LjcRDmcLIFp4dMpjkm3WhyrRw1YwfRNWDgOEHZayey6O14FKuqwACe6YYHp0FggQsm MYcFWZ8bambiWqSWH8L1mLorUkT4GqpN1Amhcroz9ZXe5ZhO+5cdgPVB3vRwmRF09FaH XgICChRG1jxNxZtTsrnNEztOJfgFhS5XzDAbflwnKFAB4MqZLz93Vj3rc1AE2qteHcMb JZOvTDHGlv2lSGIL9tKfDptQ+yJTClAxm+NAOJ5Z+7EW72IpWKHvSmvOt3++XdWVdjYa 9cow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734433971; x=1735038771; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8+7+VR1GiiIuTVze+rcTjuGiHUiUk0AN0+G9ySlb7u4=; b=J/s1UE4wv4+J1kUdJPne0tK52uGAFwEH/8NTIljoIJv7s1gIgC/j3pQsVkDuFIjqXs xYWzcE5ugUP3ZhnA6M6/t423PT/IxB3drr5NxXLiU2MTe04oDZtLkVmgcgbx2+D5BAWT T/On7TxN/EvMMt/swNAPRylB6YDaaD4HGAxHrNMw9OiZFGapmNDGUNNajiJxyEQ7UX71 Jh0wCCrQmQzj9WS5cus6YyQN1LBAOYZSZmRLUVHih9k2PCi5DICeemqj40qFN1UMv0hd WQtFmcgZacuRIP2u2e/qM6t4VvuJHLspV4YEaCPxlW5iPR9EJ0OEcKkCX5LtR5RRs4TY GJdw== X-Gm-Message-State: AOJu0YyzBfZ4u3oNmdgldtKCQIAFGcgZm3TZyUYh2Oryrse45C87Xypg GeNy4i0huK/3gMIt6qPxJM5vIEO7RSXGWtUfWy6GF3RzUPYhh7Kyvg1AivQUgkAmQopjXhbnTwE 2LO4wIzAkRSwE28fSRFecxE+Ffr3yF9sSBy6ymOUwJ1qniaV+6Guk//OgZusJSA54gzFntZhOFh vJTbHd3QWa X-Gm-Gg: ASbGnculOx6sPA7KubQ/VEQjIey7Rz/RHKlV0ta6HdV/zyas7xdGqShHcCiUfZwpaKK kuekh6gqIStnPtgasUEklmFr8CszOVycmATEyku5ZWlwcyeeV4geGvsxKrNJMvfQSWpHLDqYtVW EMBreZdiodtmfAF7BgYO3WuwcsxroYaKgULUY/5gP6cOM2cW9+YpPA87kwxO7+VGj/9j5br/eXY kXrzBTcb2LY1bOZtxhqOji+jnbw8SnU2xoHzSfRJPdVJiENixJvCtXdPxAe9NfapPobAy21DMvD jaRAB/CfNBaiB9sfSO0xM589Q2723cc3qw== X-Google-Smtp-Source: AGHT+IGC4xK5pKEIyMubVAWZ2I3XtqMcIHaiC7dZAfOP4ugTJqXQAxupcMp6pPoRgo1vVJ2z+xNj0A== X-Received: by 2002:a5d:47a6:0:b0:386:3afb:19a with SMTP id ffacd0b85a97d-3888dcd4479mr5407744f8f.4.1734433971463; Tue, 17 Dec 2024 03:12:51 -0800 (PST) Received: from localhost (dslb-084-060-024-069.084.060.pools.vodafone-ip.de. [84.60.24.69]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c801643fsm10867848f8f.41.2024.12.17.03.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 03:12:51 -0800 (PST) From: Jonas Gorski To: openembedded-core@lists.openembedded.org Cc: Alexandre Belloni , Richard Purdie Subject: [PATCH kirkstone 5/6] base-passwd: fix patchreview warning Date: Tue, 17 Dec 2024 12:12:28 +0100 Message-ID: <20241217111229.60698-6-jonas.gorski@bisdn.de> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217111229.60698-1-jonas.gorski@bisdn.de> References: <20241217111229.60698-1-jonas.gorski@bisdn.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Dec 2024 11:12:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208837 From: Alexandre Belloni Fix: Malformed Upstream-Status 'Upstream status' (meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch) Unknown Upstream-Status value 'says' (meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch) Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 7b62b32fe154ca40a3bf731eaa5994ec351cf507) Signed-off-by: Jonas Gorski --- .../base-passwd/base-passwd/0008-Add-wheel-group.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/base-passwd/base-passwd/0008-Add-wheel-group.patch b/meta/recipes-core/base-passwd/base-passwd/0008-Add-wheel-group.patch index 00eaec38a294..d77122789d5e 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0008-Add-wheel-group.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0008-Add-wheel-group.patch @@ -2,7 +2,7 @@ We need to have a wheel group which has some system privileges to consult the systemd journal or manage printers with cups. -Upstream status says the group does not exist by default. +Upstream says the group does not exist by default. Upstream-Status: Inappropriate [enable feature] From patchwork Tue Dec 17 11:12:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 54237 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B018BE77184 for ; Tue, 17 Dec 2024 11:12:57 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web10.79055.1734433974284228097 for ; Tue, 17 Dec 2024 03:12:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bisdn-de.20230601.gappssmtp.com header.s=20230601 header.b=xCIbDjYu; spf=none, err=SPF record not found (domain: bisdn.de, ip: 209.85.128.48, mailfrom: jonas.gorski@bisdn.de) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43616c12d72so7057795e9.2 for ; Tue, 17 Dec 2024 03:12:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bisdn-de.20230601.gappssmtp.com; s=20230601; t=1734433973; x=1735038773; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i6Nsu1OWiAwQofIMANvJbnaFEonIzuU8e9M+WFUIK78=; b=xCIbDjYuH0MVc89C+qAZLOevOZNBfx44Ag/blrUU5zf7jD8z8HSQ/Qy4FxD0y9hHkP CWJupgyGHwtnt/bYEvyxUANbyr9qCcjSfP92x4aofNgguwxpmbnMTPdCFsdXPrBD+xkF J0rFlFO7FV+LKf4xlWVpr2NRyfGnYigk+AIe915K28OF+czZvzlbX1pfSc8Av+lFCfRD FhgsnWxclvez94ozOgJIqeGMTLuGMtdU5JTQ2gj1UAaIYSrPVDPnvR1xWOmUBAl2chgF KbvXcQPaXShZ+bD6GqJc98P2ksruc3UaoZEbECnCh4cSw/US/FraGL0DRSlGAMRsw/cw Ui7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734433973; x=1735038773; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i6Nsu1OWiAwQofIMANvJbnaFEonIzuU8e9M+WFUIK78=; b=NyaaSkHcWFBFjzQHmzJvBmlofi6sO1wrtbAEpy1YlPC2AmNn8/V4sQ6roKTUfkUM+m MEJT+Y08Eq5A+cMGv/03Y+2mX8+0e+KpuK592dhW9CTzgefibqnJ9k/Mp+CYx2RtmQdt M/5siCW9Z5sLb2CVhRcPId3pkaHQo+IJWICLnpQNP3Ihxk2Q8a4wCzPHdtnU9utnDLfU pMwUeAO3xH2t38lxD4QmJwxUbeB9HUCwqcqKRorpCJwWv/MhRBU1KjS/vm6KWtvDTaCA S5FCW5AENphuThiq9P2DybjGna4X+WKdyHpYbiwtKbfdoC5o4QbMYu2BYJBy8buJH8cz EzYA== X-Gm-Message-State: AOJu0Yy82Fl2rmhWkPq9dmh9o8wy2hN2d6P340sKeyZtrQe0Z3U9TO6k E3aLTGe3QiZ9is/1bk5zDxX8mOYEqEpLxNNrdlLIUPOBFfI9wE+4Ozvsc/fvpbzftxGOa+f+/Qe 0CTnlUxJulHqti8SzMVM3YxJiIMlcrjcFl2LaxuEtVTJj0jhjEOEbvtPIPtzHQHcObSNjrtMnML kB8ATrILOb X-Gm-Gg: ASbGnctldHvh6ihdLnGvq10+3MMsepi45Ak6XYgwhPcPIwKdT/PJDM9WIrjZBqpl4Y2 323OLGsRm65CUUA9TTCk1OMePUdLTunLGzgmgT5FcXpdp1fZtbRMM9VCeClnhYqfMaX5YpZU3J6 Y/uxjt66JTW8b7ElB7Q39Z1pe/6JDcbLDJHaA9VQYh5YB1QMRZkGsr1EKv1AVfFx8RIu4k/80Fh hjpeQEWVBx8hkRvmw2Ab+yGa2bZd4wA/lNphp4YnkHs5k1idlOK6TC2YP2L5y4CShb9Riw9au67 o1vNZf64SxZLu4hagzpCwvLUsBA2OPRmpw== X-Google-Smtp-Source: AGHT+IH8z8SzCEXJ4tbC5/mM/5fT4iutqMNjbTeYXujsXabTlmMYkug6xkq+1Ikj3I+LPTQVcln06Q== X-Received: by 2002:a05:600c:1c1c:b0:42c:aeee:e603 with SMTP id 5b1f17b1804b1-4362aab2452mr54735745e9.7.1734433972580; Tue, 17 Dec 2024 03:12:52 -0800 (PST) Received: from localhost (dslb-084-060-024-069.084.060.pools.vodafone-ip.de. [84.60.24.69]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4363606eee9sm115439525e9.24.2024.12.17.03.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 03:12:52 -0800 (PST) From: Jonas Gorski To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan , Richard Purdie Subject: [PATCH kirkstone 6/6] base-passwd: Add the sgx group Date: Tue, 17 Dec 2024 12:12:29 +0100 Message-ID: <20241217111229.60698-7-jonas.gorski@bisdn.de> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217111229.60698-1-jonas.gorski@bisdn.de> References: <20241217111229.60698-1-jonas.gorski@bisdn.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Dec 2024 11:12:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208838 From: Alex Kiernan To avoid errors from eudev/udev we need an sgx group, but if we add it via groupadd that causes shadow login to be brought into an image, which causes images which have CONFIG_MULTIUSER unset to fail with `setgid: Function not implemented` as shadow's login doesn't implement the heuristics which busybox has to handle this kernel configuration. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie (cherry picked from commit a1c81ac4a869cc57394071ace2ca086eb8ac47a4) Signed-off-by: Jonas Gorski --- .../0001-base-passwd-Add-the-sgx-group.patch | 30 +++++++++++++++++++ .../base-passwd/base-passwd_3.5.52.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-core/base-passwd/base-passwd/0001-base-passwd-Add-the-sgx-group.patch 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 new file mode 100644 index 000000000000..e1340e1b70cf --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/0001-base-passwd-Add-the-sgx-group.patch @@ -0,0 +1,30 @@ +From 9e57771d138ac423d5139b984b8c869122ce4976 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 + +To avoid errors from eudev/udev we need an sgx group, but if we add it +via groupadd that causes shadow login to be brought into an image, which +causes images which have CONFIG_MULTIUSER unset to fail with `setgid: +Function not implemented` as shadow's login doesn't implement the +heuristics which busybox has to handle this kernel configuration. + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Alex Kiernan +--- + group.master | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/group.master b/group.master +index d34d2b832d43..e54fd1d2c6dc 100644 +--- a/group.master ++++ b/group.master +@@ -34,6 +34,7 @@ video:*:44: + sasl:*:45: + plugdev:*:46: + kvm:*:47: ++sgx:*:48: + staff:*:50: + games:*:60: + shutdown:*:70: diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb index 66b5a0e7dc6a..9fbba7e9c071 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.52.bb @@ -14,6 +14,7 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar file://0006-Make-it-possible-to-build-without-debconf-support.patch \ file://0007-Make-it-possible-to-disable-the-generation-of-the-do.patch \ file://0008-Add-wheel-group.patch \ + file://0001-base-passwd-Add-the-sgx-group.patch \ " SRC_URI[sha256sum] = "5dfec6556b5a16ecf14dd3f7c95b591d929270289268123f31a3d6317f95ccea"