commit: e3c042d5752bdab78fbf5caa05307a100483026d
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 1 21:49:42 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 21:49:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c042d5
sys-apps/shadow-4.8-r1: Revbump, install in /usr as well as /
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch | 15 +++++++++++++++
.../shadow/{shadow-4.8.ebuild => shadow-4.8-r1.ebuild} | 13 ++++++++++---
2 files changed, 25 insertions(+), 3 deletions(-)
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 00000000000..08382fcb950
--- /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/shadow-4.8.ebuild
b/sys-apps/shadow/shadow-4.8-r1.ebuild
similarity index 93%
rename from sys-apps/shadow/shadow-4.8.ebuild
rename to sys-apps/shadow/shadow-4.8-r1.ebuild
index 11bb45bfd04..615a53c7676 100644
--- a/sys-apps/shadow/shadow-4.8.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r1.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";
@@ -41,12 +41,13 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+ "${FILESDIR}/shadow-4.8-revert-bin-merge.patch"
)
src_prepare() {
default
- #eautoreconf
- elibtoolize
+ eautoreconf
+ #elibtoolize
}
src_configure() {
@@ -119,6 +120,12 @@ src_install() {
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
