diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-07-19 22:05:27 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-07-19 22:05:27 +0100 |
| commit | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch) | |
| tree | ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /sys-apps/shadow | |
| parent | dd762ff83c330186ee2ede002e08b2f780cddd51 (diff) | |
gentoo resync : 19.07.2019
Diffstat (limited to 'sys-apps/shadow')
| -rw-r--r-- | sys-apps/shadow/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/shadow/shadow-4.6.ebuild | 12 | ||||
| -rw-r--r-- | sys-apps/shadow/shadow-4.7.ebuild | 12 |
3 files changed, 16 insertions, 12 deletions
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index 4f5988afc1db..759e66dde633 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -4,6 +4,6 @@ AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714 DIST shadow-4.7.tar.gz 3833335 BLAKE2B 8e030d3dcc5eb76332ff76aad8e9141edb4ae660f56dd3b420968c538d3022a72ab620710b9274b9afb44f497399f5c4ceef339b7d2c52106b9b8368ff127654 SHA512 9b134dc90d8fb39bc72db69ddb78cef6263921c8a2f00abc00ac796bf468ac18393399920eec14bd2a78b814a06fc18eb6f5685ede13fe222fc66b2e411cbb01 -EBUILD shadow-4.6.ebuild 5356 BLAKE2B 46938d56576815e02989d871b6e44216c38255afaf2c51f71b964d6394fb3947c0794c425d3c03a43388788e74ff3f06c14bd54fe918562443fdd1b742700a30 SHA512 f61848d670b9c1fc3eac60162e5a77971002a40a5fe2e2e9aff13789d02dc0dd3f479f4b4cb2f4ba5cb4eb62f5b67d4f040bc84817f1783399ff76f5d9651beb -EBUILD shadow-4.7.ebuild 5338 BLAKE2B 25f74960370da62556f217ba0ead53c077163549c3d4fd208ae36b030b066c18dfeda4dce33aadcac33cfa4ffb568be07baf57caad644bc104a2b64d797f874d SHA512 d8d27509dc665f14a1014523c94be24204bfa251a5d6b084b0f02e3a413a31df373b0b09d19bbc85945c73fa35f180f9ce019b4052aa7a3a2ced7c0a884fcc15 +EBUILD shadow-4.6.ebuild 5399 BLAKE2B c054482203ff80d2c435edad28bb73450ccc2c5512b84fcde94d33cf0ab7a96ccbe0e90f02ff9455bbed4ee2e55eacc49fa5e3cd4a864f47ef87c831997cb70b SHA512 330e03fff056c92dcd3d5b66bb40ad849b1a631d5d38f5e7971e233a24bd0189f81ffd9e89082a9d30e723e18ddcb0aad92f8519e6218c05adb65cf2d3079c28 +EBUILD shadow-4.7.ebuild 5381 BLAKE2B cf306a685464b6ccd40307877dfa9850a202cd9a713854e8ae818d1590b7c05cc07c6f3627b08c4eb3d972f6deb5ef6730c2e0d641f17f0e9d5a8617f0726d31 SHA512 661e56bd77e9f83bdeea2688fe54f3a4e5a85350f39e59caf3c6d9355adf8f4e5cedb2ac46b21d06735a3ead8ad02ca69c31e0d72a42d2b1394ec2f2366fad01 MISC metadata.xml 425 BLAKE2B 363f3a5caf1aaf0ddc3852f11191d8c3b9168ea1196ebba22c235942c23411dee2197715a2a52f513323ed845b96c7bc58ce59e5f609449fad5b6e807960ff82 SHA512 23577cff767bb0330e95f0390e3d5b5c2c43096a7103f38a9b91755d443a1f68b6f933d9e5c61feb37926565fb00e00c0b2b2dcef54270d69a77fdd78b143abb diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild index 14ef8ce12300..c816078172ce 100644 --- a/sys-apps/shadow/shadow-4.6.ebuild +++ b/sys-apps/shadow/shadow-4.6.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,10 +109,12 @@ src_install() { insopts -m0600 doins "${FILESDIR}"/default/useradd - # 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 + 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 diff --git a/sys-apps/shadow/shadow-4.7.ebuild b/sys-apps/shadow/shadow-4.7.ebuild index 809590ead55a..eb5a800dccfb 100644 --- a/sys-apps/shadow/shadow-4.7.ebuild +++ b/sys-apps/shadow/shadow-4.7.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,10 +109,12 @@ src_install() { insopts -m0600 doins "${FILESDIR}"/default/useradd - # 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 + 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 |