commit: 7bc2bba0d3610ed3c482bd329a39c81227008539 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Tue Aug 18 20:41:08 2015 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Tue Aug 18 20:41:08 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc2bba0
sys-cluster/galera: Remove netcat which is no longer needed in the init Upstream https://github.com/codership/galera/commit/6209a777da487764a728fcb6e9e1f20f82968ee0 removes it Package-Manager: portage-2.2.20.1 sys-cluster/galera/files/garb.sh | 20 +++----------------- sys-cluster/galera/galera-25.3.10.ebuild | 8 +------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh index 63e88df..da7d550 100644 --- a/sys-cluster/galera/files/garb.sh +++ b/sys-cluster/galera/files/garb.sh @@ -1,5 +1,5 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 depend() { @@ -22,21 +22,7 @@ start() { GALERA_PORT="${GALERA_PORT:-4567}" - for ADDRESS in ${GALERA_NODES} 0; do - HOST=$(echo $ADDRESS | cut -d \: -f 1 ) - PORT=$(echo $ADDRESS | cut -d \: -f 2 ) - 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 - eerror "None of the nodes in GALERA_NODES is accessible" - return 1 - fi - - OPTIONS="-a gcomm://${ADDRESS} -g ${GALERA_GROUP}" + OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}" [ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}" [ -n "${LOG_FILE}" ] && OPTIONS="${OPTIONS} -l ${LOG_FILE}" diff --git a/sys-cluster/galera/galera-25.3.10.ebuild b/sys-cluster/galera/galera-25.3.10.ebuild index bbaad5a..96a2e5c 100644 --- a/sys-cluster/galera/galera-25.3.10.ebuild +++ b/sys-cluster/galera/galera-25.3.10.ebuild @@ -28,13 +28,7 @@ DEPEND="${DEPEND} >=dev-cpp/asio-1.4.8[ssl?] " #Run time only -RDEPEND="${CDEPEND} - garbd? ( || ( - net-analyzer/netcat - net-analyzer/netcat6 - net-analyzer/gnu-netcat - net-analyzer/openbsd-netcat - ) )" +RDEPEND="${CDEPEND}" S="${WORKDIR}/${MY_P}"
