gentoo resync : 15.12.2019

6 files changed, 229 insertions, 34 deletions

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 2d49d84cee30..de0ba7aebde7 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -2,9 +2,12 @@ AUX default/useradd 96 BLAKE2B 64b694bdff7f901e19ac21695e3b2eebeb5a03683be5a01e3
 AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d35c9908ca400bd57dcb234fb7691aa2a5a7646a379553aa6dee0dd96ee569aa492d7f20774e991a90f8602 SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
+AUX shadow-4.7-optional_su.patch 3683 BLAKE2B 084151a48182f2b46830f4bcbe46234f753c169614d12f582acc93bed8c5ce69d8cd6bfeccb9936f0dbcb76efe947ae36e415fd659ffd4ee51c64d3270c33e6f SHA512 7f60622470d77b28d603d85b7873cfa01896f8368a09491fd1a0eac93aa6e763638cb279392b6a787b6be39c961566732aa1057b096480f397a50e1e2b10672c
+AUX shadow-4.8-revert-bin-merge.patch 305 BLAKE2B 2fb6407ed60251b3367931c2c7eb9b2bdaaff565ff5338fb6ffddc9b618963e7835925c07fea0cbaeeee90a03b7e0c571f0e1b9e1844fe9397f4e74672edb080 SHA512 bd821f6af288ac4a3cf9b0de30753626db90d187ece7d53ee7e0d6b7c61dbfecda84bd9ae60958120cc8ddce48055878c9daaa668dd88392bb70b73c7ad4fb01
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
 DIST shadow-4.7.tar.gz 3833335 BLAKE2B 8e030d3dcc5eb76332ff76aad8e9141edb4ae660f56dd3b420968c538d3022a72ab620710b9274b9afb44f497399f5c4ceef339b7d2c52106b9b8368ff127654 SHA512 9b134dc90d8fb39bc72db69ddb78cef6263921c8a2f00abc00ac796bf468ac18393399920eec14bd2a78b814a06fc18eb6f5685ede13fe222fc66b2e411cbb01
+DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c93fc6dd610876263ac22e61fbc2821649d347c28055ae84f64cd5ab5c2435450c55339c80b4ae5062ccc44f SHA512 1c607aec541400fc179d6cbbac7511289c618ab2ce6ee9d7c18a8bfda00421c62d4b9e58aff52b5f82d485468e7db955c186ea0faad9a08003ffc01bdf2ccece
 EBUILD shadow-4.6.ebuild 5363 BLAKE2B 90361141986d5b78eee02f022665073d2af2970949a5406b9aee09b5a7abd7aa8397048596275daa3bba4547380764f2c5ff26d634cbf03f8c387274f016282e SHA512 95c2ab76e365f10cf57277708dca5a5b96b24f1d527cd86d1ab5209f04f51251b3eb123473c77558223ae8c08310af13d2f8fe6e7314f69055933af8a9001074
-EBUILD shadow-4.7-r1.ebuild 5280 BLAKE2B a50d1cbf84e8b5c1bf78ddd209da6d8754256c98cb10bf15af8b2eaf5291796f2ef5970bd5b775930ed164d571a02525e71433ac988e6855cd3355b226300e1d SHA512 1f86e9b1d2a6e2810bd4f9a2f9b8520953b26e9d2732a7ba4e47b81dfd9d99dcf28df19ef5b965803553e3b3e914fe2b3b7233a02fa5f40e080ae5409160cdad
-EBUILD shadow-4.7.ebuild 5345 BLAKE2B 185e09ffdbcc8c14117d79c4a5a6f39d6e1402c71524f73828acaf8feb678ca8cd3b3a5d05178b8e2b98dad16fe90eaaca30fe809e1e68fbd592c3f228dc6813 SHA512 ad37ab6100fce2c3db53f2e8d73f6be77a5afec76cd16b2b74cb2efb7b33b9d7f9af49309efc672df09b334bef4938d18232f9cc61b4b1ceb6215a7fb74dce2f
-MISC metadata.xml 425 BLAKE2B 363f3a5caf1aaf0ddc3852f11191d8c3b9168ea1196ebba22c235942c23411dee2197715a2a52f513323ed845b96c7bc58ce59e5f609449fad5b6e807960ff82 SHA512 23577cff767bb0330e95f0390e3d5b5c2c43096a7103f38a9b91755d443a1f68b6f933d9e5c61feb37926565fb00e00c0b2b2dcef54270d69a77fdd78b143abb
+EBUILD shadow-4.7-r2.ebuild 5794 BLAKE2B f7a8dde2cac49657be337c7e226e6341c764ee0ed9ab1aa6e9d2bba96eb1f903c9fdb63c77152f5fd1ed1a4493fdd16a87ef6a01010c493650deb0a05da9a8e3 SHA512 9965f73207d382ca980fc996978ea6db7520b343029c61ae0d192ef4cb77dafe89e42142dcf561648c224415d1d696bcc865bce0544744e77579ba62a928e80b
+EBUILD shadow-4.8-r1.ebuild 5822 BLAKE2B 83b25419543bd8f7905822f73971ae4f024cedd451d608d1f8568079ff05cb673b74cf8056364bca8c5af8a9c364e79bd149ec063b3cd3aedcc63c30a43cb943 SHA512 ef1e8110e27c67a5ff1ab766ddfeef9c104d1d2f508cac5589486353183465e41e4f24253b8542486ec1ef5015c119cdddb054e98a82618d1b94b3d3e560d23e
+MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/files/shadow-4.7-optional_su.patch b/sys-apps/shadow/files/shadow-4.7-optional_su.patch
new file mode 100644
index 000000000000..472846460776
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.7-optional_su.patch
@@ -0,0 +1,130 @@
+From ddb0553b2e559fd431fe8b460c37cb7fef8c06ee Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 19 Nov 2019 10:57:06 +0100
+Subject: [PATCH] build: Make build/installation of su and its support files
+ optional
+
+Enabled by default
+This is necessary because coreutils and util-linux can also provide su
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac          |  7 +++++++
+ etc/pam.d/Makefile.am |  7 +++++--
+ man/Makefile.am       |  5 ++++-
+ src/Makefile.am       | 10 ++++++++--
+ 4 files changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67625564..5629df98 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -286,6 +286,9 @@ AC_ARG_WITH(sssd,
+ AC_ARG_WITH(group-name-max-length,
+ 	[AC_HELP_STRING([--with-group-name-max-length], [set max group name length @<:@default=16@:>@])],
+ 	[with_group_name_max_length=$withval], [with_group_name_max_length=yes])
++AC_ARG_WITH(su,
++	[AC_HELP_STRING([--with-su], [build and install su program and man page @<:@default=yes@:>@])],
++	[with_su=$withval], [with_su=yes])
+ 
+ if test "$with_group_name_max_length" = "no" ; then
+ 	with_group_name_max_length=0
+@@ -313,6 +316,9 @@ if test "$with_sssd" = "yes"; then
+ 	              [AC_MSG_ERROR([posix_spawn is needed for sssd support])])
+ fi
+ 
++AS_IF([test "$with_su" != "no"], AC_DEFINE(WITH_SU, 1, [Build with su])])
++AM_CONDITIONAL([WITH_SU], [test "x$with_su" != "xno"])
++
+ dnl Check for some functions in libc first, only if not found check for
+ dnl other libraries.  This should prevent linking libnsl if not really
+ dnl needed (Linux glibc, Irix), but still link it if needed (Solaris).
+@@ -719,4 +725,5 @@ echo "	nscd support:			$with_nscd"
+ echo "	sssd support:			$with_sssd"
+ echo "	subordinate IDs support:	$enable_subids"
+ echo "	use file caps:			$with_fcaps"
++echo "	install su:			$with_su"
+ echo
+diff --git a/etc/pam.d/Makefile.am b/etc/pam.d/Makefile.am
+index d967eb95..38ff26ae 100644
+--- a/etc/pam.d/Makefile.am
++++ b/etc/pam.d/Makefile.am
+@@ -6,8 +6,7 @@ pamd_files = \
+ 	chsh \
+ 	groupmems \
+ 	login \
+-	passwd \
+-	su
++	passwd
+ 
+ pamd_acct_tools_files = \
+ 	chage \
+@@ -29,4 +28,8 @@ pamd_DATA += $(pamd_acct_tools_files)
+ endif
+ endif
+ 
++if WITH_SU
++pamd_files += su
++endif
++
+ EXTRA_DIST = $(pamd_files) $(pamd_acct_tools_files)
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 3f040e05..8b64feba 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -41,7 +41,6 @@ man_MANS = \
+ 	man1/sg.1 \
+ 	man3/shadow.3 \
+ 	man5/shadow.5 \
+-	man1/su.1 \
+ 	man5/suauth.5 \
+ 	man8/useradd.8 \
+ 	man8/userdel.8 \
+@@ -54,6 +53,10 @@ man_nopam = \
+ 	man5/login.access.5 \
+ 	man5/porttime.5
+ 
++if WITH_SU
++man_MANS += man1/su.1
++endif
++
+ if !USE_PAM
+ man_MANS += $(man_nopam)
+ endif
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 34690ced..06ee9545 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -23,12 +23,15 @@ AM_CPPFLAGS = \
+ # and installation would be much simpler (just two directories,
+ # $prefix/bin and $prefix/sbin, no install-data hacks...)
+ 
+-bin_PROGRAMS   = groups login su
++bin_PROGRAMS   = groups login
+ sbin_PROGRAMS  = nologin
+ ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
+ if ENABLE_SUBIDS
+ ubin_PROGRAMS += newgidmap newuidmap
+ endif
++if WITH_SU
++bin_PROGRAMS  += su
++endif
+ usbin_PROGRAMS = \
+ 	chgpasswd \
+ 	chpasswd \
+@@ -52,8 +55,11 @@ usbin_PROGRAMS = \
+ # id and groups are from gnu, sulogin from sysvinit
+ noinst_PROGRAMS = id sulogin
+ 
+-suidbins       = su
++suidbins       =
+ suidubins      = chage chfn chsh expiry gpasswd newgrp
++if WITH_SU
++suidbins      += su
++endif
+ if !WITH_TCB
+ suidubins += passwd
+ endif
+-- 
+2.24.0
+
diff --git a/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch b/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch
new file mode 100644
index 000000000000..08382fcb9500
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 97839741..ff153d92 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,8 +2,8 @@
+ EXTRA_DIST = \
+ 	.indent.pro
+ 
+-ubindir = ${bindir}
+-usbindir = ${sbindir}
++ubindir = ${prefix}/bin
++usbindir = ${prefix}/sbin
+ suidperms = 4755
+ sgidperms = 2755
+ 
diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index 623e134e2752..908eabb59f33 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/metadata.xml
@@ -5,6 +5,10 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<use>
+		<flag name="bcrypt">build the bcrypt password encryption algorithm</flag>
+		<flag name="su">build the su program</flag>
+	</use>
 	<!-- only for USE=pam -->
 	<upstream>
 		<remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
diff --git a/sys-apps/shadow/shadow-4.7.ebuild b/sys-apps/shadow/shadow-4.7-r2.ebuild
index e560d827c464..f3291b9c2c01 100644
--- a/sys-apps/shadow/shadow-4.7.ebuild
+++ b/sys-apps/shadow/shadow-4.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit libtool pam
+inherit autotools libtool pam
 
 DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="https://github.com/shadow-maint/shadow"
@@ -12,51 +12,60 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="acl audit +cracklib nls pam selinux skey split-usr xattr"
+IUSE="acl audit +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 )
 
-DEPEND="acl? ( sys-apps/acl:0= )
+DEPEND="
+	acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
 	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
 	pam? ( sys-libs/pam:0= )
 	skey? ( sys-auth/skey:0= )
 	selinux? (
 		>=sys-libs/libselinux-1.28:0=
 		sys-libs/libsemanage:0=
 	)
-	nls? ( virtual/libintl )
-	xattr? ( sys-apps/attr:0= )"
+	su? ( !sys-apps/util-linux[su] )
+	xattr? ( sys-apps/attr:0= )
+"
 BDEPEND="
 	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20150213 )"
+	sys-devel/gettext
+"
+RDEPEND="
+	${DEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+	"${FILESDIR}/${PN}-4.7-optional_su.patch"
 )
 
 src_prepare() {
 	default
-	#eautoreconf
-	elibtoolize
+	eautoreconf
+	#elibtoolize
 }
 
 src_configure() {
 	local myeconfargs=(
+		--with-btrfs
 		--without-group-name-max-length
 		--without-tcb
 		--enable-shared=no
 		--enable-static=yes
+		$(use_enable nls)
 		$(use_with acl)
 		$(use_with audit)
 		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
 		$(use_with pam libpam)
-		$(use_with skey)
 		$(use_with selinux)
-		$(use_enable nls)
-		$(use_with elibc_glibc nscd)
+		$(use_with skey)
+		$(use_with su)
 		$(use_with xattr attr)
 	)
 	econf "${myeconfargs[@]}"
@@ -111,6 +120,9 @@ src_install() {
 
 	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
@@ -174,12 +186,15 @@ src_install() {
 
 		# remove manpages that pam will install for us
 		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man \
+		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,su} || die
+		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
@@ -210,5 +225,10 @@ pkg_postinst() {
 		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."
 }
diff --git a/sys-apps/shadow/shadow-4.7-r1.ebuild b/sys-apps/shadow/shadow-4.8-r1.ebuild
index c0735c920ae1..181e391ab249 100644
--- a/sys-apps/shadow/shadow-4.7-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r1.ebuild
@@ -3,60 +3,70 @@
 
 EAPI=7
 
-inherit libtool pam
+inherit autotools libtool pam
 
 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.gz"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="acl audit +cracklib nls pam selinux skey xattr"
+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 )
 
-DEPEND="acl? ( sys-apps/acl:0= )
+DEPEND="
+	acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
 	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
 	pam? ( sys-libs/pam:0= )
 	skey? ( sys-auth/skey:0= )
 	selinux? (
 		>=sys-libs/libselinux-1.28:0=
 		sys-libs/libsemanage:0=
 	)
-	nls? ( virtual/libintl )
-	xattr? ( sys-apps/attr:0= )"
+	su? ( !sys-apps/util-linux[su] )
+	xattr? ( sys-apps/attr:0= )
+"
 BDEPEND="
 	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20150213 )"
+	sys-devel/gettext
+"
+RDEPEND="
+	${DEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+	"${FILESDIR}/${P}-revert-bin-merge.patch"
 )
 
 src_prepare() {
 	default
-	#eautoreconf
-	elibtoolize
+	eautoreconf
+	#elibtoolize
 }
 
 src_configure() {
 	local myeconfargs=(
+		--with-btrfs
 		--without-group-name-max-length
 		--without-tcb
 		--enable-shared=no
 		--enable-static=yes
+		$(use_enable nls)
 		$(use_with acl)
 		$(use_with audit)
+		$(use_with bcrypt)
 		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
 		$(use_with pam libpam)
-		$(use_with skey)
 		$(use_with selinux)
-		$(use_enable nls)
-		$(use_with elibc_glibc nscd)
+		$(use_with skey)
+		$(use_with su)
 		$(use_with xattr attr)
 	)
 	econf "${myeconfargs[@]}"
@@ -109,6 +119,16 @@ src_install() {
 	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
@@ -167,12 +187,15 @@ src_install() {
 
 		# remove manpages that pam will install for us
 		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man \
+		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,su} || die
+		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