From 3910db149938313526a52cfd16ffe4920108f5fa Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 25 Nov 2024 13:00:54 +0100 Subject: base-passwd: upgrade 3.6.4 -> 3.6.5 (From OE-Core rev: aee2b70b635fe7a94cedd13433ba8d77cdb34d1c) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../base-passwd/0001-Add-a-shutdown-group.patch | 2 +- .../0001-base-passwd-Add-the-sgx-group.patch | 4 +- ...-sh-instead-of-bin-bash-for-the-root-user.patch | 4 +- ...r-root-since-we-do-not-have-an-etc-shadow.patch | 4 +- ...-an-input-group-for-the-dev-input-devices.patch | 4 +- .../base-passwd/0005-Add-kvm-group.patch | 2 +- .../base-passwd/0007-Add-wheel-group.patch | 18 ++- meta/recipes-core/base-passwd/base-passwd_3.6.4.bb | 125 --------------------- meta/recipes-core/base-passwd/base-passwd_3.6.5.bb | 125 +++++++++++++++++++++ 9 files changed, 148 insertions(+), 140 deletions(-) delete mode 100644 meta/recipes-core/base-passwd/base-passwd_3.6.4.bb create mode 100644 meta/recipes-core/base-passwd/base-passwd_3.6.5.bb (limited to 'meta') 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 33b0b5820d..60e755fd9a 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 49371dfc984ac895d658d01108e8bf58675ce8c9 Mon Sep 17 00:00:00 2001 +From 03150b2575c5ec1ba30726d30d47303627e6fc60 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 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..41dfc27178 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 6ad8995014cc30c932a8b4dae066c56ae33a107f 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..61b3ed38d7 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 54bb95b9c4532f9cbe634dd43798ce37c93d6f50 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..6b13d4c967 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 03406451d66a9d561d6e32a181248e5a0bd58d58 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..85739d5b47 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 662da5251f3f9634c583eeccc8242a05393d37be 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 0101637e9e..65a9ef53a3 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 74fc91ee809bc902f79144ee2277fa3e368c30d0 Mon Sep 17 00:00:00 2001 +From c6e5c31cd276f69a4db479188efb3ab3e0f35dd8 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/0007-Add-wheel-group.patch b/meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch index d77122789d..a4d2dd875b 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 fc9790b768971d5b9e9b6d215bc29885a646c335 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.4.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.4.bb deleted file mode 100644 index df4889f220..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd_3.6.4.bb +++ /dev/null @@ -1,125 +0,0 @@ -SUMMARY = "Base system master password/group files" -DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files." -HOMEPAGE = "https://launchpad.net/base-passwd" -SECTION = "base" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" - -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://0007-Add-wheel-group.patch \ - file://0001-base-passwd-Add-the-sgx-group.patch \ - " - -SRC_URI[sha256sum] = "4b5232c5910932215b87bbde6f3c6c9a97021fe7902bd837b1ede8cc0be84a65" - -# 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" - -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" -PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux" - -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}/ - install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8 - install -p -m 644 ${S}/man/update-passwd.8 ${D}${mandir}/man8/ - install -p -m 644 ${S}/man/update-passwd.pl.8 \ - ${D}${mandir}/pl/man8/update-passwd.8 - gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/* - 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} - install -p -m 644 ${S}/debian/changelog ${D}${docdir}/${BPN}/ - gzip -9 ${D}${docdir}/${BPN}/* - install -p -m 644 ${S}/README ${D}${docdir}/${BPN}/ - install -p -m 644 ${S}/debian/copyright ${D}${docdir}/${BPN}/ -} - -basepasswd_sysroot_postinst() { -#!/bin/sh -e - -# Install passwd.master and group.master to sysconfdir -install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir} -for i in passwd group; do - install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/\$i.master \ - ${STAGING_DIR_TARGET}${sysconfdir}/\$i -done - -# Run any useradd postinsts -for script in ${STAGING_DIR_TARGET}${bindir}/postinst-useradd-*; do - if [ -f \$script ]; then - \$script - fi -done -} - -SYSROOT_DIRS += "${sysconfdir}" -SYSROOT_PREPROCESS_FUNCS += "base_passwd_tweaksysroot" - -base_passwd_tweaksysroot () { - mkdir -p ${SYSROOT_DESTDIR}${bindir} - dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN} - echo "${basepasswd_sysroot_postinst}" > $dest - chmod 0755 $dest -} - -python populate_packages:prepend() { - # Add in the preinst function for ${PN} - # We have to do this here as prior to this, passwd/group.master - # would be unavailable. We need to create these files at preinst - # time before the files from the package may be available, hence - # storing the data from the files in the preinst directly. - - f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') - passwd = "".join(f.readlines()) - f.close() - f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') - group = "".join(f.readlines()) - f.close() - - preinst = """#!/bin/sh -mkdir -p $D${sysconfdir} -if [ ! -e $D${sysconfdir}/passwd ]; then -\tcat << 'EOF' > $D${sysconfdir}/passwd -""" + passwd + """EOF -fi -if [ ! -e $D${sysconfdir}/group ]; then -\tcat << 'EOF' > $D${sysconfdir}/group -""" + group + """EOF -fi -""" - d.setVar(d.expand('pkg_preinst:${PN}'), preinst) -} - -addtask do_package after do_populate_sysroot - -ALLOW_EMPTY:${PN} = "1" - -PACKAGES =+ "${PN}-update" -FILES:${PN}-update = "${sbindir}/* ${datadir}/${PN}" - -pkg_postinst:${PN}-update () { -#!/bin/sh -if [ -n "$D" ]; then - exit 0 -fi -${sbindir}/update-passwd -} diff --git a/meta/recipes-core/base-passwd/base-passwd_3.6.5.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.5.bb new file mode 100644 index 0000000000..47c15e5541 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd_3.6.5.bb @@ -0,0 +1,125 @@ +SUMMARY = "Base system master password/group files" +DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files." +HOMEPAGE = "https://launchpad.net/base-passwd" +SECTION = "base" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" + +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://0007-Add-wheel-group.patch \ + file://0001-base-passwd-Add-the-sgx-group.patch \ + " + +SRC_URI[sha256sum] = "bd30ab67b1f8029d3e70d3419e5033fb4595ab91c91307c3b7c00978e8d111b2" + +# 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" + +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux" + +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}/ + install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8 + install -p -m 644 ${S}/man/update-passwd.8 ${D}${mandir}/man8/ + install -p -m 644 ${S}/man/update-passwd.pl.8 \ + ${D}${mandir}/pl/man8/update-passwd.8 + gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/* + 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} + install -p -m 644 ${S}/debian/changelog ${D}${docdir}/${BPN}/ + gzip -9 ${D}${docdir}/${BPN}/* + install -p -m 644 ${S}/README ${D}${docdir}/${BPN}/ + install -p -m 644 ${S}/debian/copyright ${D}${docdir}/${BPN}/ +} + +basepasswd_sysroot_postinst() { +#!/bin/sh -e + +# Install passwd.master and group.master to sysconfdir +install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir} +for i in passwd group; do + install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/\$i.master \ + ${STAGING_DIR_TARGET}${sysconfdir}/\$i +done + +# Run any useradd postinsts +for script in ${STAGING_DIR_TARGET}${bindir}/postinst-useradd-*; do + if [ -f \$script ]; then + \$script + fi +done +} + +SYSROOT_DIRS += "${sysconfdir}" +SYSROOT_PREPROCESS_FUNCS += "base_passwd_tweaksysroot" + +base_passwd_tweaksysroot () { + mkdir -p ${SYSROOT_DESTDIR}${bindir} + dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN} + echo "${basepasswd_sysroot_postinst}" > $dest + chmod 0755 $dest +} + +python populate_packages:prepend() { + # Add in the preinst function for ${PN} + # We have to do this here as prior to this, passwd/group.master + # would be unavailable. We need to create these files at preinst + # time before the files from the package may be available, hence + # storing the data from the files in the preinst directly. + + f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') + passwd = "".join(f.readlines()) + f.close() + f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') + group = "".join(f.readlines()) + f.close() + + preinst = """#!/bin/sh +mkdir -p $D${sysconfdir} +if [ ! -e $D${sysconfdir}/passwd ]; then +\tcat << 'EOF' > $D${sysconfdir}/passwd +""" + passwd + """EOF +fi +if [ ! -e $D${sysconfdir}/group ]; then +\tcat << 'EOF' > $D${sysconfdir}/group +""" + group + """EOF +fi +""" + d.setVar(d.expand('pkg_preinst:${PN}'), preinst) +} + +addtask do_package after do_populate_sysroot + +ALLOW_EMPTY:${PN} = "1" + +PACKAGES =+ "${PN}-update" +FILES:${PN}-update = "${sbindir}/* ${datadir}/${PN}" + +pkg_postinst:${PN}-update () { +#!/bin/sh +if [ -n "$D" ]; then + exit 0 +fi +${sbindir}/update-passwd +} -- cgit v1.2.3-54-g00ecf