From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 93E0A138334 for ; Sat, 16 Nov 2019 10:48:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D129CE0801; Sat, 16 Nov 2019 10:48:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCC33E0801 for ; Sat, 16 Nov 2019 10:48:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CEB6934CEB1 for ; Sat, 16 Nov 2019 10:48:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F33A285C for ; Sat, 16 Nov 2019 10:48:37 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1573901314.3e71cbd8a3a3b45fe6858e5837c2e7535ea3a158.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/shadow/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/shadow/shadow-4.7-r1.ebuild sys-apps/shadow/shadow-4.7-r2.ebuild X-VCS-Directories: sys-apps/shadow/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3e71cbd8a3a3b45fe6858e5837c2e7535ea3a158 X-VCS-Branch: master Date: Sat, 16 Nov 2019 10:48:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2744a3eb-cea1-44ad-a25b-81ddebf17ea7 X-Archives-Hash: 191bc82d2f22d05d3276d877f44e61ca commit: 3e71cbd8a3a3b45fe6858e5837c2e7535ea3a158 Author: Lars Wendler gentoo org> AuthorDate: Sat Nov 16 10:47:57 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Nov 16 10:48:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e71cbd8 sys-apps/shadow: Revbump to re-add split-usr Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Lars Wendler gentoo.org> sys-apps/shadow/{shadow-4.7-r1.ebuild => shadow-4.7-r2.ebuild} | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys-apps/shadow/shadow-4.7-r1.ebuild b/sys-apps/shadow/shadow-4.7-r2.ebuild similarity index 95% rename from sys-apps/shadow/shadow-4.7-r1.ebuild rename to sys-apps/shadow/shadow-4.7-r2.ebuild index c0735c920ae..2ca144b20bf 100644 --- a/sys-apps/shadow/shadow-4.7-r1.ebuild +++ b/sys-apps/shadow/shadow-4.7-r2.ebuild @@ -12,7 +12,7 @@ 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 xattr" +IUSE="acl audit +cracklib nls pam selinux skey split-usr 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 ) @@ -109,6 +109,13 @@ src_install() { insopts -m0600 doins "${FILESDIR}"/default/useradd + if use split-usr ; then + # move passwd to / to help recover broke systems #64441 + dodir /bin + mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die + dosym ../../bin/passwd /usr/bin/passwd + fi + cd "${S}" || die insinto /etc insopts -m0644