From: Mike Frysinger Date: Mon, 9 Feb 2015 20:34:29 +0000 (+0000) Subject: Use -delete with find, and fix prefix handling in a few places. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b0e30d184bb3a87f4fcf11c0f5973cb974bcfd2;p=gentoo.git Use -delete with find, and fix prefix handling in a few places. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index df56068c0e8c..b4808c6b6493 100644 --- a/sys-apps/shadow/ChangeLog +++ b/sys-apps/shadow/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/shadow -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.295 2014/12/09 01:50:57 heroxbd Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.296 2015/02/09 20:34:28 vapier Exp $ + + 09 Feb 2015; Mike Frysinger shadow-4.2.1.ebuild: + Use -delete with find, and fix prefix handling in a few places. 09 Dec 2014; Benda Xu shadow-4.2.1.ebuild: Prefix support: trivial D -> ED and ROOT -> EROOT. diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index d9e2a3ec6960..1010cada59a6 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX default/useradd 96 SHA256 31aa2cbe4a34a9f7d4d134c1fecd007c9bbf4d40e19d0dcddbcd396f1853b490 SHA512 87b01ac88c2065392fa988871489d8403ef93341b4cfbadb4504f39a2a3396ddef756efc6378868d00627a58a1feb9612eb52a8135558a211a09c6a9ccf3404f WHIRLPOOL 9022a371e34e96a4c3193f24752979da27cdcd60aec1c8db1d2b427ab880b16917578ddcb4d8af02fd1d0eedc6b346cf43d7ae892e8580321e32e50f5498980b AUX login_defs_pam.sed 479 SHA256 587239d5b1425c5766f10cea5352b325699fb35829d9375bda68bbfd74f1d839 SHA512 c4bda7776b5a0bdaa8e7e36c09fb005699cf8b1ef5b474021f7e95d98e62a39aebd354dcc8ad0c49316e8e5d0123429b893c3ff9e4024c18ac0e25b4ab4b45ed WHIRLPOOL a6c5ce16824dde56b4ae899cb9b8effc9b7d61133e88e262a22a5e0db080c85ead15d6d9a13c5583b6e55b368ffd890bf037a3957ce6071b370dd7fb50d63bf4 AUX pam.d-include/passwd 144 SHA256 8c54d2e3aab50b2a8d3d36aa37f7d7bb32c15d9a3af9a10b7ec5b5ffcff9a5fb SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f WHIRLPOOL 879370adfb6a78c0acdeebf2c10a503d94925c34dceadb8677693f6c34e4e973f2584b221a9a81fdf23f084c430bbafa23a03440c1a95c798b58faedf4d412bd @@ -7,6 +10,23 @@ AUX shadow-4.1.3-dots-in-usernames.patch 302 SHA256 2299ffaec204d20e00d791bf5b98 DIST shadow-4.1.5.1.tar.bz2 2193325 SHA256 aa32333748d68b58ed3a83625f0165e0f6b9dc4639e6377c9300c6bf4fe978fb SHA512 c3bc605de1ca5b774b80d0d92cef5d4c0d5b4a206acadcf5a819f195453093bfe7990d7e32b98799180847ae4fadecfc7876c8ee7297f343acce2230d805d02c WHIRLPOOL 08751597b5b57057f0a3141be97204df49fada25adf0a9f43106a4099ce1b06fec6e90592e43ff1d789bf0a7e16a40b45f29830879ea5c71e9f5a1a81e7a7357 DIST shadow-4.2.1.tar.xz 1594536 SHA256 3b0893d1476766868cd88920f4f1231c4795652aa407569faff802bcda0f3d41 SHA512 7a14bf8e08126f0402e37b6e4c559615ced7cf829e39156d929ed05cd8813de48a77ff1f7f6fe707da04cf662a2e9e84c22d63d88dd1ed13f935fde594db95f0 WHIRLPOOL 032857f5fae8486cc3dd11303bfa7da55019000ce8ad7bac2f398f9f9764c8659e20a1547d05c5e4f366db749a52afb3083017faf14f6a72ee48345dcd1f86aa EBUILD shadow-4.1.5.1-r1.ebuild 5207 SHA256 2739bd1b1e66b820457db309569403700d093e5c9827ba4049d38b9a5727de15 SHA512 1e9bc3b4ac4841f7063482a9075e9be4c1fe5169cbe8f4b5a9ec80447202519d86b5d3048d9fed1176c79c986fdbaff35b82e326f81bd5ece1dc2232bc5b2c8b WHIRLPOOL 7cf7b7e46f523be1bf27b03d3bdc86ae517443ca0207d1da7a19242d60663a1ec6238b746efcc3cbdee7b8cc5f871e992b44b353be5448c905317eb68cb7aa8d -EBUILD shadow-4.2.1.ebuild 5246 SHA256 077de8f16722d4fb3a3a49d61c2e489f70238fe2b5acced6b75768449cc3ce0b SHA512 2e906d82301be765bcc8a61ace90804a76f8d7417d080df64f7a022416aba0105a4115c275f55ebb3211c4ec52cc218b2cd1ab8c2464ac7e2596035e7d2fcf0c WHIRLPOOL 8eb0feb0d2a26d721891d3866fd586b0902abcce9e860b9150413a2da59242289280024dec1988f5c077bf919163861541f80434b33983d14dd6e03cee5a1cee -MISC ChangeLog 50317 SHA256 bb704e585f0429529fb921950f56b7b31c8ac9736544f56e42fefdbdfe91c4e0 SHA512 514c642bdcc64739e60ea953fb5fc5b8f087413f83f5bbfa10da1fb896d66f2eb84b72b68ee36ba5638e2685aa1d9a99c1eb3efa0cf915be8729156b88869af2 WHIRLPOOL 533a6c2d2d6637968d4ff278b69fc91c308ab3d9da58156701fc7c0814e1cea0a1b902036e0ad8287546a1fa170a0fbe4ee6000781c2063f3f7a09038fb3b97e +EBUILD shadow-4.2.1.ebuild 5242 SHA256 88510edfbc2b8e66a6af3248fad77e305987784c240a320c9ec0d5d10a3dfc04 SHA512 faa2727df657cefd764f3d4f7dabf5ad3ae72696681c74ddcbd9bf2104431f14298b09025be581fc557c37aa62269e405b034daeaa31f454ebcd20bc1b8796fc WHIRLPOOL 92a1cc8a6e0f53ffd7cc059ac03c80e67591d2f5e3ffd3367f4b46faa768e1a4b18af74d6534e71150e1607ae61944f1fe3e24d386bcfc1e1021c326ca6e2d6c +MISC ChangeLog 50454 SHA256 1507cebfaa6fe8d9df2d653cf50b482ae92d6c2e8287ba2bd0bde358e822ca91 SHA512 a07d83e26540a4477902ebad6579eb5b14d6544600068bbda50a0f10e87184b901860deb91fa09cc88b02d580feda31a46e8dfa2f14aa98920d6c7881c0447d3 WHIRLPOOL f010a42f6564fa139cb17ecd39be5c136b89a85a0b877fcc0c457036f0059854148422082f04945401bc88f94546639102b1a15635dc10cd1f24ebbbcc575e40 MISC metadata.xml 374 SHA256 1675a5791603e79e431df63215162737553fa8018360b026739ac3284bca54b2 SHA512 0bb65b45fa94ddea89f7e0a879fd996b3f363b3e58eb6cbd71251fd79416667f103af4bac0c87f3ba240e0ce3f323c77ce7be9f6ea92c13d619ff8cef8797add WHIRLPOOL e7f4f5d975440fe71dbb35dee4394aa808fce7b5e58ac64d162418a47ed99cb002c7622563be4f6800967d6b8530d29dbd895e431c78f75a5cdf490b8c1afc45 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJU2RnVAAoJEPGu1DbS6WIAJNQP/jlFv4Gs6a0rPYr5AQ7Y8uIi +IP6w52Rmnafr5UyMSPhduoC1qH0bB6SoNhwUSwaAT6hC9S5+5KOcj+T3N66l3Dab +bNwHwMPZk+lLey7vSzirgbRLO431lehnkK08+50ItGr+4sfWdzyGAOuXImEZm6WO +cJ0Nw51y5+Fr8JB1mTnFGNLvONMi9e6izrrhHTA9Scr9+FERgMIVusMHI0fNQo5z +/5KXMh+5PEbUrCDXRUajlkWKo0lCq1AbSh/KZmpDG6ZXpepSzgoa8rC0s94MCBt0 +1tjWXmaHtoItssiQMxybaHCPPXcl5CumD/8IWK6AkfSeoDoxf3kaEdowhmasXBV3 +eu4Lzmvv3wam71EvCoAW33G6FDGeFhP7MTY9LnQliDVWB0uwQBH8TKDi/7dYQVYE +r8Htvn8kJ+fPOexWcnzmvbRiyURy2wu8JZTkGY9eFsyWlg72UwjviX3cKF3LcdwK +WWHttyaVRBX9eerrVgX0KHpCAwyoqxXgok/xu7Qbxxew2pL7Fs7MEzJrJvQ/mFDl +2PA4BsBbTaDbQA3MQCbuLKaFHX1i7aR1KXS4vjY6EaedD0rUhR0ryBK2mt5cpUWh +k7K6bbEq6jgaqQEx0UzYd7FnGaFUel7apy1mExw5Q9Dn0t/ncQ9CDMntrZvc4Rkz +/egdlmy21qOcPOxT+GeG +=XUoH +-----END PGP SIGNATURE----- diff --git a/sys-apps/shadow/shadow-4.2.1.ebuild b/sys-apps/shadow/shadow-4.2.1.ebuild index 3ccb577a1aae..6fe5211f0afd 100644 --- a/sys-apps/shadow/shadow-4.2.1.ebuild +++ b/sys-apps/shadow/shadow-4.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v 1.2 2014/12/09 01:50:57 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v 1.3 2015/02/09 20:34:28 vapier Exp $ EAPI=4 @@ -101,7 +101,7 @@ src_install() { doins "${FILESDIR}"/default/useradd # move passwd to / to help recover broke systems #64441 - mv "${ED}"/usr/bin/passwd "${ED}"/bin/ + mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die dosym /bin/passwd /usr/bin/passwd cd "${S}" @@ -158,7 +158,7 @@ src_install() { # and/or don't apply when using pam find "${ED}"/usr/share/man \ '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + + -delete # Remove pam.d files provided by pambase. rm "${ED}"/etc/pam.d/{login,passwd,su} || die @@ -167,7 +167,7 @@ src_install() { # Remove manpages that are handled by other packages find "${ED}"/usr/share/man \ '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + + -delete cd "${S}" dodoc ChangeLog NEWS TODO @@ -184,8 +184,8 @@ pkg_preinst() { pkg_postinst() { # Enable shadow groups. if [ ! -f "${EROOT}"/etc/gshadow ] ; then - if grpck -r -R "${ROOT}" 2>/dev/null ; then - grpconv -R "${ROOT}" + if grpck -r -R "${EROOT}" 2>/dev/null ; then + grpconv -R "${EROOT}" else ewarn "Running 'grpck' returned errors. Please run it by hand, and then" ewarn "run 'grpconv' afterwards!"