mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-04 11:51:14 +02:00
sys-apps/shadow: Sync with Gentoo
It's from Gentoo commit 43431531314bd4fd6fee130fcb174487b6377a7c. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
7d9a1bb080
commit
eafa488091
@ -1,6 +1,6 @@
|
||||
DIST shadow-4.14.8.tar.xz 1806352 BLAKE2B a6ed45e44560c68baec97072399c106060be859a0f9514da2e5b0ec373e5b9c9f54b402132f39c20401496a5b3faeaa0bc90e1b9f02dd2e3b3ffc7389d0745bb SHA512 6f98ef412874f91cfa3f08877f3fe058d725636705b07d473aa1ea44cb6864059701bd11513caf692d270a7ed8ab1956e04421e53dfb8c74e925b8ec12ab8634
|
||||
DIST shadow-4.14.8.tar.xz.asc 833 BLAKE2B 1b8b8f3f36e06c1dda0a4e0d1508b1ad0ef85f0fa993a92a583831687076ba22d05f47109d56c1e740b60632c3bbeeb6c8cc001e41f46b1a2f9177ce62854f8c SHA512 1db2647babe3f434204c93e7700ff6a0ece078f6c5adb96ae0c0ac9d82a862835c4ab8afb37b0ffc80cf62e9a59f1ba33a92ff454e7ae0ca2aa535b19627615e
|
||||
DIST shadow-4.19.2.tar.xz 2339472 BLAKE2B f2fc64f071e8fe09ed76545abe64e30cff780d7d1c276ebdb05e04ebc36dddb3db86b2537808755049d342e2101247bd76d01c8861b53246f5c81b780952a1e5 SHA512 b03b2fca7bc65dc6b78d465f0b2ab170bb799cbfbdd588b8ae239c1ec99045864302cbd17d27beb1ea0c63ea33370aa28c0231dfb8864e007de21220de8c2f48
|
||||
DIST shadow-4.19.2.tar.xz.asc 488 BLAKE2B f2d76a47b5a8d97ce6528bfa0a4f4b0f3b23c434cc4bd8db9dff186e2b014063907c53d358e59c2c8dd4fbaebccfd6b5063150ed79b0b20b0fe719cf6917b7e0 SHA512 2c434fd939a0a2faca76e48ab3dd1c0afac763fa6b5bfc73c859f552335590d60506fe7649b5ff045692fcc7f378f6ba97dfe798c8682286fd4a9a0eaa4c1f81
|
||||
DIST shadow-4.19.3.tar.xz 2347720 BLAKE2B 8c9f6faa37bba130364086635c91562bfc786740a0276366d9771aaa289dcbba5cd7550437596e43f91348ab29bab77e9894232feffc8498c4cc1bbd48bec3d3 SHA512 f2b41f8186681eb98dae0da87ed1a1f03327c5005c9d4bf9500801352e318de6f5954dc5b8f30ab9aece728b1efb74b4ff8fb2720acc4c2aaef701331a4a5a05
|
||||
DIST shadow-4.19.3.tar.xz.asc 833 BLAKE2B 936a9103b65c3564b1d5f00259965921e7aa1615714b04e783441f2fa79e78c386cf9056758cba4f8c36f740490dedb8acd68d88979cc153bb78d2a800d01156 SHA512 295a6bffefd333a9ea84fa59b368f5c48d0ac5224199624b768087098110b0f0c19bef37f5c474c45277980758dcb6728e8bb17eb7ab1a57603cad41f1dd00ab
|
||||
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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -42,7 +42,7 @@ COMMON_DEPEND="
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
>=sys-kernel/linux-headers-4.14
|
||||
kernel_linux? ( >=sys-kernel/linux-headers-4.14 )
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -42,7 +42,7 @@ COMMON_DEPEND="
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
>=sys-kernel/linux-headers-4.14
|
||||
kernel_linux? ( >=sys-kernel/linux-headers-4.14 )
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
|
||||
@ -1,271 +0,0 @@
|
||||
# Copyright 1999-2025 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 verify-sig
|
||||
|
||||
DESCRIPTION="Utilities to deal with user accounts"
|
||||
HOMEPAGE="https://github.com/shadow-maint/shadow"
|
||||
SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
|
||||
SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz.asc )"
|
||||
|
||||
LICENSE="BSD GPL-2"
|
||||
# Subslot is for libsubid's SONAME.
|
||||
SLOT="0/4"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="acl audit cracklib nls pam selinux skey split-usr su systemd 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 )
|
||||
|
||||
REQUIRED_USE="?? ( cracklib pam )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
virtual/libcrypt:=
|
||||
acl? ( sys-apps/acl:= )
|
||||
audit? ( >=sys-process/audit-2.6:= )
|
||||
cracklib? ( >=sys-libs/cracklib-2.7-r3:= )
|
||||
nls? ( virtual/libintl )
|
||||
pam? ( sys-libs/pam:= )
|
||||
skey? ( sys-auth/skey:= )
|
||||
selinux? (
|
||||
>=sys-libs/libselinux-1.28:=
|
||||
sys-libs/libsemanage:=
|
||||
)
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
xattr? ( sys-apps/attr:= )
|
||||
!<sys-libs/glibc-2.38
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
>=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
|
||||
"
|
||||
|
||||
if [[ ${PV} == *.0 ]]; then
|
||||
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-sergehallyn )"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sergehallyn.asc
|
||||
else
|
||||
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alejandro-colomar.asc
|
||||
fi
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
# Negate new upstream default of disabling for now
|
||||
--enable-lastlog
|
||||
--disable-account-tools-setuid
|
||||
--disable-static
|
||||
--with-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 cracklib libcrack)
|
||||
$(use_with elibc_glibc nscd)
|
||||
$(use_with pam libpam)
|
||||
$(use_with selinux)
|
||||
$(use_with skey)
|
||||
$(use_with su)
|
||||
$(use_with xattr attr)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
|
||||
if use nls ; then
|
||||
local l langs="po" # These are the pot files.
|
||||
for l in ${LANGS[*]} ; do
|
||||
has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
|
||||
done
|
||||
sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
set_login_opt() {
|
||||
local comment="" opt=${1} val=${2}
|
||||
if [[ -z ${val} ]]; then
|
||||
comment="#"
|
||||
sed -i \
|
||||
-e "/^${opt}\>/s:^:#:" \
|
||||
"${ED}"/etc/login.defs || die
|
||||
else
|
||||
sed -i -r \
|
||||
-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
|
||||
"${ED}"/etc/login.defs
|
||||
fi
|
||||
local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
|
||||
einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" suidperms=4755 install
|
||||
|
||||
# 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
|
||||
if ! use pam ; then
|
||||
insopts -m0600
|
||||
doins etc/login.access etc/limits
|
||||
fi
|
||||
|
||||
# needed for 'useradd -D'
|
||||
insinto /etc/default
|
||||
insopts -m0600
|
||||
doins "${FILESDIR}"/default/useradd
|
||||
|
||||
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
|
||||
|
||||
cd "${S}" || die
|
||||
insinto /etc
|
||||
insopts -m0644
|
||||
newins etc/login.defs login.defs
|
||||
|
||||
set_login_opt CREATE_HOME yes
|
||||
if ! use pam ; then
|
||||
set_login_opt MAIL_CHECK_ENAB no
|
||||
set_login_opt SU_WHEEL_ONLY yes
|
||||
set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
|
||||
set_login_opt LOGIN_RETRIES 3
|
||||
set_login_opt ENCRYPT_METHOD SHA512
|
||||
set_login_opt CONSOLE
|
||||
else
|
||||
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
|
||||
|
||||
newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
|
||||
|
||||
# Comment out login.defs options that pam hates
|
||||
local opt sed_args=()
|
||||
for opt in \
|
||||
CHFN_AUTH \
|
||||
CONSOLE \
|
||||
CRACKLIB_DICTPATH \
|
||||
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
|
||||
do
|
||||
set_login_opt ${opt}
|
||||
sed_args+=( -e "/^#${opt}\>/b pamnote" )
|
||||
done
|
||||
sed -i "${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' \
|
||||
"${ED}"/etc/login.defs || die
|
||||
|
||||
# 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 id.1 -o -name getspnam.3 ')' \
|
||||
-delete || die
|
||||
|
||||
if ! use su ; then
|
||||
find "${ED}"/usr/share/man -type f -name su.1 -delete || die
|
||||
fi
|
||||
|
||||
cd "${S}" || die
|
||||
dodoc ChangeLog NEWS TODO
|
||||
newdoc README README.download
|
||||
cd doc || die
|
||||
dodoc HOWTO README* WISHLIST *.txt
|
||||
|
||||
if use elibc_musl; then
|
||||
QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent )
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
rm -f "${EROOT}"/etc/pam.d/system-auth.new \
|
||||
"${EROOT}/etc/login.defs.new"
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# Enable shadow groups.
|
||||
if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then
|
||||
if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
|
||||
grpconv -R "${EROOT:-/}"
|
||||
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
|
||||
|
||||
einfo "The 'adduser' symlink to 'useradd' has been dropped."
|
||||
}
|
||||
@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
|
||||
LICENSE="BSD GPL-2"
|
||||
# Subslot is for libsubid's SONAME.
|
||||
SLOT="0/5"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
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 xattr"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
@ -41,7 +41,7 @@ COMMON_DEPEND="
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
>=sys-kernel/linux-headers-4.14
|
||||
kernel_linux? ( >=sys-kernel/linux-headers-4.14 )
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
@ -86,7 +86,7 @@ src_configure() {
|
||||
--enable-lastlog
|
||||
--disable-account-tools-setuid
|
||||
--disable-static
|
||||
--with-btrfs
|
||||
$(use_with kernel_linux btrfs)
|
||||
# Use bundled replacements for readpassphrase and freezero
|
||||
--without-libbsd
|
||||
--without-group-name-max-length
|
||||
@ -221,6 +221,11 @@ src_install() {
|
||||
if use elibc_musl; then
|
||||
QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent )
|
||||
fi
|
||||
|
||||
if use kernel_Hurd ; then
|
||||
# sys-kernel/hurd provides this instead
|
||||
rm "${ED}"/bin/login || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
|
||||
@ -41,7 +41,7 @@ COMMON_DEPEND="
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
>=sys-kernel/linux-headers-4.14
|
||||
kernel_linux? ( >=sys-kernel/linux-headers-4.14 )
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
@ -56,8 +56,8 @@ BDEPEND="
|
||||
test? ( dev-util/cmocka )
|
||||
"
|
||||
|
||||
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-sergehallyn )"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sergehallyn.asc
|
||||
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-alejandro-colomar-20260122 )"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alejandro-colomar.asc
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
@ -86,7 +86,7 @@ src_configure() {
|
||||
--enable-lastlog
|
||||
--disable-account-tools-setuid
|
||||
--disable-static
|
||||
--with-btrfs
|
||||
$(use_with kernel_linux btrfs)
|
||||
# Use bundled replacements for readpassphrase and freezero
|
||||
--without-libbsd
|
||||
--without-group-name-max-length
|
||||
@ -221,6 +221,11 @@ src_install() {
|
||||
if use elibc_musl; then
|
||||
QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent )
|
||||
fi
|
||||
|
||||
if use kernel_Hurd ; then
|
||||
# sys-kernel/hurd provides this instead
|
||||
rm "${ED}"/bin/login || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
Loading…
x
Reference in New Issue
Block a user