commit: 0ff48e295842df204280fb58b4e20de8b1c215aa Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> AuthorDate: Thu Mar 20 15:45:54 2025 +0000 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> CommitDate: Thu Mar 20 15:46:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff48e29
net-proxy/haproxy: Bump to 3.0.9 and 3.1.6; Also send USR2 on reload Bug: https://bugs.gentoo.org/950574 Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> net-proxy/haproxy/Manifest | 2 + net-proxy/haproxy/files/haproxy.initd-r9 | 86 ++++++++++++++++++++++ net-proxy/haproxy/haproxy-2.6.9999.ebuild | 4 +- net-proxy/haproxy/haproxy-2.8.9999.ebuild | 4 +- net-proxy/haproxy/haproxy-2.9.9999.ebuild | 4 +- ...aproxy-3.0.9999.ebuild => haproxy-3.0.9.ebuild} | 4 +- net-proxy/haproxy/haproxy-3.0.9999.ebuild | 4 +- ...aproxy-3.1.9999.ebuild => haproxy-3.1.6.ebuild} | 4 +- net-proxy/haproxy/haproxy-3.1.9999.ebuild | 4 +- net-proxy/haproxy/haproxy-9999.ebuild | 4 +- 10 files changed, 104 insertions(+), 16 deletions(-) diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index b9a45ebee59e..624f1ef4a605 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -10,4 +10,6 @@ DIST haproxy-2.9.14.tar.gz 4557688 BLAKE2B 78b819990924d199b0aba78aafe788303cce9 DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 5666624d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733f0e8692 SHA512 4e00069356083c8d428bf056e2a26ccfb3e18029cc96769189010d59d0b4f1c7af58986f1653067db83838dcbc2c138798663d3fbb9aac1d3c49c30cfc579c2a DIST haproxy-3.0.5.tar.gz 4698022 BLAKE2B c64d8799755fddaf5b45a9e2b67c5f03b25af98fbddde68ab1206c288d9a65f91938810b150c4398ee138d9154c90f1af9fb05c3d0bbc80394e71430e1cc4396 SHA512 8c16b026d5e26fc030178ecd354c68e8ea32c2b971f143cb2aa2f1b2d16fbfc0a27e3975f78873a0cefe3f904b5f1999f8d75622a04234b9cf88f90161d9ea91 DIST haproxy-3.0.8.tar.gz 4723201 BLAKE2B f5533157d5c7d454f42137ea4071cc0838cf9eb84e5c0444a78665a3242af04fc49493b04d0dcc4aa21065718df42a9e194860f1000c549669fb4e7df99791b3 SHA512 37a633aba96c4da7f00da9c636dd874c5b5d1419a00468857525ee4ddab9cee0b0cbea6f5834d7f07568b41836a1be9ae7d34443c22e42627b9043534a6df6ea +DIST haproxy-3.0.9.tar.gz 4729071 BLAKE2B a4d48dc927dd4ab1829aaa6e1e395aa138e25c078a9792dab05e7b58af3ebf92c76d10d65802825ccc442469195cfad700c8499c3072a3035c2b5efbbc36d2dd SHA512 57e0db9176af607014dc1b51a717172f2bf80326cb70823bf1fe8aa1e1f016f6f132289acfb9ba6518a38ca2d7bd59083e7a77eac337f6673b4ab7e45b45e013 DIST haproxy-3.1.5.tar.gz 4907109 BLAKE2B 08cb1b7291fb6047922910758059dd5fb748218f3eaf711b823939489a975eef0340c626abb423afa3ba591b633319b75dff6e8bd6ada95c9ebb8b7f02bf491a SHA512 4eb9e07b9f3b31b41bc829b267f55549d19d1b45b9247c30c36b49fbfc8b9780364bdc01ff483d20760fcdce7fe43f56b5c6f0cd8fc430cbc2b1b60bd71ab184 +DIST haproxy-3.1.6.tar.gz 4911948 BLAKE2B 6ec25894fd725d3b7a5bf231eefc41656d03583d70dfb1e2ab12ae2a1d4ab863170891451db18a8d1f90f4965916c9f26ebe091f3017304a8aa7061c15d257e2 SHA512 85a3c68591b2547278d641c20d6c1b9dd82639c5a5917adc3abdbc02f731bb7dd34ad1101c873e3efc1eb970db853404a1839a33368bb1229edda59ed1c7f2ec diff --git a/net-proxy/haproxy/files/haproxy.initd-r9 b/net-proxy/haproxy/files/haproxy.initd-r9 new file mode 100644 index 000000000000..4b2ffb07712d --- /dev/null +++ b/net-proxy/haproxy/files/haproxy.initd-r9 @@ -0,0 +1,86 @@ +#!/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 $command_args + 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()" + ewarn "The user-defiled reload_seamless() function is deprecated as it is no longer necessary nowadays, with recent HAProxy versions. If you think otherwise, please file a bug" + reload_seamless || { eerror "reload_seamless() failed!"; return 1; } + fi + + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --signal USR2 --pidfile "${pidfile}" + eend $? +} diff --git a/net-proxy/haproxy/haproxy-2.6.9999.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild index ce11ece1a066..b8adca997201 100644 --- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -160,7 +160,7 @@ src_install() { dosbin haproxy newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} doman doc/haproxy.1 diff --git a/net-proxy/haproxy/haproxy-2.8.9999.ebuild b/net-proxy/haproxy/haproxy-2.8.9999.ebuild index ce11ece1a066..b8adca997201 100644 --- a/net-proxy/haproxy/haproxy-2.8.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -160,7 +160,7 @@ src_install() { dosbin haproxy newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} doman doc/haproxy.1 diff --git a/net-proxy/haproxy/haproxy-2.9.9999.ebuild b/net-proxy/haproxy/haproxy-2.9.9999.ebuild index ce11ece1a066..b8adca997201 100644 --- a/net-proxy/haproxy/haproxy-2.9.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.9.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -160,7 +160,7 @@ src_install() { dosbin haproxy newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} doman doc/haproxy.1 diff --git a/net-proxy/haproxy/haproxy-3.0.9999.ebuild b/net-proxy/haproxy/haproxy-3.0.9.ebuild similarity index 98% copy from net-proxy/haproxy/haproxy-3.0.9999.ebuild copy to net-proxy/haproxy/haproxy-3.0.9.ebuild index 019b7ed1219f..8205a410b419 100644 --- a/net-proxy/haproxy/haproxy-3.0.9999.ebuild +++ b/net-proxy/haproxy/haproxy-3.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -159,7 +159,7 @@ src_install() { dosbin haproxy newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} doman doc/haproxy.1 diff --git a/net-proxy/haproxy/haproxy-3.0.9999.ebuild b/net-proxy/haproxy/haproxy-3.0.9999.ebuild index 019b7ed1219f..8205a410b419 100644 --- a/net-proxy/haproxy/haproxy-3.0.9999.ebuild +++ b/net-proxy/haproxy/haproxy-3.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -159,7 +159,7 @@ src_install() { dosbin haproxy newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} doman doc/haproxy.1 diff --git a/net-proxy/haproxy/haproxy-3.1.9999.ebuild b/net-proxy/haproxy/haproxy-3.1.6.ebuild similarity index 98% copy from net-proxy/haproxy/haproxy-3.1.9999.ebuild copy to net-proxy/haproxy/haproxy-3.1.6.ebuild index c0bde0ca349c..ea3c85bbd20c 100644 --- a/net-proxy/haproxy/haproxy-3.1.9999.ebuild +++ b/net-proxy/haproxy/haproxy-3.1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -158,7 +158,7 @@ src_install() { dosbin haproxy newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} doman doc/haproxy.1 diff --git a/net-proxy/haproxy/haproxy-3.1.9999.ebuild b/net-proxy/haproxy/haproxy-3.1.9999.ebuild index c0bde0ca349c..ea3c85bbd20c 100644 --- a/net-proxy/haproxy/haproxy-3.1.9999.ebuild +++ b/net-proxy/haproxy/haproxy-3.1.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -158,7 +158,7 @@ src_install() { dosbin haproxy newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} doman doc/haproxy.1 diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild index c0bde0ca349c..ea3c85bbd20c 100644 --- a/net-proxy/haproxy/haproxy-9999.ebuild +++ b/net-proxy/haproxy/haproxy-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -158,7 +158,7 @@ src_install() { dosbin haproxy newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} doman doc/haproxy.1
