summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2014-08-11 18:15:56 +0000
committerChristian Ruppert <idl0r@gentoo.org>2014-08-11 18:15:56 +0000
commit29ddd63b5583ada8292a6d84a50512698576df59 (patch)
tree554eca2331f8b6d0e5dd78fca8c6a38c85ab15fc /net-proxy/haproxy
parentVersion bump, bug 518956 (diff)
downloadgentoo-2-29ddd63b5583ada8292a6d84a50512698576df59.tar.gz
gentoo-2-29ddd63b5583ada8292a6d84a50512698576df59.tar.bz2
gentoo-2-29ddd63b5583ada8292a6d84a50512698576df59.zip
Revbump - fixes systemd wrapper, bug 517624
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)
Diffstat (limited to 'net-proxy/haproxy')
-rw-r--r--net-proxy/haproxy/ChangeLog8
-rw-r--r--net-proxy/haproxy/haproxy-1.5.2-r1.ebuild (renamed from net-proxy/haproxy/haproxy-1.5.2.ebuild)8
2 files changed, 12 insertions, 4 deletions
diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 25c42e688b30..ee1bd46cf594 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-proxy/haproxy
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.97 2014/07/27 11:33:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.98 2014/08/11 18:15:56 idl0r Exp $
+
+*haproxy-1.5.2-r1 (11 Aug 2014)
+
+ 11 Aug 2014; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.5.2.ebuild,
+ +haproxy-1.5.2-r1.ebuild:
+ Revbump - fixes systemd wrapper, bug 517624
26 Jul 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> haproxy-1.4.25.ebuild:
x86 stable wrt bug #514930
diff --git a/net-proxy/haproxy/haproxy-1.5.2.ebuild b/net-proxy/haproxy/haproxy-1.5.2-r1.ebuild
index 554d7f15864b..bac6d4f9f223 100644
--- a/net-proxy/haproxy/haproxy-1.5.2.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
# 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.2.ebuild,v 1.1 2014/07/12 20:19:31 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.2-r1.ebuild,v 1.1 2014/08/11 18:15:56 idl0r Exp $
EAPI="5"
@@ -30,8 +30,10 @@ pkg_setup() {
}
src_prepare() {
- sed -e 's:@SBINDIR@:'/usr/sbin':' contrib/systemd/haproxy.service.in \
+ 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() {
@@ -91,7 +93,7 @@ src_install() {
dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
doman doc/haproxy.1
- dosbin haproxy-systemd-wrapper
+ dobin haproxy-systemd-wrapper
systemd_dounit contrib/systemd/haproxy.service
if use tools ; then