public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Christian Ruppert" <idl0r@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/
Date: Wed,  6 Apr 2022 13:22:59 +0000 (UTC)	[thread overview]
Message-ID: <1649251369.f0c1f3a38f315e6b838aa1628ca2f69db33039ca.idl0r@gentoo> (raw)

commit:     f0c1f3a38f315e6b838aa1628ca2f69db33039ca
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 13:19:22 2022 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 13:22:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c1f3a3

net-proxy/haproxy: Revbump: Use Master-Worker Mode by default

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>

 net-proxy/haproxy/files/haproxy.initd-r7           | 85 ++++++++++++++++++++++
 ...roxy-2.0.28.ebuild => haproxy-2.0.28-r1.ebuild} |  2 +-
 net-proxy/haproxy/haproxy-2.0.9999.ebuild          |  2 +-
 ...roxy-2.2.22.ebuild => haproxy-2.2.22-r1.ebuild} |  2 +-
 net-proxy/haproxy/haproxy-2.2.9999.ebuild          |  2 +-
 ...roxy-2.4.15.ebuild => haproxy-2.4.15-r1.ebuild} |  2 +-
 net-proxy/haproxy/haproxy-2.4.9999.ebuild          |  2 +-
 ...aproxy-2.5.5.ebuild => haproxy-2.5.5-r1.ebuild} |  2 +-
 net-proxy/haproxy/haproxy-2.5.9999.ebuild          |  2 +-
 .../{haproxy-2.4.15.ebuild => haproxy-9999.ebuild} | 16 ++--
 10 files changed, 101 insertions(+), 16 deletions(-)

diff --git a/net-proxy/haproxy/files/haproxy.initd-r7 b/net-proxy/haproxy/files/haproxy.initd-r7
new file mode 100644
index 000000000000..95f27d676b6c
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.initd-r7
@@ -0,0 +1,85 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command="/usr/sbin/haproxy"
+
+pidfile="${HAPROXY_PIDFILE:-/run/${SVCNAME}.pid}"
+
+configs=
+
+if [ -z "${CONFIGS}" ]; then
+	if [ -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
+		CONFIGS=/etc/haproxy/${SVCNAME}.cfg
+	elif [ -f "/etc/${SVCNAME}.cfg" ]; then
+		CONFIGS=/etc/${SVCNAME}.cfg # Deprecated
+	fi
+fi
+
+for conf in $CONFIGS; do
+	configs="${configs} -f ${conf}"
+done
+
+command_args="-D -W -p ${pidfile} ${configs} ${HAPROXY_OPTS}"
+
+depend() {
+	need net
+	use dns logger
+}
+
+checkconfig() {
+	if [ -z "${CONFIGS}" ]; then
+		eerror "No config(s) has been specified"
+		return 1
+	fi
+
+	for conf in $CONFIGS; do
+		if [ ! -f "${conf}" ]; then
+			eerror "${conf} does not exist!"
+			return 1
+		fi
+	done
+
+	ebegin "Checking ${CONFIGS}"
+	$command -q -c $configs $HAPROXY_OPTS
+	eend $?
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+stop() {
+	local _t _pid
+
+	_t="$(mktemp)"
+	for _pid in $(cat ${pidfile}) ; do
+		echo "${_pid}" > "${_t}"
+		start-stop-daemon --stop --pidfile="${_t}"
+	done
+	rm -f "${_t}"
+}
+
+reload() {
+	checkconfig || { eerror "Reloading failed, please fix your config(s) first"; return 1; }
+
+	if [ "$(command -v reload_seamless)" = "reload_seamless" ]; then
+		einfo "Calling user-defined reload_seamless()"
+		reload_seamless || { eerror "reload_seamless() failed!"; return 1; }
+	fi
+
+	ebegin "Reloading ${SVCNAME}"
+	$command -D -p "${pidfile}" $configs $HAPROXY_OPTS -sf $(cat "${pidfile}")
+	eend $?
+}

diff --git a/net-proxy/haproxy/haproxy-2.0.28.ebuild b/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.0.28.ebuild
rename to net-proxy/haproxy/haproxy-2.0.28-r1.ebuild
index db0148b44e73..4b054f13c306 100644
--- a/net-proxy/haproxy/haproxy-2.0.28.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild
@@ -130,7 +130,7 @@ src_install() {
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
 	doman doc/haproxy.1
 

diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index db0148b44e73..4b054f13c306 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -130,7 +130,7 @@ src_install() {
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
 	doman doc/haproxy.1
 

diff --git a/net-proxy/haproxy/haproxy-2.2.22.ebuild b/net-proxy/haproxy/haproxy-2.2.22-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.2.22.ebuild
rename to net-proxy/haproxy/haproxy-2.2.22-r1.ebuild
index db0148b44e73..4b054f13c306 100644
--- a/net-proxy/haproxy/haproxy-2.2.22.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.22-r1.ebuild
@@ -130,7 +130,7 @@ src_install() {
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
 	doman doc/haproxy.1
 

diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index db0148b44e73..4b054f13c306 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -130,7 +130,7 @@ src_install() {
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
 	doman doc/haproxy.1
 

diff --git a/net-proxy/haproxy/haproxy-2.4.15.ebuild b/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild
similarity index 99%
copy from net-proxy/haproxy/haproxy-2.4.15.ebuild
copy to net-proxy/haproxy/haproxy-2.4.15-r1.ebuild
index 22b2de178900..0b3865f3f4f6 100644
--- a/net-proxy/haproxy/haproxy-2.4.15.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild
@@ -125,7 +125,7 @@ src_install() {
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
 	doman doc/haproxy.1
 

diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 22b2de178900..0b3865f3f4f6 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -125,7 +125,7 @@ src_install() {
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
 	doman doc/haproxy.1
 

diff --git a/net-proxy/haproxy/haproxy-2.5.5.ebuild b/net-proxy/haproxy/haproxy-2.5.5-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.5.5.ebuild
rename to net-proxy/haproxy/haproxy-2.5.5-r1.ebuild
index 22b2de178900..0b3865f3f4f6 100644
--- a/net-proxy/haproxy/haproxy-2.5.5.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.5-r1.ebuild
@@ -125,7 +125,7 @@ src_install() {
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
 	doman doc/haproxy.1
 

diff --git a/net-proxy/haproxy/haproxy-2.5.9999.ebuild b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
index 22b2de178900..0b3865f3f4f6 100644
--- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
@@ -125,7 +125,7 @@ src_install() {
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
 	doman doc/haproxy.1
 

diff --git a/net-proxy/haproxy/haproxy-2.4.15.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
similarity index 86%
rename from net-proxy/haproxy/haproxy-2.4.15.ebuild
rename to net-proxy/haproxy/haproxy-9999.ebuild
index 22b2de178900..db1e3fcb7d17 100644
--- a/net-proxy/haproxy/haproxy-2.4.15.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -16,12 +16,12 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 else
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
 	EGIT_BRANCH=master
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
+SLOT="0/${PV}"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
@@ -102,19 +102,19 @@ src_compile() {
 	fi
 
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}"	TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}"	TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) SBINDIR=/usr/sbin
 
 	if use tools ; then
 		for extra in ${EXTRAS[@]} ; do
 			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
 			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
 			else
 				# Those two includes are a workaround for hpack Makefile missing those
 				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
 			fi
 		done
 	fi
@@ -125,7 +125,7 @@ src_install() {
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
 	doman doc/haproxy.1
 


             reply	other threads:[~2022-04-06 13:23 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-06 13:22 Christian Ruppert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-02-14 16:13 [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/ Christian Ruppert
2023-02-14 16:13 Christian Ruppert
2022-06-28  9:27 Christian Ruppert
2019-01-29  8:47 Christian Ruppert
2017-12-04  9:08 Christian Ruppert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1649251369.f0c1f3a38f315e6b838aa1628ca2f69db33039ca.idl0r@gentoo \
    --to=idl0r@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox