| 1 |
commit: 3605875162f3dd742e959fe0e43e64ca4604dd01 |
| 2 |
Author: Matija Skala <mskala <AT> gmx <DOT> com> |
| 3 |
AuthorDate: Fri Jul 19 15:38:40 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 19 16:51:49 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36058751 |
| 7 |
|
| 8 |
sys-apps/shadow: add support for /usr merge |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/12477 |
| 11 |
Signed-off-by: Matija Skala <mskala <AT> gmx.com> |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/shadow/shadow-4.6.ebuild | 12 +++++++----- |
| 15 |
sys-apps/shadow/shadow-4.7.ebuild | 12 +++++++----- |
| 16 |
2 files changed, 14 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild |
| 19 |
index 14ef8ce1230..c816078172c 100644 |
| 20 |
--- a/sys-apps/shadow/shadow-4.6.ebuild |
| 21 |
+++ b/sys-apps/shadow/shadow-4.6.ebuild |
| 22 |
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar |
| 23 |
LICENSE="BSD GPL-2" |
| 24 |
SLOT="0" |
| 25 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" |
| 26 |
-IUSE="acl audit +cracklib nls pam selinux skey xattr" |
| 27 |
+IUSE="acl audit +cracklib nls pam selinux skey split-usr xattr" |
| 28 |
# Taken from the man/Makefile.am file. |
| 29 |
LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW ) |
| 30 |
|
| 31 |
@@ -109,10 +109,12 @@ src_install() { |
| 32 |
insopts -m0600 |
| 33 |
doins "${FILESDIR}"/default/useradd |
| 34 |
|
| 35 |
- # move passwd to / to help recover broke systems #64441 |
| 36 |
- dodir /bin |
| 37 |
- mv "${ED%/}"/usr/bin/passwd "${ED%/}"/bin/ || die |
| 38 |
- dosym ../../bin/passwd /usr/bin/passwd |
| 39 |
+ if use split-usr ; then |
| 40 |
+ # move passwd to / to help recover broke systems #64441 |
| 41 |
+ dodir /bin |
| 42 |
+ mv "${ED%/}"/usr/bin/passwd "${ED%/}"/bin/ || die |
| 43 |
+ dosym ../../bin/passwd /usr/bin/passwd |
| 44 |
+ fi |
| 45 |
|
| 46 |
cd "${S}" || die |
| 47 |
insinto /etc |
| 48 |
|
| 49 |
diff --git a/sys-apps/shadow/shadow-4.7.ebuild b/sys-apps/shadow/shadow-4.7.ebuild |
| 50 |
index 809590ead55..eb5a800dccf 100644 |
| 51 |
--- a/sys-apps/shadow/shadow-4.7.ebuild |
| 52 |
+++ b/sys-apps/shadow/shadow-4.7.ebuild |
| 53 |
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar |
| 54 |
LICENSE="BSD GPL-2" |
| 55 |
SLOT="0" |
| 56 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" |
| 57 |
-IUSE="acl audit +cracklib nls pam selinux skey xattr" |
| 58 |
+IUSE="acl audit +cracklib nls pam selinux skey split-usr xattr" |
| 59 |
# Taken from the man/Makefile.am file. |
| 60 |
LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW ) |
| 61 |
|
| 62 |
@@ -109,10 +109,12 @@ src_install() { |
| 63 |
insopts -m0600 |
| 64 |
doins "${FILESDIR}"/default/useradd |
| 65 |
|
| 66 |
- # move passwd to / to help recover broke systems #64441 |
| 67 |
- dodir /bin |
| 68 |
- mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die |
| 69 |
- dosym ../../bin/passwd /usr/bin/passwd |
| 70 |
+ if use split-usr ; then |
| 71 |
+ # move passwd to / to help recover broke systems #64441 |
| 72 |
+ dodir /bin |
| 73 |
+ mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die |
| 74 |
+ dosym ../../bin/passwd /usr/bin/passwd |
| 75 |
+ fi |
| 76 |
|
| 77 |
cd "${S}" || die |
| 78 |
insinto /etc |
Archives