commit: 6b2cb49fea06e38d1437e96f7d8a12e8fd6711e1
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 4 22:20:55 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 4 22:22:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b2cb49f
net-proxy/haproxy: bump & file moves.
- Add 1.7.7 release.
- move haproxy & haproxy-systemd-wrapper binaries to sbin to match
upstream & other distros, place symlinks in old location.
Package-Manager: portage-2.3.6
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
net-proxy/haproxy/Manifest | 1 +
net-proxy/haproxy/files/haproxy.initd-r5 | 85 +++++++++++++
net-proxy/haproxy/haproxy-1.5.19-r1.ebuild | 135 +++++++++++++++++++++
...1.6.9999-r1.ebuild => haproxy-1.6.13-r2.ebuild} | 19 +--
net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild | 18 +--
...oxy-1.6.9999-r1.ebuild => haproxy-1.7.7.ebuild} | 18 +--
net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild | 18 +--
7 files changed, 245 insertions(+), 49 deletions(-)
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 84a3b66e25f..d529fb21be3 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -5,3 +5,4 @@ DIST haproxy-1.6.12.tar.gz 1580114 SHA256
9bdf2bf855991dc4e0bf9b1ba2b1a322fc23f1
DIST haproxy-1.6.13.tar.gz 1580214 SHA256
7d318583f3a1bf185e857bd40449004b29c95547c89bbb36718f284e29502a1b SHA512
ffed3b347e0cd9cefdc379c91890a3c104d6848b976a9f28984878a9c2d05ca7ddea678f7a93f75cb9d29ae2be921e5a5bd295b1a8771765b099d1c619ded7a3
WHIRLPOOL
70176ee090dacbbdc822c74bba137589f168482c560734c06b98dc23b4d957ed1e016309f11f25a0b486bc6917633455f1174dc6688d6aef53667c61b83a9ff3
DIST haproxy-1.7.5.tar.gz 1743979 SHA256
b04d7db6383c662eb0a421a95af7becac6d9744a1abf0df6b0280c1e61416121 SHA512
9fc62b492b4eb80039511339d6e677107f4ba842f275d4be216a70a0d3d0463c819e10e365a7e9fe2e95e0b446b00350b4ee161e98bd724ca2e0e4e60bea5734
WHIRLPOOL
be176d9f237dcb36edaf223b86f3dc9baa964b4bffcba2af1aa267bbcaf2dee00b110c3dc70abc8aa96e37f55a9c99f29f416d9ecce3a62a712769647515b3ae
DIST haproxy-1.7.6.tar.gz 1744267 SHA256
88f84beba34d08a5495d908ca76866e033e6046e7c74f9477b9d5316f8c3d32a SHA512
89de0ba58f98419dd86befede9cb1d30adcbcc6671605d9c41871f0dec5ef89392258781ab41451582f179f8b2fec586bfe5d0694f8e11c3a25cb3d313613737
WHIRLPOOL
100c9d402be3ccf695dabf1fa6aa6d8ef79b8275076acbfd36252d9a7cfa3eeccce9d67fc4730923ec5e647cb99065a982a0541578fd84f0926bd104b381b5fd
+DIST haproxy-1.7.7.tar.gz 1745024 SHA256
81196ca449e4ada45fbd743fe3804bb82c25563ff9653e136872181ee5603ae2 SHA512
aa4720962e94b00c2b6090f62fb875e8977783256d877eb799b6a48c884833bac00b12d04fabd440011007e2af1914e0d67ab485026a447d8a61d58128d04a5a
WHIRLPOOL
d730dd21f1d8c2132297011e3dfbbbc12b6aa2cc61b67ee1cb9001b9f320e1e403ba917b81c8159fc7e2b43a0e3c95fd27172e1c86aada4963d3a4ecaebb3e2e
diff --git a/net-proxy/haproxy/files/haproxy.initd-r5
b/net-proxy/haproxy/files/haproxy.initd-r5
new file mode 100644
index 00000000000..0f2435f7433
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.initd-r5
@@ -0,0 +1,85 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# 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 -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}"
+ pidfile="${_t}" default_stop
+ 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-1.5.19-r1.ebuild
b/net-proxy/haproxy/haproxy-1.5.19-r1.ebuild
new file mode 100644
index 00000000000..2b0bc8af0a4
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.5.19-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit user versionator toolchain-funcs flag-o-matic systemd
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu";
+SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range
1-2)/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib"
+
+DEPEND="
+ pcre? (
+ dev-libs/libpcre
+ pcre-jit? ( dev-libs/libpcre[jit] )
+ )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0=[zlib?] )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup haproxy
+ enewuser haproxy -1 -1 -1 haproxy
+}
+
+src_compile() {
+ local args="TARGET=linux2628 USE_GETADDRINFO=1"
+
+ if use pcre ; then
+ args="${args} USE_PCRE=1"
+ if use pcre-jit; then
+ args="${args} USE_PCRE_JIT=1"
+ else
+ args="${args} USE_PCRE_JIT="
+ fi
+ else
+ args="${args} USE_PCRE= USE_PCRE_JIT="
+ fi
+
+# if use kernel_linux; then
+# args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
+# else
+# args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
+# fi
+
+ if use crypt ; then
+ args="${args} USE_LIBCRYPT=1"
+ else
+ args="${args} USE_LIBCRYPT="
+ fi
+
+ if use ssl ; then
+ args="${args} USE_OPENSSL=1"
+ else
+ args="${args} USE_OPENSSL="
+ fi
+
+ if use zlib ; then
+ args="${args} USE_ZLIB=1"
+ else
+ args="${args} USE_ZLIB="
+ fi
+
+ # For now, until the strict-aliasing breakage will be fixed
+ append-cflags -fno-strict-aliasing
+
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+ emake -C contrib/systemd SBINDIR=/usr/sbin
+
+ if use tools ; then
+ for contrib in halog iprange ; do
+ emake -C contrib/${contrib} \
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}"
LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+ done
+ fi
+}
+
+src_install() {
+ dosbin haproxy
+ dosym /usr/sbin/haproxy /usr/bin/haproxy
+
+ newinitd "${FILESDIR}/haproxy.initd-r5" haproxy
+
+ # Don't install useless files
+# rm examples/build.cfg doc/*gpl.txt
+
+ dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
+ doman doc/haproxy.1
+
+ dosbin haproxy-systemd-wrapper
+ dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
+ systemd_dounit contrib/systemd/haproxy.service
+
+ if use tools ; then
+ for contrib in halog iprange ; do
+ dobin contrib/${contrib}/${contrib}
+ done
+ fi
+
+ if use examples ; then
+ docinto examples
+ dodoc examples/*.cfg
+ fi
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins examples/haproxy.vim
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
+ ewarn "You need to create /etc/haproxy.cfg before you start the
haproxy service."
+ ewarn "It's best practice to not run haproxy as root, user and
group haproxy was therefore created."
+ ewarn "Make use of them with the \"user\" and \"group\"
directives."
+
+ if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
+ einfo "Please consult the installed documentation for
learning the configuration file's syntax."
+ einfo "The documentation and sample configuration files
are installed here:"
+ einfo " ${ROOT}usr/share/doc/${PF}"
+ fi
+ fi
+}
diff --git a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
b/net-proxy/haproxy/haproxy-1.6.13-r2.ebuild
similarity index 92%
copy from net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
copy to net-proxy/haproxy/haproxy-1.6.13-r2.ebuild
index dc6dcf334d8..5d3f45d2f51 100644
--- a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.13-r2.ebuild
@@ -22,7 +22,6 @@ LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools
vim-syntax +zlib lua device-atlas 51degrees wurfl"
REQUIRED_USE="pcre-jit? ( pcre )
- device-atlas? ( pcre )
?? ( slz zlib )"
DEPEND="
@@ -64,15 +63,6 @@ pkg_setup() {
fi
}
-src_prepare() {
- default
-
- sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
- > contrib/systemd/haproxy.service || die
-
- sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:'
src/haproxy-systemd-wrapper.c || die
-}
-
src_compile() {
local -a args=(
TARGET=linux2628
@@ -96,6 +86,7 @@ src_compile() {
append-cflags -fno-strict-aliasing
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+ emake -C contrib/systemd SBINDIR=/usr/sbin
if use tools ; then
for contrib in ${CONTRIBS[@]} ; do
@@ -106,14 +97,16 @@ src_compile() {
}
src_install() {
- dobin haproxy
+ dosbin haproxy
+ dosym /usr/sbin/haproxy /usr/bin/haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r4" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r5" $PN
doman doc/haproxy.1
- dobin haproxy-systemd-wrapper
+ dosbin haproxy-systemd-wrapper
+ dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
systemd_dounit contrib/systemd/haproxy.service
einstalldocs
diff --git a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
b/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
index dc6dcf334d8..43c58bdf5bc 100644
--- a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
@@ -64,15 +64,6 @@ pkg_setup() {
fi
}
-src_prepare() {
- default
-
- sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
- > contrib/systemd/haproxy.service || die
-
- sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:'
src/haproxy-systemd-wrapper.c || die
-}
-
src_compile() {
local -a args=(
TARGET=linux2628
@@ -96,6 +87,7 @@ src_compile() {
append-cflags -fno-strict-aliasing
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+ emake -C contrib/systemd SBINDIR=/usr/sbin
if use tools ; then
for contrib in ${CONTRIBS[@]} ; do
@@ -106,14 +98,16 @@ src_compile() {
}
src_install() {
- dobin haproxy
+ dosbin haproxy
+ dosym /usr/sbin/haproxy /usr/bin/haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r4" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r5" $PN
doman doc/haproxy.1
- dobin haproxy-systemd-wrapper
+ dosbin haproxy-systemd-wrapper
+ dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
systemd_dounit contrib/systemd/haproxy.service
einstalldocs
diff --git a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
b/net-proxy/haproxy/haproxy-1.7.7.ebuild
similarity index 93%
copy from net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
copy to net-proxy/haproxy/haproxy-1.7.7.ebuild
index dc6dcf334d8..43c58bdf5bc 100644
--- a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.7.ebuild
@@ -64,15 +64,6 @@ pkg_setup() {
fi
}
-src_prepare() {
- default
-
- sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
- > contrib/systemd/haproxy.service || die
-
- sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:'
src/haproxy-systemd-wrapper.c || die
-}
-
src_compile() {
local -a args=(
TARGET=linux2628
@@ -96,6 +87,7 @@ src_compile() {
append-cflags -fno-strict-aliasing
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+ emake -C contrib/systemd SBINDIR=/usr/sbin
if use tools ; then
for contrib in ${CONTRIBS[@]} ; do
@@ -106,14 +98,16 @@ src_compile() {
}
src_install() {
- dobin haproxy
+ dosbin haproxy
+ dosym /usr/sbin/haproxy /usr/bin/haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r4" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r5" $PN
doman doc/haproxy.1
- dobin haproxy-systemd-wrapper
+ dosbin haproxy-systemd-wrapper
+ dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
systemd_dounit contrib/systemd/haproxy.service
einstalldocs
diff --git a/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
b/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
index dc6dcf334d8..43c58bdf5bc 100644
--- a/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
@@ -64,15 +64,6 @@ pkg_setup() {
fi
}
-src_prepare() {
- default
-
- sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
- > contrib/systemd/haproxy.service || die
-
- sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:'
src/haproxy-systemd-wrapper.c || die
-}
-
src_compile() {
local -a args=(
TARGET=linux2628
@@ -96,6 +87,7 @@ src_compile() {
append-cflags -fno-strict-aliasing
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+ emake -C contrib/systemd SBINDIR=/usr/sbin
if use tools ; then
for contrib in ${CONTRIBS[@]} ; do
@@ -106,14 +98,16 @@ src_compile() {
}
src_install() {
- dobin haproxy
+ dosbin haproxy
+ dosym /usr/sbin/haproxy /usr/bin/haproxy
newconfd "${FILESDIR}/${PN}.confd" $PN
- newinitd "${FILESDIR}/${PN}.initd-r4" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r5" $PN
doman doc/haproxy.1
- dobin haproxy-systemd-wrapper
+ dosbin haproxy-systemd-wrapper
+ dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
systemd_dounit contrib/systemd/haproxy.service
einstalldocs
