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 95DAF138334 for ; Mon, 18 Nov 2019 08:06:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC11BE0878; Mon, 18 Nov 2019 08:06:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9EF41E0878 for ; Mon, 18 Nov 2019 08:06:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 4BDF234CF5A for ; Mon, 18 Nov 2019 08:06:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C00526C for ; Mon, 18 Nov 2019 08:06:31 +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: <1574064383.450f96fa85fc867b0705174270dbad5d45d9f83f.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: 450f96fa85fc867b0705174270dbad5d45d9f83f X-VCS-Branch: master Date: Mon, 18 Nov 2019 08:06:31 +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: 15d235f3-b4b4-48d2-9f3a-9e650ee99a42 X-Archives-Hash: e6e266ce2c9002b44ce240648118abf9 commit: 450f96fa85fc867b0705174270dbad5d45d9f83f Author: Lars Wendler gentoo org> AuthorDate: Mon Nov 18 08:06:23 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Nov 18 08:06:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=450f96fa Revert "sys-apps/shadow: Revbump to re-add split-usr" This reverts commit 3e71cbd8a3a3b45fe6858e5837c2e7535ea3a158. Signed-off-by: Lars Wendler gentoo.org> sys-apps/shadow/{shadow-4.7-r2.ebuild => shadow-4.7-r1.ebuild} | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sys-apps/shadow/shadow-4.7-r2.ebuild b/sys-apps/shadow/shadow-4.7-r1.ebuild similarity index 95% rename from sys-apps/shadow/shadow-4.7-r2.ebuild rename to sys-apps/shadow/shadow-4.7-r1.ebuild index 2ca144b20bf..c0735c920ae 100644 --- a/sys-apps/shadow/shadow-4.7-r2.ebuild +++ b/sys-apps/shadow/shadow-4.7-r1.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 split-usr xattr" +IUSE="acl audit +cracklib nls pam selinux skey 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,13 +109,6 @@ 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