commit: 00010b688ac1a833f545337afa6497795010abc3 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Sat Nov 1 01:33:28 2014 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Sat Nov 1 01:33:28 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=00010b68
[galera] Sync changes from tree for enewuser and bashisms Package-Manager: portage-2.2.8-r2 Manifest-Sign-Key: 67C78E1D --- sys-cluster/galera/ChangeLog | 4 ++++ sys-cluster/galera/Manifest | 14 ++++++++++++++ sys-cluster/galera/files/garb.sh | 6 +++--- sys-cluster/galera/galera-25.3.5.ebuild | 4 ++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog index eb2ae3d..6d4b7e8 100644 --- a/sys-cluster/galera/ChangeLog +++ b/sys-cluster/galera/ChangeLog @@ -1,3 +1,7 @@ + 01 Nov 2014; Brian Evans <[email protected]> files/garb.sh, + galera-25.3.5.ebuild: + [galera] Sync changes from tree for enewuser and bashisms + 31 Oct 2014; Brian Evans <[email protected]> galera-25.3.5.ebuild: Sync from main tree for user eclass. Thanks for dcmwai on IRC for noticing diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index cc53fd8..3c10197 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -1,4 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST galera-23.2.4-src.tar.gz 3061934 SHA256 83eec5e8df53b9adcd601a84312a54e843b2584b0cbe445125c2266b22590e78 SHA512 b953d07cdd69c7e42e80053125bb69f4becf457529924768348846612db49d92c4a46e6c85739cc0c0b102d703dc3a3b73bc368171e6f863a1f56b2cd22cb711 WHIRLPOOL 3842dd7f4bd11ab4cb656c3d89758232b96d85ba64919932d03dde2f44cb13bdf7913e6d217e6ca49f376aaf15b7271d3a870a16ba1010d522b57ff59247edc2 DIST galera-23.2.7-src.tar.gz 3140705 SHA256 b444583753462281e8ddadc3a10463687ecedc089d763251f8658c6232aaa927 SHA512 15b21f060ecff44dc11f57955867b938831e41cef7b27737fbd050cc9c9af4fed9cc9d62584b445277b8ab087444a7e31d5d20d6ee188c4bb9956e4ba22bcbcc WHIRLPOOL 011a3b943dcbaf4efc5628f3be5ff7b95f45862cd115729d13201599455a1576fbd43a7baf37c15240f7d164bf50df2ef078645fa8d7ccf96a3f67b1f4d2b482 DIST galera-25.3.2-src.tar.gz 3808803 SHA256 5dd54364720f8854088590bdfea1e3a7f3e37fda3dfe8a5f58ebcc987cc6788d SHA512 784476938d8d57e865685f3a43ed95d1aeed151dd145476bc094d5a132c87bdaab2cd9c8aac610adc4c847dfbf814b0d59cddaa68b73c741fd6918738f52f545 WHIRLPOOL 01c51a6ba5f069890e9c529bde7d7ce7bb7e16997779ab074be592257792f5c5d3d146e228548a2db31acf5fab0d7e410506118f03c2fdb44004fb364a3cc6fa DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAEBCAAGBQJUU/ceAAoJEE4V4vFnx44dYkwH/iYwDNMBcc7lufB7IxaWs8zO +p1t2GP4VSOZQPb47pJhfvmsbOUSq3maiZ2XCRm2N17HvFcLSyYnEKhGib8FkFJsk +e/e5Qp9SoPP1sthnrrWyA5Zw1lM6VHOSioty26L9KNaiMitMeymcXo7A4YZR2tIE +0ug+nbC9Vdkt7ICcjl5+RhWRNHcnGKHLBB7i0loW0+Pn5JclNgb5y2Dj8gDZeFNG +QhMuwHlTEgYo657yDqqgA54htsNT2n/PB2qUk1CKGZFZCWsCkpvUb/IMiDo2n3ns +hybaEpXC055US0hmylGOcSn+JJzXlVabW3Fg6hxl/5ziU92OtsgAD00jWhyNSoU= +=WrSM +-----END PGP SIGNATURE----- diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh index 6f0cc93..63e88df 100644 --- a/sys-cluster/galera/files/garb.sh +++ b/sys-cluster/galera/files/garb.sh @@ -1,5 +1,5 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 depend() { @@ -25,13 +25,13 @@ start() { for ADDRESS in ${GALERA_NODES} 0; do HOST=$(echo $ADDRESS | cut -d \: -f 1 ) PORT=$(echo $ADDRESS | cut -d \: -f 2 ) - if [[ "${HOST}" == "${PORT}" ]]; then + if [ "x${HOST}" = "x${PORT}" ]; then PORT=${GALERA_PORT} fi PORT=${PORT:-$GALERA_PORT} nc -z ${HOST} ${PORT} > /dev/null && break done - if [ ${ADDRESS} == "0" ]; then + if [ ${ADDRESS} = "0" ]; then eerror "None of the nodes in GALERA_NODES is accessible" return 1 fi diff --git a/sys-cluster/galera/galera-25.3.5.ebuild b/sys-cluster/galera/galera-25.3.5.ebuild index ae805c8..d5d7810 100644 --- a/sys-cluster/galera/galera-25.3.5.ebuild +++ b/sys-cluster/galera/galera-25.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.5.ebuild,v 1.2 2014/10/31 20:33:34 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.5.ebuild,v 1.3 2014/10/31 22:06:10 grknight Exp $ EAPI=5 @@ -41,7 +41,7 @@ S="${WORKDIR}/${MY_P}" pkg_preinst() { if use garbd ; then enewgroup garbd - enewuser garbd + enewuser garbd -1 -1 -1 garbd fi }
