From 5bc82ecd054b39e120ef9e62b971e02a43d5566e Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 2 Nov 2023 16:17:50 +0800 Subject: base-passwd: upgrade 3.6.1 -> 3.6.2 0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch removed since it's included in 3.6.2 (From OE-Core rev: f318a13e8b6ce3ded313fa17ab80b35b936205fb) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...sible-to-configure-whether-to-use-SELinux.patch | 35 ------ meta/recipes-core/base-passwd/base-passwd_3.6.1.bb | 126 --------------------- meta/recipes-core/base-passwd/base-passwd_3.6.2.bb | 125 ++++++++++++++++++++ 3 files changed, 125 insertions(+), 161 deletions(-) delete mode 100644 meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch delete mode 100644 meta/recipes-core/base-passwd/base-passwd_3.6.1.bb create mode 100644 meta/recipes-core/base-passwd/base-passwd_3.6.2.bb (limited to 'meta/recipes-core/base-passwd') diff --git a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch deleted file mode 100644 index 2cc6174e2a..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 25e3bf09bbbb04aa930ea0fd9f28809a24fb7194 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt -Date: Sun, 2 Oct 2022 17:47:29 +0200 -Subject: [PATCH] Make it possible to configure whether to use SELinux or not - -Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/396c41bb35e03c5dcc727aa9f74218a45874ac1f] -Signed-off-by: Peter Kjellerstedt ---- - configure.ac | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 589df88..e46403b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,18 @@ AC_SYS_LARGEFILE - - dnl Scan for things we need - AC_CHECK_FUNCS([putgrent]) --AC_CHECK_LIB([selinux], [is_selinux_enabled]) -+ -+dnl Check for SELinux -+AC_MSG_CHECKING([whether to enable SELinux support]) -+AC_ARG_ENABLE([selinux], -+ [AS_HELP_STRING([--disable-selinux], [disable support for SELinux])], -+ [], -+ [enable_selinux=yes]) -+AC_MSG_RESULT($enable_selinux) -+AS_IF([test "x$enable_selinux" != xno], -+ [AC_CHECK_LIB([selinux], [is_selinux_enabled], [], -+ [AC_MSG_ERROR( -+ [SELinux support not available (use --disable-selinux to disable)])])]) - - dnl Check for debconf - AC_MSG_CHECKING([whether to enable debconf support]) diff --git a/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb deleted file mode 100644 index 44bcfb0199..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb +++ /dev/null @@ -1,126 +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://0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch \ - file://0007-Add-wheel-group.patch \ - file://0001-base-passwd-Add-the-sgx-group.patch \ - " - -SRC_URI[sha256sum] = "6ff369be59d586ba63c0c5fcb00f75f9953fe49db88bc6c6428f2c92866f79af" - -# 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 - -# 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.2.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb new file mode 100644 index 0000000000..bb4b49e6ab --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd_3.6.2.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] = "06dc78352bf38a8df76ff295e15ab5654cdefe41e62368b15bfcbbab8e4ec2a0" + +# 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 + +# 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