From 5e43cc675266ed0c63facedb4faacf399da365ac Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 3 Nov 2011 00:29:15 +0000 Subject: [PATCH] Use new egethome helper rather than calling getent directly. Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64 --- net-mail/vpopmail/ChangeLog | 6 +++++- net-mail/vpopmail/Manifest | 20 ++++++++++---------- net-mail/vpopmail/vpopmail-5.4.16.ebuild | 11 ++++------- net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild | 6 +++--- net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild | 6 +++--- net-mail/vpopmail/vpopmail-5.4.33.ebuild | 6 +++--- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog index 30510f89d6f8..c42d36b5fbfa 100644 --- a/net-mail/vpopmail/ChangeLog +++ b/net-mail/vpopmail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/vpopmail # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.105 2011/09/10 16:43:33 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.106 2011/11/03 00:29:15 vapier Exp $ + + 03 Nov 2011; Mike Frysinger vpopmail-5.4.16.ebuild, + vpopmail-5.4.30-r1.ebuild, vpopmail-5.4.30-r2.ebuild, vpopmail-5.4.33.ebuild: + Use new egethome helper rather than calling getent directly. 10 Sep 2011; Raúl Porcel vpopmail-5.4.30-r1.ebuild: ia64 stable wrt #378373 diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest index f242c864f64c..f22126c9059a 100644 --- a/net-mail/vpopmail/Manifest +++ b/net-mail/vpopmail/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX 99vpopmail 64 RMD160 c5587e2065da076bdd33c5b97139029936a26637 SHA1 5bc3f3ae1938c9951d0003b47d04154996596f25 SHA256 63468f27aa1a588482b843d899d98eaeda2b4152d28b8d120dcdf8d3610532a4 AUX vpopmail-5.4.9-access.violation.patch 918 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 SHA1 d8cee61fc06de279e87eb402ba404190683c5303 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac @@ -9,16 +9,16 @@ AUX vpopmail-lazy.patch 324 RMD160 9c65dfd19ed52cbb8e2e828973dfed9ab1d1cb57 SHA1 DIST vpopmail-5.4.16.tar.gz 453019 RMD160 de385ee6dbe0edf7ccb2e88c5b967669711d1e2b SHA1 59d158f0e6b9516f242085101a144597fc8bf296 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a DIST vpopmail-5.4.30.tar.gz 609358 RMD160 83fa5b43e146719953fb16da5b7d0a3780f8f94b SHA1 419f4dc8cc6577a43aa42f67a68f418e5b415adb SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc DIST vpopmail-5.4.33.tar.gz 612271 RMD160 d064f1a53e7cbe41c87af790ab2dee2d406df7b2 SHA1 1fd185321c5460458683ab7acfc104420b213e2d SHA256 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4 -EBUILD vpopmail-5.4.16.ebuild 7578 RMD160 7541f90ccc8f24e7ed50d67f0c7f64c148296063 SHA1 4a9caded00f83d85dcbbec4d6e4d9cc390884273 SHA256 446d852b65028132f03477f7b4856769017ca90e4193f15bcdf8a34f9b8f54a0 -EBUILD vpopmail-5.4.30-r1.ebuild 7222 RMD160 b5b054a11815daebf6009584f05e1fa63e0858f0 SHA1 81a38e710a6bf14fb614e5834f42e9f02afcd4be SHA256 48795f72d8b6bc9759f9afc9e98369302673e18b11aa949afe767c8a5d9852ea -EBUILD vpopmail-5.4.30-r2.ebuild 7324 RMD160 615b37cd3af0049d40636a11a79f21bdaef68a73 SHA1 8c14bb5d42ebe14c25a61fe24c3daa7357a8f146 SHA256 ac748c1eb9fdbf5cf165a18afa26c1cdd70daab16d87dbf5a7a70b78f17aa45d -EBUILD vpopmail-5.4.33.ebuild 7380 RMD160 c1973f6fafe86ff14d3f32f37e49059672f7b503 SHA1 af71b526ac9ff95f81183722fe8af1d58e64805a SHA256 b03f95e5ad55e0685e8f668fa2434b09f5184d069a5ee8383842858421a109fa -MISC ChangeLog 16228 RMD160 e947355361d6d352bbd01676a4a79afc11991e1b SHA1 ffa6d1330347a647514fd9c335a8a04d9b9c68f7 SHA256 2867bf842b3b106640e7f8df01a1a5454026d9c71da8610f63fa702d43abd752 +EBUILD vpopmail-5.4.16.ebuild 7512 RMD160 0a5f8dc55cec5210155d0417e530b73adfff651d SHA1 33164fbb2ca55a8b6fe68228344b79b30b2fc976 SHA256 e9924b35cdfc0c1bb9485e5b6c92851c48721f63c4c99094485d7bc407997264 +EBUILD vpopmail-5.4.30-r1.ebuild 7198 RMD160 32b2b0e434df1ce1dacb91f016c1a95cf12e26c1 SHA1 31b493ca94b8650d58006f3fe66de998e6d9070c SHA256 7f3f71cfd1d8af26d985740356f0bd1eb316976f78d381c90fd24987e71a190e +EBUILD vpopmail-5.4.30-r2.ebuild 7297 RMD160 c032b3be80df0e639020713fa87311b2bbcd1b65 SHA1 4612b32fe58d2b6c5819da580b191b444301c2c6 SHA256 8be104e0b18741b2f0fb7bdec0075df517de9226c3e8b9e5eefe1a77b1723102 +EBUILD vpopmail-5.4.33.ebuild 7359 RMD160 a4cded6a9ffa8867e84a85723428710209ec0d9e SHA1 0d1826486b7d39ae88c1aed78c3d2d81e796b2ca SHA256 8e779bae090e63bc3813c7d57d5da81a094cd97e517a14a69045189fa8721029 +MISC ChangeLog 16445 RMD160 eed18bf8bb9485d8d723f14ff47fdeee5e51dded SHA1 7de9c4488c101b28db1e4bc2f8e22cd150ec6ae5 SHA256 b4b0198bc2f01498a401f2bd2cd8e729dc2689902006039d7612817368ac5a86 MISC metadata.xml 517 RMD160 3ac125856ecc0b4a40da3121250fe0ae5e6d74c8 SHA1 2f0e78d2e5e00498860b9d72bdb4b66883370c55 SHA256 d651b3c6eb2a45f76ffd4546a77248df9f5750e9acd14b4896d3cac0bec65c88 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5rk7sACgkQuQc30/atMkBNFACfb2ef8PdzqhtxyEE0EGOqW03n -CH8AoLJtqtvl7Sfgg8Kkjqh4P+Djd7tq -=geum +iF4EAREIAAYFAk6x4GcACgkQaC/OocHi7JbJSwD9HLFl5KET+t8fbsBUze4BrYpa +Px8TQBLcC+Us1dcX6nsA/jBJzzXdSFgSvxH6P85QD07+YtCDKvSyB++ObBqdIofp +=gXcH -----END PGP SIGNATURE----- diff --git a/net-mail/vpopmail/vpopmail-5.4.16.ebuild b/net-mail/vpopmail/vpopmail-5.4.16.ebuild index b2a5d3afd79e..e151b7b06646 100644 --- a/net-mail/vpopmail/vpopmail-5.4.16.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.16.ebuild @@ -1,11 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.16.ebuild,v 1.15 2010/10/03 17:41:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.16.ebuild,v 1.16 2011/11/03 00:29:15 vapier Exp $ -WANT_AUTOCONF=latest -WANT_AUTOMAKE=latest - -inherit eutils fixheadtails autotools +inherit eutils fixheadtails autotools user # TODO: all ldap, sybase support #MY_PV=${PV/_/-} @@ -37,7 +34,7 @@ VPOP_HOME="$VPOP_DEFAULT_HOME" # This makes sure the variable is set, and that it isn't null. vpopmail_set_homedir() { - VPOP_HOME=`getent passwd vpopmail | cut -d: -f6` + VPOP_HOME=$(egethome) if [ -z "$VPOP_HOME" ]; then echo -ne "\a" eerror "vpopmail's home directory is null in passwd data!" diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild index 3823e36934ad..1f7363583548 100644 --- a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild,v 1.8 2011/09/10 16:43:33 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild,v 1.9 2011/11/03 00:29:15 vapier Exp $ EAPI="2" -inherit autotools eutils fixheadtails qmail +inherit autotools eutils fixheadtails qmail user HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail" DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers." @@ -24,7 +24,7 @@ RDEPEND="${DEPEND}" VPOP_DEFAULT_HOME="/var/vpopmail" vpopmail_set_homedir() { - VPOP_HOME=$(getent passwd vpopmail | cut -d: -f6) + VPOP_HOME=$(egethome) if [[ -z "${VPOP_HOME}" ]]; then ebeep eerror "vpopmail's home directory is null in passwd data!" diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild index a0ee5121f172..bdd03921051b 100644 --- a/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild,v 1.3 2011/05/15 10:13:15 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild,v 1.4 2011/11/03 00:29:15 vapier Exp $ EAPI="2" -inherit autotools eutils fixheadtails qmail +inherit autotools eutils fixheadtails qmail user HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail" DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers." @@ -25,7 +25,7 @@ RDEPEND="${DEPEND}" VPOP_DEFAULT_HOME="/var/vpopmail" vpopmail_set_homedir() { - VPOP_HOME=$(getent passwd vpopmail | cut -d: -f6) + VPOP_HOME=$(egethome) if [[ -z "${VPOP_HOME}" ]]; then ebeep eerror "vpopmail's home directory is null in passwd data!" diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild index 05c88cb0dffc..18f4e402dbf6 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33.ebuild,v 1.3 2011/08/20 07:28:13 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33.ebuild,v 1.4 2011/11/03 00:29:15 vapier Exp $ EAPI=4 -inherit autotools eutils fixheadtails qmail +inherit autotools eutils fixheadtails qmail user HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail" DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers." @@ -25,7 +25,7 @@ RDEPEND="${DEPEND}" VPOP_DEFAULT_HOME="/var/vpopmail" vpopmail_set_homedir() { - VPOP_HOME=$(getent passwd vpopmail | cut -d: -f6) + VPOP_HOME=$(egethome) if [[ -z "${VPOP_HOME}" ]]; then ebeep eerror "vpopmail's home directory is null in passwd data!" -- 2.26.2