diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-01-18-shadow-4.13.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-01-18-shadow-4.13.md new file mode 100644 index 0000000000..f2df123b59 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-01-18-shadow-4.13.md @@ -0,0 +1 @@ +- shadow ([4.13](https://github.com/shadow-maint/shadow/releases/tag/4.13)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest index 55f12ced77..ca3ab73585 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest @@ -1,2 +1,2 @@ -DIST shadow-4.12.3.tar.xz 1747620 BLAKE2B 63b10d75a11d419156a996b8acf1bebbfab28999c2ab796e6625c028882073d4021806d8b56224190886c076a1205955e7797cb6f797ef73af3a8a33ac34bf2f SHA512 0529889258f54e7634762dc154aa680d55f8c5f1654afadd1b7431cfbb890a3b1ba27c7ff4b7c45986e4ee2289946db2e420b23ed13e4e5b15800a1fb3a013bc -DIST shadow-4.12.3.tar.xz.asc 488 BLAKE2B b23525c3303f78df9d046c0225ed3ee1715cb000650630daae8b41fb71413daa45b5fe39a98fc640aaafa0f219fbaf9e065afa6b44f051373fb1967358ccc43d SHA512 d3f294d86c0e2174c88809810a801737c01cd01f9cadbe7b1ae382b2745d86e2e30c0718fa6489c2abb65500ed94c8ac1961d05243b5a1800c966384c69281c9 +DIST shadow-4.13.tar.xz 1762908 BLAKE2B 315ab8a7e598aeefb50c11293e20cfa0982c3c3ae21c35ae243d09a4facf97a13c1d672990876e74ef94f5284402acf14997663743e2aaefa6cfc4369b7d24dc SHA512 2949a728c3312bef13d23138d6b79caf402781b1cb179e33b5be546c1790971ec20778d0e9cd3dbe09691d928ffcbe88e60da42fab58c69a90d5ebe5e3e2ab8e +DIST shadow-4.13.tar.xz.asc 488 BLAKE2B de1f8285c5713a772343a2a7c638d1d13429dd4fa867d4f91d4922aa0d083b4a3110d38e8a8ab82137fdf4fecb12ba3677f3fb235401fc6438ae663fbd9bfbd2 SHA512 f8549c4e699c65721d53946d61b6127712572f7ad9ee13018ef3a25307002992aa727471c948d1bb22dcddf112715bed387d28f436123f30e153ae6bc0cd3648 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.13-configure-clang16.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.13-configure-clang16.patch new file mode 100644 index 0000000000..4e703db93a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.13-configure-clang16.patch @@ -0,0 +1,38 @@ +https://github.com/shadow-maint/shadow/commit/a281f241b592aec636d1b93a99e764499d68c7ef +https://github.com/shadow-maint/shadow/pull/595 + +From a281f241b592aec636d1b93a99e764499d68c7ef Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 21 Nov 2022 11:52:45 +0100 +Subject: [PATCH] Fix HAVE_SHADOWGRP configure check + +The missing #include causes the configure check to fail +spuriously, resulting in HAVE_SHADOWGRP not being defined even +on systems that actually have sgetsgent (such as current glibc). +--- a/configure.ac ++++ b/configure.ac +@@ -116,6 +116,10 @@ if test "$ac_cv_header_shadow_h" = "yes"; then + ac_cv_libc_shadowgrp, + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #include ++ #ifdef HAVE_GSHADOW_H ++ #include ++ #endif ++ int + main() + { + struct sgrp *sg = sgetsgent("test:x::"); + +--- a/configure ++++ b/configure +@@ -15684,6 +15684,10 @@ else $as_nop + /* end confdefs.h. */ + + #include ++ #ifdef HAVE_GSHADOW_H ++ #include ++ #endif ++ int + main() + { + struct sgrp *sg = sgetsgent("test:x::"); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.12.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.13-r1.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.12.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.13-r1.ebuild index fc15f6f3df..682625ab58 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.12.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.13-r1.ebuild @@ -1,10 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +# Upstream sometimes pushes releases as pre-releases before marking them +# official. Don't keyword the pre-releases! +# Check https://github.com/shadow-maint/shadow/releases. + +# Flatcar: TMPFILES_OPTIONAL=1 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sergehallyn.asc +# Flatcar: install systemd units and tmpfiles inherit libtool pam verify-sig systemd tmpfiles DESCRIPTION="Utilities to deal with user accounts" @@ -15,7 +21,7 @@ SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/downloa LICENSE="BSD GPL-2" # Subslot is for libsubid's SONAME. SLOT="0/4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr" # Taken from the man/Makefile.am file. LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW ) @@ -58,7 +64,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch" + "${FILESDIR}"/${P}-configure-clang16.patch ) src_prepare() { @@ -99,6 +105,7 @@ src_configure() { } set_login_opt() { + # Flatcar: /etc/login.defs becomes /usr/share/shadow/login.defs local comment="" opt=${1} val=${2} if [[ -z ${val} ]]; then comment="#" @@ -122,6 +129,7 @@ src_install() { find "${ED}" -name '*.la' -type f -delete || die + # Flatcar: # Remove files from /etc, they will be symlinks to /usr instead. rm -f "${ED}"/etc/{limits,login.access,login.defs,securetty,default/useradd} @@ -137,6 +145,7 @@ src_install() { insopts -m0600 doins etc/login.access etc/limits fi + # Flatcar: # Using a securetty with devfs device names added # (compat names kept for non-devfs compatibility) insopts -m0600 ; doins "${FILESDIR}"/securetty