| 1 |
commit: 00010b688ac1a833f545337afa6497795010abc3 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 1 01:33:28 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 1 01:33:28 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=00010b68 |
| 7 |
|
| 8 |
[galera] Sync changes from tree for enewuser and bashisms |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.8-r2 |
| 11 |
Manifest-Sign-Key: 67C78E1D |
| 12 |
|
| 13 |
--- |
| 14 |
sys-cluster/galera/ChangeLog | 4 ++++ |
| 15 |
sys-cluster/galera/Manifest | 14 ++++++++++++++ |
| 16 |
sys-cluster/galera/files/garb.sh | 6 +++--- |
| 17 |
sys-cluster/galera/galera-25.3.5.ebuild | 4 ++-- |
| 18 |
4 files changed, 23 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog |
| 21 |
index eb2ae3d..6d4b7e8 100644 |
| 22 |
--- a/sys-cluster/galera/ChangeLog |
| 23 |
+++ b/sys-cluster/galera/ChangeLog |
| 24 |
@@ -1,3 +1,7 @@ |
| 25 |
+ 01 Nov 2014; Brian Evans <grknight@g.o> files/garb.sh, |
| 26 |
+ galera-25.3.5.ebuild: |
| 27 |
+ [galera] Sync changes from tree for enewuser and bashisms |
| 28 |
+ |
| 29 |
31 Oct 2014; Brian Evans <grknight@g.o> galera-25.3.5.ebuild: |
| 30 |
Sync from main tree for user eclass. Thanks for dcmwai on IRC for noticing |
| 31 |
|
| 32 |
|
| 33 |
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest |
| 34 |
index cc53fd8..3c10197 100644 |
| 35 |
--- a/sys-cluster/galera/Manifest |
| 36 |
+++ b/sys-cluster/galera/Manifest |
| 37 |
@@ -1,4 +1,18 @@ |
| 38 |
+-----BEGIN PGP SIGNED MESSAGE----- |
| 39 |
+Hash: SHA256 |
| 40 |
+ |
| 41 |
DIST galera-23.2.4-src.tar.gz 3061934 SHA256 83eec5e8df53b9adcd601a84312a54e843b2584b0cbe445125c2266b22590e78 SHA512 b953d07cdd69c7e42e80053125bb69f4becf457529924768348846612db49d92c4a46e6c85739cc0c0b102d703dc3a3b73bc368171e6f863a1f56b2cd22cb711 WHIRLPOOL 3842dd7f4bd11ab4cb656c3d89758232b96d85ba64919932d03dde2f44cb13bdf7913e6d217e6ca49f376aaf15b7271d3a870a16ba1010d522b57ff59247edc2 |
| 42 |
DIST galera-23.2.7-src.tar.gz 3140705 SHA256 b444583753462281e8ddadc3a10463687ecedc089d763251f8658c6232aaa927 SHA512 15b21f060ecff44dc11f57955867b938831e41cef7b27737fbd050cc9c9af4fed9cc9d62584b445277b8ab087444a7e31d5d20d6ee188c4bb9956e4ba22bcbcc WHIRLPOOL 011a3b943dcbaf4efc5628f3be5ff7b95f45862cd115729d13201599455a1576fbd43a7baf37c15240f7d164bf50df2ef078645fa8d7ccf96a3f67b1f4d2b482 |
| 43 |
DIST galera-25.3.2-src.tar.gz 3808803 SHA256 5dd54364720f8854088590bdfea1e3a7f3e37fda3dfe8a5f58ebcc987cc6788d SHA512 784476938d8d57e865685f3a43ed95d1aeed151dd145476bc094d5a132c87bdaab2cd9c8aac610adc4c847dfbf814b0d59cddaa68b73c741fd6918738f52f545 WHIRLPOOL 01c51a6ba5f069890e9c529bde7d7ce7bb7e16997779ab074be592257792f5c5d3d146e228548a2db31acf5fab0d7e410506118f03c2fdb44004fb364a3cc6fa |
| 44 |
DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d |
| 45 |
+-----BEGIN PGP SIGNATURE----- |
| 46 |
+Version: GnuPG v2 |
| 47 |
+ |
| 48 |
+iQEcBAEBCAAGBQJUU/ceAAoJEE4V4vFnx44dYkwH/iYwDNMBcc7lufB7IxaWs8zO |
| 49 |
+p1t2GP4VSOZQPb47pJhfvmsbOUSq3maiZ2XCRm2N17HvFcLSyYnEKhGib8FkFJsk |
| 50 |
+e/e5Qp9SoPP1sthnrrWyA5Zw1lM6VHOSioty26L9KNaiMitMeymcXo7A4YZR2tIE |
| 51 |
+0ug+nbC9Vdkt7ICcjl5+RhWRNHcnGKHLBB7i0loW0+Pn5JclNgb5y2Dj8gDZeFNG |
| 52 |
+QhMuwHlTEgYo657yDqqgA54htsNT2n/PB2qUk1CKGZFZCWsCkpvUb/IMiDo2n3ns |
| 53 |
+hybaEpXC055US0hmylGOcSn+JJzXlVabW3Fg6hxl/5ziU92OtsgAD00jWhyNSoU= |
| 54 |
+=WrSM |
| 55 |
+-----END PGP SIGNATURE----- |
| 56 |
|
| 57 |
diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh |
| 58 |
index 6f0cc93..63e88df 100644 |
| 59 |
--- a/sys-cluster/galera/files/garb.sh |
| 60 |
+++ b/sys-cluster/galera/files/garb.sh |
| 61 |
@@ -1,5 +1,5 @@ |
| 62 |
#!/sbin/runscript |
| 63 |
-# Copyright 1999-2013 Gentoo Foundation |
| 64 |
+# Copyright 1999-2014 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
depend() { |
| 68 |
@@ -25,13 +25,13 @@ start() { |
| 69 |
for ADDRESS in ${GALERA_NODES} 0; do |
| 70 |
HOST=$(echo $ADDRESS | cut -d \: -f 1 ) |
| 71 |
PORT=$(echo $ADDRESS | cut -d \: -f 2 ) |
| 72 |
- if [[ "${HOST}" == "${PORT}" ]]; then |
| 73 |
+ if [ "x${HOST}" = "x${PORT}" ]; then |
| 74 |
PORT=${GALERA_PORT} |
| 75 |
fi |
| 76 |
PORT=${PORT:-$GALERA_PORT} |
| 77 |
nc -z ${HOST} ${PORT} > /dev/null && break |
| 78 |
done |
| 79 |
- if [ ${ADDRESS} == "0" ]; then |
| 80 |
+ if [ ${ADDRESS} = "0" ]; then |
| 81 |
eerror "None of the nodes in GALERA_NODES is accessible" |
| 82 |
return 1 |
| 83 |
fi |
| 84 |
|
| 85 |
diff --git a/sys-cluster/galera/galera-25.3.5.ebuild b/sys-cluster/galera/galera-25.3.5.ebuild |
| 86 |
index ae805c8..d5d7810 100644 |
| 87 |
--- a/sys-cluster/galera/galera-25.3.5.ebuild |
| 88 |
+++ b/sys-cluster/galera/galera-25.3.5.ebuild |
| 89 |
@@ -1,6 +1,6 @@ |
| 90 |
# Copyright 1999-2014 Gentoo Foundation |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.5.ebuild,v 1.2 2014/10/31 20:33:34 grknight Exp $ |
| 93 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.5.ebuild,v 1.3 2014/10/31 22:06:10 grknight Exp $ |
| 94 |
|
| 95 |
EAPI=5 |
| 96 |
|
| 97 |
@@ -41,7 +41,7 @@ S="${WORKDIR}/${MY_P}" |
| 98 |
pkg_preinst() { |
| 99 |
if use garbd ; then |
| 100 |
enewgroup garbd |
| 101 |
- enewuser garbd |
| 102 |
+ enewuser garbd -1 -1 -1 garbd |
| 103 |
fi |
| 104 |
} |
Archives