idl0r 15/05/15 09:34:25 Modified: haproxy-9999.ebuild ChangeLog Added: haproxy-1.4.26.ebuild haproxy-1.5.12.ebuild Removed: haproxy-1.5.10.ebuild Log: Version bumps, bug 549316. Cleanup. (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.4 net-proxy/haproxy/haproxy-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild?r1=1.3&r2=1.4 Index: haproxy-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- haproxy-9999.ebuild 30 Oct 2014 21:37:30 -0000 1.3 +++ haproxy-9999.ebuild 15 May 2015 09:34:25 -0000 1.4 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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-9999.ebuild,v 1.3 2014/10/30 21:37:30 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v 1.4 2015/05/15 09:34:25 idl0r Exp $ EAPI="5" @@ -20,7 +20,7 @@ DEPEND="pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) - ssl? ( dev-libs/openssl[zlib?] ) + ssl? ( dev-libs/openssl:0[zlib?] ) zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND}" 1.115 net-proxy/haproxy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/ChangeLog?rev=1.115&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/ChangeLog?rev=1.115&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/ChangeLog?r1=1.114&r2=1.115 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- ChangeLog 7 Feb 2015 14:59:03 -0000 1.114 +++ ChangeLog 15 May 2015 09:34:25 -0000 1.115 @@ -1,6 +1,13 @@ # 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.114 2015/02/07 14:59:03 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.115 2015/05/15 09:34:25 idl0r Exp $ + +*haproxy-1.5.12 (15 May 2015) +*haproxy-1.4.26 (15 May 2015) + + 15 May 2015; <[email protected]> +haproxy-1.4.26.ebuild, + -haproxy-1.5.10.ebuild, +haproxy-1.5.12.ebuild, haproxy-9999.ebuild: + Version bumps, bug 549316. Cleanup. *haproxy-1.5.11 (07 Feb 2015) 1.1 net-proxy/haproxy/haproxy-1.4.26.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.4.26.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.4.26.ebuild?rev=1.1&content-type=text/plain Index: haproxy-1.4.26.ebuild =================================================================== # 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.4.26.ebuild,v 1.1 2015/05/15 09:34:25 idl0r Exp $ EAPI="5" inherit user versionator toolchain-funcs flag-o-matic 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/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="+crypt examples +pcre vim-syntax" DEPEND="pcre? ( dev-libs/libpcre )" RDEPEND="${DEPEND}" pkg_setup() { enewgroup haproxy enewuser haproxy -1 -1 -1 haproxy } src_compile() { local args="TARGET=linux2628" if use pcre; then args="${args} USE_PCRE=1" else args="${args} USE_PCRE=" 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 # For now, until the strict-aliasing breakage will be fixed # append-cflags -fno-strict-aliasing emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die } src_install() { dobin haproxy || die newinitd "${FILESDIR}/haproxy.initd-r2" haproxy || die # Don't install useless files rm examples/build.cfg doc/*gpl.txt dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt doman doc/haproxy.1 if use examples; then docinto examples dodoc examples/*.cfg || die fi if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax doins examples/haproxy.vim || die 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 } 1.1 net-proxy/haproxy/haproxy-1.5.12.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.5.12.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.5.12.ebuild?rev=1.1&content-type=text/plain Index: haproxy-1.5.12.ebuild =================================================================== # 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.12.ebuild,v 1.1 2015/05/15 09:34:25 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:0[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 }
