From 53281f8174ce7727fdbe2bfe02afcfd029b262af Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Thu, 18 Aug 2016 22:50:28 +0200 Subject: net-proxy/haproxy: Version bump Package-Manager: portage-2.3.0 --- net-proxy/haproxy/Manifest | 2 +- net-proxy/haproxy/haproxy-1.6.7.ebuild | 165 --------------------------------- net-proxy/haproxy/haproxy-1.6.8.ebuild | 165 +++++++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+), 166 deletions(-) delete mode 100644 net-proxy/haproxy/haproxy-1.6.7.ebuild create mode 100644 net-proxy/haproxy/haproxy-1.6.8.ebuild (limited to 'net-proxy/haproxy') diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index 68179c8a1911..00567bebb131 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -1,3 +1,3 @@ DIST haproxy-1.5.14.tar.gz 1345345 SHA256 9565dd38649064d0350a2883fa81ccfe92eb17dcda457ebdc01535e1ab0c8f99 SHA512 83d6101fd402f37845ab3febc914335e4c6d9bdebbb0ff81c8e048d5252ffa5a1b77c4250a434fed5dd541ef1f1f2c47d969b59f7a51d6ab9aea38a8646a9798 WHIRLPOOL 7d2c580589b9b31e1eba169e4bf930ac42d2564e21eb1c25adbdd39b701abd221fd671ebc227167ab956a48b2c30eeb740a6394355a8fa748c408ee42fdff6fc DIST haproxy-1.5.18.tar.gz 1360582 SHA256 14a5684d85cf65c34a8d441afff2aaa4dd9b4234e81b3d4ddd242e6e7c97257e SHA512 b4f85986a6b1e0d152b643f576a0ff770fbc190457d3e0130fbb923ff9bf4d00b634e64edf0eadd5b47d0eb758fd9f6ecf33907fc4c21150a518064df954e7d0 WHIRLPOOL 5faf0aec42332564a3c392b0bbca25dc56c6a754672e1853ca765fc5d95d9ca963cd041dc705bbb38085a3da77219adf061966f2caa209e327ff02f3ee8fde3b -DIST haproxy-1.6.7.tar.gz 1565243 SHA256 583e0c0c3388c0597dea241601f3fedfe1d7ff8c735d471831be67315f58183a SHA512 fba060517aa316c3c66ac709c4b718cba7d265565ce191f8b022410a5c1c34ca8383b18e3ad6b6f8d1d9ee7648768b0bf1cd76ad3de3449144b0529dc16fcd00 WHIRLPOOL 73eede3745213adb9915898ff1cdfb6798e6716547b1d888785e1da3653b2ad7068c76299dda3ba19a8cd5cf0addf97e841b6f2b6c4741a52c3402a94f96f56c +DIST haproxy-1.6.8.tar.gz 1566594 SHA256 a51b7bf667245369683f8aafb288c4e33cb55d36c4b4b836f1dfc9aa56bb095c SHA512 692f93e0abf4ba457f74c25a17940ed855f39cbc50b4a4912e066cc8299cba5ba95d90dae98af95fbfa73b5b2fbb6ad21da7b6fa91cde7a91754f17f5bc332a3 WHIRLPOOL 1ecfced926da5c582bfe38fc20815bf57209c3c8afe5284a38c1e3e9446941993c8c3b2c9ba8b67256adf3c507d365fce02ab4ce175bbb411817b7753dee1a1c diff --git a/net-proxy/haproxy/haproxy-1.6.7.ebuild b/net-proxy/haproxy/haproxy-1.6.7.ebuild deleted file mode 100644 index 5b2d0aa04025..000000000000 --- a/net-proxy/haproxy/haproxy-1.6.7.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit user versionator toolchain-funcs flag-o-matic systemd linux-info - -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 doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua - -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 )" -# lua? ( dev-lang/lua:5.3 ) -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup haproxy - enewuser haproxy -1 -1 -1 haproxy - - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_prepare() { - 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 args="TARGET=linux2628 USE_GETADDRINFO=1" - - if use crypt ; then - args="${args} USE_LIBCRYPT=1" - else - args="${args} USE_LIBCRYPT=" - fi - -# bug 541042 -# if use lua; then -# args="${args} USE_LUA=1" -# else - args="${args} USE_LUA=" -# fi - - if use net_ns; then - args="${args} USE_NS=1" - else - args="${args} USE_NS=" - fi - - 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 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} - - 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() { - dobin haproxy - - newconfd "${FILESDIR}/${PN}.confd" $PN - newinitd "${FILESDIR}/${PN}.initd-r3" $PN - - dodoc CHANGELOG CONTRIBUTING MAINTAINERS - doman doc/haproxy.1 - - dobin haproxy-systemd-wrapper - systemd_dounit contrib/systemd/haproxy.service - - if use doc; then - dodoc ROADMAP doc/{close-options,configuration,cookie-options,intro,linux-syn-cookies,management,proxy-protocol}.txt - fi - - if use tools ; then - dobin contrib/halog/halog - newbin contrib/iprange/iprange haproxy_iprange - fi - - if use net_ns && use doc; then - dodoc doc/network-namespaces.txt - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc examples/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins examples/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${ROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/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.8.ebuild b/net-proxy/haproxy/haproxy-1.6.8.ebuild new file mode 100644 index 000000000000..5b2d0aa04025 --- /dev/null +++ b/net-proxy/haproxy/haproxy-1.6.8.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit user versionator toolchain-funcs flag-o-matic systemd linux-info + +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 doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua + +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 )" +# lua? ( dev-lang/lua:5.3 ) +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup haproxy + enewuser haproxy -1 -1 -1 haproxy + + if use net_ns; then + CONFIG_CHECK="~NET_NS" + linux-info_pkg_setup + fi +} + +src_prepare() { + 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 args="TARGET=linux2628 USE_GETADDRINFO=1" + + if use crypt ; then + args="${args} USE_LIBCRYPT=1" + else + args="${args} USE_LIBCRYPT=" + fi + +# bug 541042 +# if use lua; then +# args="${args} USE_LUA=1" +# else + args="${args} USE_LUA=" +# fi + + if use net_ns; then + args="${args} USE_NS=1" + else + args="${args} USE_NS=" + fi + + 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 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} + + 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() { + dobin haproxy + + newconfd "${FILESDIR}/${PN}.confd" $PN + newinitd "${FILESDIR}/${PN}.initd-r3" $PN + + dodoc CHANGELOG CONTRIBUTING MAINTAINERS + doman doc/haproxy.1 + + dobin haproxy-systemd-wrapper + systemd_dounit contrib/systemd/haproxy.service + + if use doc; then + dodoc ROADMAP doc/{close-options,configuration,cookie-options,intro,linux-syn-cookies,management,proxy-protocol}.txt + fi + + if use tools ; then + dobin contrib/halog/halog + newbin contrib/iprange/iprange haproxy_iprange + fi + + if use net_ns && use doc; then + dodoc doc/network-namespaces.txt + fi + + if use examples ; then + docinto examples + dodoc examples/*.cfg + dodoc examples/seamless_reload.txt + fi + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/syntax + doins examples/haproxy.vim + fi +} + +pkg_postinst() { + if [[ ! -f "${ROOT}/etc/haproxy/haproxy.cfg" ]] ; then + ewarn "You need to create /etc/haproxy/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 +} -- cgit v1.2.3-65-gdbad