sys-apps/shadow: add 4.20.0

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
2026-09-24 17:09:10 -07:00 · 2026-07-29 13:44:58 -04:00
parent 286e470450
commit 652b9a8ddb
3 changed files with 309 additions and 0 deletions
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,2 +1,4 @@
 DIST shadow-4.19.4.tar.xz 2332684 BLAKE2B 4acebcf93be2b6700b33f466e8ada8799ae479a9db0892c2c3d9279acda539ecbce7d0f0c940fc22ae44f6ae9ee9aa91a3bf6e5f22ce2132a464fb13f3c61987 SHA512 6be382087e85566c5c14023decd6edd3b9f0c768a6b00c8389b31cb73fecaaa1b8b9b105374d582c8054e60e158fa3e34acf616a64dca04613bdf06cb08ab664
 DIST shadow-4.19.4.tar.xz.asc 833 BLAKE2B 4daf863f4187819adb9bb9c7c6c6939451c0a341c9aa4d63161d8090120b58d3a094939be7788c1c362a2b74ec411b1cc7dd2a208cf9cb49e0dbea529f2ddd84 SHA512 accd3755d15f8b37f0140b6c09a06368570ec88bd1bf590c9a01bd7e9497c52af4d71ff93717208aedb24229667d72cf65a5ba4f924e1b1fd65783904601fbdb
+DIST shadow-4.20.0.tar.xz 2290288 BLAKE2B 8224edc692d6016da26e54aa43405029b4bebcbc7a73a9a56f1ee3bdcf7c7a3af6b90d8fc134182fc26c6b7b8f2afc4f54c2f6e6748760b8928284aa77374a15 SHA512 0b8afded372e4d37a78f38cb972c0ab877870ef6356cdd1c45be3c708af3d1496c6f87de6bf6a5b1d217d4d52d7e2d15c28b26530949cc6de0231a4028930406
+DIST shadow-4.20.0.tar.xz.asc 833 BLAKE2B fff1be3214eb271f6d75a36c0647e4f7183a0d65ad20169ed889fd44446f7f64b1b20e43f9978d063bc6ca2a5fbbe66f79b48bde25c63a54db2cc68d7cb74a39 SHA512 e4b134543768f323df30a1e450c22086d013020928d62bd3207db7f633beea3587b67802da5b575d5a794e8c2bebd7a0abeba6ed69d44bf08adc37df3bf352ac
--- a/sys-apps/shadow/files/shadow-4.20.0-subid-stdint.patch
+++ b/sys-apps/shadow/files/shadow-4.20.0-subid-stdint.patch
@@ -0,0 +1,42 @@
+https://github.com/shadow-maint/shadow/pull/1699
+
+From ba4419c57b222b0d34a2b933e7ee92914a51b596 Mon Sep 17 00:00:00 2001
+From: ojab <ojab@ojab.ru>
+Date: Wed, 29 Jul 2026 15:07:43 +0000
+Subject: [PATCH] subid: Add `<stdint.h>` for `uintmax_t`
+
+```
+find_new_sub_uids.c:80:27: error: 'uintmax_t' undeclared (first use in this function)
+find_new_sub_gids.c:80:27: error: 'uintmax_t' undeclared (first use in this function)
+```
+
+Fixes: 4d800cf2eb9e (2026-04-09; "subid: Add deterministic subid ranges")
+---
+ lib/find_new_sub_gids.c | 1 +
+ lib/find_new_sub_uids.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/lib/find_new_sub_gids.c b/lib/find_new_sub_gids.c
+index 3971ce922e..de514d6b09 100644
+--- a/lib/find_new_sub_gids.c
+++ b/lib/find_new_sub_gids.c
+@@ -8,6 +8,7 @@
+ 
+ #ifdef ENABLE_SUBIDS
+ 
+#include <stdint.h>
+ #include <stdio.h>
+ #include <errno.h>
+ 
+diff --git a/lib/find_new_sub_uids.c b/lib/find_new_sub_uids.c
+index 65f6815467..f0b4328387 100644
+--- a/lib/find_new_sub_uids.c
+++ b/lib/find_new_sub_uids.c
+@@ -8,6 +8,7 @@
+ 
+ #ifdef ENABLE_SUBIDS
+ 
+#include <stdint.h>
+ #include <stdio.h>
+ #include <errno.h>
+ 
--- a/sys-apps/shadow/shadow-4.20.0.ebuild
+++ b/sys-apps/shadow/shadow-4.20.0.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2026 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.
+
+inherit libtool pam user-info verify-sig
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${MY_PV}/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${MY_PV}/${MY_P}.tar.xz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD GPL-2"
+# Subslot is for libsubid's SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl audit nls pam selinux skey split-usr su systemd test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	acct-group/shadow
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl:= )
+	audit? ( >=sys-process/audit-2.6:= )
+	nls? ( virtual/libintl )
+	pam? ( sys-libs/pam:= )
+	skey? ( sys-auth/skey:= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:=
+		sys-libs/libsemanage:=
+	)
+	systemd? ( sys-apps/systemd:= )
+	!<sys-libs/glibc-2.38
+"
+DEPEND="
+	${COMMON_DEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-4.14 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
+"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+	test? ( dev-util/cmocka )
+"
+
+BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-alejandro-colomar-20260122 )"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alejandro-colomar.asc
+
+PATCHES=(
+	"${FILESDIR}/shadow-4.20.0-subid-stdint.patch"
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_login_opt() {
+	local comment="" opt=${1} val=${2}
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			etc/login.defs || die
+	fi
+	local res=$(grep "^${comment}${opt}\>" etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in etc/login.defs}"
+}
+
+src_configure() {
+	local myeconfargs=(
+		# Negate new upstream default of disabling for now
+		--enable-lastlog
+		--disable-static
+		$(use_with kernel_linux btrfs)
+		# Use bundled replacements for readpassphrase and freezero
+		--without-libbsd
+		--without-group-name-max-length
+		--without-tcb
+		--with-bcrypt
+		--with-yescrypt
+		$(use_enable nls)
+		# TODO: wire up upstream for elogind too (bug #931119)
+		$(use_enable systemd logind)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with elibc_glibc nscd)
+		$(use_with pam libpam)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with su)
+	)
+
+	econf "${myeconfargs[@]}"
+
+	set_login_opt CREATE_HOME yes
+	if use pam; then
+		# Comment out login.defs options that pam hates
+		local opts=(
+			CHFN_AUTH
+			CONSOLE
+			ENV_HZ
+			ENVIRON_FILE
+			FAILLOG_ENAB
+			FTMP_FILE
+			LASTLOG_ENAB
+			MAIL_CHECK_ENAB
+			MOTD_FILE
+			NOLOGINS_FILE
+			OBSCURE_CHECKS_ENAB
+			PASS_ALWAYS_WARN
+			PASS_CHANGE_TRIES
+			PASS_MIN_LEN
+			PORTTIME_CHECKS_ENAB
+			QUOTAS_ENAB
+			SU_WHEEL_ONLY
+		)
+		local opt sed_args=()
+		for opt in "${opts[@]}"; do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed_args+=(
+			-e 'b exit'
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.'
+			-e ': exit'
+		)
+		sed -i "${sed_args[@]}" etc/login.defs || die
+	else
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD YESCRYPT
+		set_login_opt CONSOLE
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4755 install
+
+	fowners :shadow /usr/bin/chage
+	fperms u-s,g+s /usr/bin/chage
+
+	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
+	emake DESTDIR="${D}" -C man install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	insinto /etc
+	doins etc/login.defs
+
+	# needed for 'useradd -D'
+	insopts -m0600
+	insinto /etc/default
+	doins "${FILESDIR}"/default/useradd
+
+	if ! use pam ; then
+		doins etc/login.access etc/limits
+	fi
+
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
+	if use pam; then
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chsh chfn ; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chpasswd newusers ; do
+			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+		done
+
+		# Remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man -type f \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man -type f -name getspnam.3 -delete || die
+
+	if ! use su ; then
+		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
+	fi
+
+	dodoc README doc/HOWTO doc/README.limits
+
+	if use elibc_musl; then
+		QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent )
+	fi
+
+	if use kernel_Hurd ; then
+		# sys-kernel/hurd provides this instead
+		mv "${ED}"/bin/login "${ED}"/bin/login.shadow || die
+	fi
+}
+
+pkg_postinst() {
+	# Missing entries from /etc/passwd can cause odd system blips.
+	# See bug #829872.
+	if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
+		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
+	fi
+
+	local group=shadow
+
+	if [[ -n ${ROOT} ]]; then
+		# Resolve to a group id using ${ROOT}/etc/passwd
+		group=$(egetent group shadow | cut -d: -f3)
+		if [[ -n ${group} ]]; then
+			chgrp "${group}" "${EROOT}"/usr/bin/{chage,expiry} &&
+			chmod g+s "${EROOT}"/usr/bin/{chage,expiry}
+		fi
+	fi
+
+	# Enable shadow groups.
+	if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then
+		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
+			grpconv -R "${EROOT:-/}"
+			if [[ -n ${group} ]]; then
+				chgrp "${group}" "${EROOT}"/etc/gshadow &&
+				chmod g+r "${EROOT}"/etc/gshadow
+			fi
+		else
+			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+}