| 1 |
commit: e3c042d5752bdab78fbf5caa05307a100483026d |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 1 21:49:42 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 1 21:49:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c042d5 |
| 7 |
|
| 8 |
sys-apps/shadow-4.8-r1: Revbump, install in /usr as well as / |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.80, Repoman-2.3.19 |
| 11 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch | 15 +++++++++++++++ |
| 14 |
.../shadow/{shadow-4.8.ebuild => shadow-4.8-r1.ebuild} | 13 ++++++++++--- |
| 15 |
2 files changed, 25 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..08382fcb950 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch |
| 22 |
@@ -0,0 +1,15 @@ |
| 23 |
+diff --git a/src/Makefile.am b/src/Makefile.am |
| 24 |
+index 97839741..ff153d92 100644 |
| 25 |
+--- a/src/Makefile.am |
| 26 |
++++ b/src/Makefile.am |
| 27 |
+@@ -2,8 +2,8 @@ |
| 28 |
+ EXTRA_DIST = \ |
| 29 |
+ .indent.pro |
| 30 |
+ |
| 31 |
+-ubindir = ${bindir} |
| 32 |
+-usbindir = ${sbindir} |
| 33 |
++ubindir = ${prefix}/bin |
| 34 |
++usbindir = ${prefix}/sbin |
| 35 |
+ suidperms = 4755 |
| 36 |
+ sgidperms = 2755 |
| 37 |
+ |
| 38 |
|
| 39 |
diff --git a/sys-apps/shadow/shadow-4.8.ebuild b/sys-apps/shadow/shadow-4.8-r1.ebuild |
| 40 |
similarity index 93% |
| 41 |
rename from sys-apps/shadow/shadow-4.8.ebuild |
| 42 |
rename to sys-apps/shadow/shadow-4.8-r1.ebuild |
| 43 |
index 11bb45bfd04..615a53c7676 100644 |
| 44 |
--- a/sys-apps/shadow/shadow-4.8.ebuild |
| 45 |
+++ b/sys-apps/shadow/shadow-4.8-r1.ebuild |
| 46 |
@@ -3,7 +3,7 @@ |
| 47 |
|
| 48 |
EAPI=7 |
| 49 |
|
| 50 |
-inherit libtool pam |
| 51 |
+inherit autotools libtool pam |
| 52 |
|
| 53 |
DESCRIPTION="Utilities to deal with user accounts" |
| 54 |
HOMEPAGE="https://github.com/shadow-maint/shadow" |
| 55 |
@@ -41,12 +41,13 @@ RDEPEND=" |
| 56 |
|
| 57 |
PATCHES=( |
| 58 |
"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch" |
| 59 |
+ "${FILESDIR}/shadow-4.8-revert-bin-merge.patch" |
| 60 |
) |
| 61 |
|
| 62 |
src_prepare() { |
| 63 |
default |
| 64 |
- #eautoreconf |
| 65 |
- elibtoolize |
| 66 |
+ eautoreconf |
| 67 |
+ #elibtoolize |
| 68 |
} |
| 69 |
|
| 70 |
src_configure() { |
| 71 |
@@ -119,6 +120,12 @@ src_install() { |
| 72 |
doins "${FILESDIR}"/default/useradd |
| 73 |
|
| 74 |
if use split-usr ; then |
| 75 |
+ # move passwd to / to help recover broke systems #64441 |
| 76 |
+ # We cannot simply remove this or else net-misc/scponly |
| 77 |
+ # and other tools will break because of hardcoded passwd |
| 78 |
+ # location |
| 79 |
+ dodir /bin |
| 80 |
+ mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die |
| 81 |
dosym ../../bin/passwd /usr/bin/passwd |
| 82 |
fi |
Archives