commit:     f3d0d1732ec85fa45bf00346c2e81f9e6dd35872
Author:     Michael Vetter <jubalh <AT> iodoru <DOT> org>
AuthorDate: Fri Oct  6 12:10:04 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 15:40:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3d0d173

sys-apps/shadow: add 4.14.2

Signed-off-by: Michael Vetter <jubalh <AT> iodoru.org>
Closes: https://github.com/gentoo/gentoo/pull/33214
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/shadow/Manifest             |   2 +
 sys-apps/shadow/shadow-4.14.2.ebuild | 270 +++++++++++++++++++++++++++++++++++
 2 files changed, 272 insertions(+)

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 55b1cc480711..16a1df334993 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -2,3 +2,5 @@ DIST shadow-4.13.tar.xz 1762908 BLAKE2B 
315ab8a7e598aeefb50c11293e20cfa0982c3c3a
 DIST shadow-4.13.tar.xz.asc 488 BLAKE2B 
de1f8285c5713a772343a2a7c638d1d13429dd4fa867d4f91d4922aa0d083b4a3110d38e8a8ab82137fdf4fecb12ba3677f3fb235401fc6438ae663fbd9bfbd2
 SHA512 
f8549c4e699c65721d53946d61b6127712572f7ad9ee13018ef3a25307002992aa727471c948d1bb22dcddf112715bed387d28f436123f30e153ae6bc0cd3648
 DIST shadow-4.14.0.tar.xz 1787892 BLAKE2B 
6e9a6108f856953ec91c597e46ad4f912101a829c7b3ff3389510be43f56f0a70425bd562119282d73df269df45af354e626741ad748f9c1e6f27b74a462a62c
 SHA512 
ff960481d576f9db5a9f10becc4e1a74c03de484ecfdcd7f1ea735fded683d7ba0f9cd895dc6a431b77e5a633752273178b1bcda4cefaa5adbf0f143c9a0c86f
 DIST shadow-4.14.0.tar.xz.asc 488 BLAKE2B 
e9ccdb38f130088ba2193e40a4ef7ccce3a592972bc7cb4e50cd8ad768c152b9bbb61432abbfe6ccc0cbed3979b4f54b8da68d1c58cb25bdb668bf5427b5a628
 SHA512 
d011a732d73b4b066ca8d204c0420303f925c87efc7655feb5c5f60b619d67da450e220ee44f6c86929ae79cbd4343136fe9c20d25b39fa0a228a48e57636309
+DIST shadow-4.14.2.tar.xz 1799548 BLAKE2B 
419f0a516753616ef691f71ec9002eef6fd7568c013ac71900d7481eff1bd9165c69d9587b7ca25800543a2eac58cfb7ce4224063e8af7b278f589640485c28f
 SHA512 
b417dbe0fbbeced1022e64efe9dcd8b41d14779c45163e6de63891ac63f837d43f3e559f99f884099aa45282299ceb4dcb9fd29d21c9925687ff8462fe6ead2f
+DIST shadow-4.14.2.tar.xz.asc 833 BLAKE2B 
9e085c79ccd3aa77489eb92e947dd4875dea84be2dbcbd2b8443e70b3dc065d288171ee024f81c6c3bf44d0ebfcabbb69937a906fdb26b6622d5a369aa415e8e
 SHA512 
47a2607fa782a48b0333e353343a32f358115bb40225ea962fab86d4a8dbed1df976eb6231baf5b95f34a13139b99d6b719521626e5d3e9c80fc4c685767d9b7

diff --git a/sys-apps/shadow/shadow-4.14.2.ebuild 
b/sys-apps/shadow/shadow-4.14.2.ebuild
new file mode 100644
index 000000000000..429b72eedc9e
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.14.2.ebuild
@@ -0,0 +1,270 @@
+# 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.
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sergehallyn.asc
+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 ~ia64 ~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 )"
+
+# TODO: Revisit libbsd dep once glibc-2.28 is stable as it provides strlcpy.
+COMMON_DEPEND="
+       dev-libs/libbsd
+       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:= )
+"
+DEPEND="
+       ${COMMON_DEPEND}
+       >=sys-kernel/linux-headers-4.14
+"
+RDEPEND="
+       ${COMMON_DEPEND}
+       !<sys-apps/man-pages-5.11-r1
+       !=sys-apps/man-pages-5.12-r0
+       !=sys-apps/man-pages-5.12-r1
+       nls? (
+               !<app-i18n/man-pages-it-5.06-r1
+               !<app-i18n/man-pages-ja-20180315-r1
+               !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
+       )
+       pam? ( >=sys-auth/pambase-20150213 )
+       su? ( !sys-apps/util-linux[su(-)] )
+"
+BDEPEND="
+       app-arch/xz-utils
+       sys-devel/gettext
+       verify-sig? ( sec-keys/openpgp-keys-sergehallyn )
+"
+
+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
+               # shadow uses a bundled copy of readpassphrase if 
--without-libbsd
+               --with-libbsd
+               --without-group-name-max-length
+               --without-tcb
+               --with-bcrypt
+               --with-yescrypt
+               $(use_enable nls)
+               # TODO: wire up upstream for elogind too
+               $(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=4711 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
+}
+
+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."
+}

Reply via email to