From fbe5bcb410ec119e3ac7295e34f157b85f053897 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Mon, 12 Jan 2015 22:12:09 +0000 Subject: Version bump (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B427ABC8) --- net-proxy/haproxy/ChangeLog | 8 +- net-proxy/haproxy/haproxy-1.5.10.ebuild | 135 ++++++++++++++++++++++++++++++++ net-proxy/haproxy/haproxy-1.5.9.ebuild | 135 -------------------------------- 3 files changed, 142 insertions(+), 136 deletions(-) create mode 100644 net-proxy/haproxy/haproxy-1.5.10.ebuild delete mode 100644 net-proxy/haproxy/haproxy-1.5.9.ebuild (limited to 'net-proxy') diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog index 4de61939b2f6..4b01c1a9ffd7 100644 --- a/net-proxy/haproxy/ChangeLog +++ b/net-proxy/haproxy/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-proxy/haproxy # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.112 2015/01/07 13:57:12 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.113 2015/01/12 22:12:09 idl0r Exp $ + +*haproxy-1.5.10 (12 Jan 2015) + + 12 Jan 2015; Christian Ruppert -haproxy-1.5.9.ebuild, + +haproxy-1.5.10.ebuild: + Version bump 07 Jan 2015; Pacho Ramos metadata.xml: Reassign and cleanup as discussed at https://www.mail-archive.com/gentoo- diff --git a/net-proxy/haproxy/haproxy-1.5.10.ebuild b/net-proxy/haproxy/haproxy-1.5.10.ebuild new file mode 100644 index 000000000000..bc517953cffe --- /dev/null +++ b/net-proxy/haproxy/haproxy-1.5.10.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.10.ebuild,v 1.1 2015/01/12 22:12:09 idl0r Exp $ + +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 ~ppc ~x86" +IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib" + +DEPEND="pcre? ( dev-libs/libpcre + pcre-jit? ( dev-libs/libpcre[jit] ) + ) + ssl? ( dev-libs/openssl[zlib?] ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup haproxy + enewuser haproxy -1 -1 -1 haproxy +} + +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 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} + + 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 + + newinitd "${FILESDIR}/haproxy.initd-r2" 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 + + dobin 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.5.9.ebuild b/net-proxy/haproxy/haproxy-1.5.9.ebuild deleted file mode 100644 index f41125d766c8..000000000000 --- a/net-proxy/haproxy/haproxy-1.5.9.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.9.ebuild,v 1.1 2014/12/24 13:26:08 idl0r Exp $ - -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 ~ppc ~x86" -IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib" - -DEPEND="pcre? ( dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - ssl? ( dev-libs/openssl[zlib?] ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup haproxy - enewuser haproxy -1 -1 -1 haproxy -} - -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 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} - - 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 - - newinitd "${FILESDIR}/haproxy.initd-r2" 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 - - dobin 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 -} -- cgit v1.2.3-65-gdbad