From: Christian Heim Date: Fri, 12 Jan 2007 16:37:00 +0000 (+0000) Subject: Changing src_install to utilize fowners/fperms, switching the order of chmod/chown... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=367ce4767e667ddc3a2de7a3a8a903cbb3f48572;p=gentoo.git Changing src_install to utilize fowners/fperms, switching the order of chmod/chown in pkg_postinst (thanks to Jan Kundrát in #161290). Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/net-wireless/ipw3945d/ChangeLog b/net-wireless/ipw3945d/ChangeLog index 8bd26a04bfb7..8bbb2ba775b6 100644 --- a/net-wireless/ipw3945d/ChangeLog +++ b/net-wireless/ipw3945d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/ipw3945d # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.13 2007/01/11 18:37:24 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.14 2007/01/12 16:37:00 phreak Exp $ + + 12 Jan 2007; Christian Heim ipw3945d-1.7.22-r4.ebuild: + Changing src_install to utilize fowners/fperms, switching the order of + chmod/chown in pkg_postinst (thanks to Jan Kundrát in #161290). 11 Jan 2007; Christian Heim ipw3945d-1.7.22-r4.ebuild: Fixing src_install (was munging with stuff outside , which came from the diff --git a/net-wireless/ipw3945d/Manifest b/net-wireless/ipw3945d/Manifest index f24a3052b662..29299820a40d 100644 --- a/net-wireless/ipw3945d/Manifest +++ b/net-wireless/ipw3945d/Manifest @@ -23,14 +23,14 @@ EBUILD ipw3945d-1.7.18.ebuild 944 RMD160 1c045ed1e26007dfb26156593ce79a934ba0da6 MD5 de7e5237ca6dc6332c4a49526ea8a856 ipw3945d-1.7.18.ebuild 944 RMD160 1c045ed1e26007dfb26156593ce79a934ba0da61 ipw3945d-1.7.18.ebuild 944 SHA256 4bfc0eed9604fcbe7c9488fbadb16c57df582747e86aab135995c9b05712e6cf ipw3945d-1.7.18.ebuild 944 -EBUILD ipw3945d-1.7.22-r4.ebuild 2225 RMD160 9d6af297c42855283577d6a1d0df77a7b77aef52 SHA1 111c45a7a855ba95fc7261ff467f2b20e56f25ed SHA256 9bdbbeb643a8a588d83e28f93d377d7f538cb7789e81767314429dd39138a5ac -MD5 0eeb5d6eaa2749deb490f74daf10767b ipw3945d-1.7.22-r4.ebuild 2225 -RMD160 9d6af297c42855283577d6a1d0df77a7b77aef52 ipw3945d-1.7.22-r4.ebuild 2225 -SHA256 9bdbbeb643a8a588d83e28f93d377d7f538cb7789e81767314429dd39138a5ac ipw3945d-1.7.22-r4.ebuild 2225 -MISC ChangeLog 3198 RMD160 ca0b9360f824a42f0d541218101d7d72e34a6205 SHA1 be62e336ec1cb83728c30a60de887d9c720b347d SHA256 ba4a4d2dd62f097e84e1c0d807d81e4ed7b789a4aa70a7dd416b0b6d7812ab4a -MD5 e5b35751a342f8f1c80555ea4746cc05 ChangeLog 3198 -RMD160 ca0b9360f824a42f0d541218101d7d72e34a6205 ChangeLog 3198 -SHA256 ba4a4d2dd62f097e84e1c0d807d81e4ed7b789a4aa70a7dd416b0b6d7812ab4a ChangeLog 3198 +EBUILD ipw3945d-1.7.22-r4.ebuild 2207 RMD160 a199fd455f417993855e11f0b4f379bb69fe6705 SHA1 a12bbd49182e224eaa1620d2783f757c46c7081f SHA256 d6da28c919385c67901218f4d8c37aeb3e595ef7e84c092d62e3a0ab584e49ea +MD5 d509d28c40c208d6448b61e71aeb78ff ipw3945d-1.7.22-r4.ebuild 2207 +RMD160 a199fd455f417993855e11f0b4f379bb69fe6705 ipw3945d-1.7.22-r4.ebuild 2207 +SHA256 d6da28c919385c67901218f4d8c37aeb3e595ef7e84c092d62e3a0ab584e49ea ipw3945d-1.7.22-r4.ebuild 2207 +MISC ChangeLog 3416 RMD160 e564552707939053ed7ee8b010ec32fb4dd6eced SHA1 15900780a820866b574e3ed2202053a1a174cbfc SHA256 310d9faa466d5b86f0d3a60b54fff09166d2fd871d8824755427c1ebd39f427c +MD5 ae6558fcf8389b249c907dc0fa364ca3 ChangeLog 3416 +RMD160 e564552707939053ed7ee8b010ec32fb4dd6eced ChangeLog 3416 +SHA256 310d9faa466d5b86f0d3a60b54fff09166d2fd871d8824755427c1ebd39f427c ChangeLog 3416 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350 @@ -44,7 +44,7 @@ SHA256 30e8b00331f05d9b8ac248847e70de1a7af8a1ea520bb1fea3faf301607f0345 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFpoN2yuNVb5qfaOYRApqxAJ9MSw5lbbrjeuNsrlS/M/HVdBeAsQCfYDn+ -/Ig3nWVX1m4YCRhNDtFUyzE= -=K2v6 +iD8DBQFFp7iByuNVb5qfaOYRAi+WAJ4xpoNlGJswpFhbO2KNcaj282pAPgCfdUbP +Yx62mojjZ/IQv1kAn3ogQaw= +=UfKT -----END PGP SIGNATURE----- diff --git a/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild b/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild index 70b1c3f5bda7..edae837caac0 100644 --- a/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild +++ b/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild,v 1.5 2007/01/11 18:37:24 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild,v 1.6 2007/01/12 16:37:00 phreak Exp $ inherit eutils @@ -30,11 +30,11 @@ src_install() { use amd64 && dosbin x86_64/ipw3945d # Give the ipw3945d access to the binary - chown ipw3945d:root "${D}/sbin/ipw3945d" - chmod 04450 "${D}/sbin/ipw3945d" + fowners ipw3945d:root /sbin/ipw3945d + fperms 04450 /sbin/ipw3945d keepdir /var/run/ipw3945d - chown ipw3945d:root "${D}/var/run/ipw3945d" + fowners ipw3945d:root /var/run/ipw3945d newconfd "${FILESDIR}/${PN}-conf.d" ${PN} newinitd "${FILESDIR}/${PN}-init.d" ${PN} @@ -57,13 +57,13 @@ pkg_postinst() { # These nasty live-filesystem fixes are needed, because if the files are # already there, the permissions applied in src_install() won't get - # transferred to the live filesystem. Once portage is fixed with regard to + # merged to the live filesystem. Once portage is fixed with regard to # this, these hacks can go away. # Fix the permissions of /sbin/ipw3945d ebegin "Fixing permissions of ${ROOT}sbin/ipw3945d" - chmod 04450 "${ROOT}sbin/ipw3945d" chown ipw3945d:root "${ROOT}sbin/ipw3945d" + chmod 04450 "${ROOT}sbin/ipw3945d" eend $? # Fixing ownership of /var/run/ipw3945d