net-proxy/haproxy: Version bump to 1.8.1

Package-Manager: Portage-2.3.16, Repoman-2.3.6

3 files changed, 1 insertions, 84 deletions

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index a5314a77b67e..82fd0ce0096d 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,4 +3,4 @@ DIST haproxy-1.5.19.tar.gz 1362834 SHA256 e00ae2a633da614967f2e3ebebdb817ec537cb
 DIST haproxy-1.6.11.tar.gz 1574029 SHA256 62fe982edb102a9f55205792bc14b0d05745cc7993cd6bee5d73cd3c5ae16ace SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434 WHIRLPOOL 4454c51da89bb089579aefcf54093fd4c09b42918e81e41772d263ebc19f243a37b42135a02c4012705e4cc31370f377cf0b429e81707f307cffe9ed23f5183b
 DIST haproxy-1.6.13.tar.gz 1580214 SHA256 7d318583f3a1bf185e857bd40449004b29c95547c89bbb36718f284e29502a1b SHA512 ffed3b347e0cd9cefdc379c91890a3c104d6848b976a9f28984878a9c2d05ca7ddea678f7a93f75cb9d29ae2be921e5a5bd295b1a8771765b099d1c619ded7a3 WHIRLPOOL 70176ee090dacbbdc822c74bba137589f168482c560734c06b98dc23b4d957ed1e016309f11f25a0b486bc6917633455f1174dc6688d6aef53667c61b83a9ff3
 DIST haproxy-1.7.9.tar.gz 1748159 BLAKE2B 6826ad3519ff300fb1c91992014834543f971fade8a8b89956d4cd1fc0000b1b3e259586a21ee9fa8ca0ee1f4520517dfc328d83d7a858f469f0366df6e3da43 SHA512 d1ed791bc9607dbeabcfc6a1853cf258e28b3a079923b63d3bf97504dd59e64a5f5f44f9da968c23c12b4279e8d45ff3bd39418942ca6f00d9d548c9a0ccfd73
-DIST haproxy-1.8.0.tar.gz 2036854 BLAKE2B c7cebcb3e27f61f8fd65e084c8557c6ecbde07a9517c5950330b315cc76a4ced86272ca7b75a292380a867229be5e2b4e65514d4daae276472fa4d6a7919798c SHA512 7461c49cc00e7d6baf08dad9aba77e2b5cbbb532a902131838b0cc670a9ea85232f2da7187c3463c3bb76ca6955e17ce7eeec57378c002aaac3cf1dfbaf6cceb
+DIST haproxy-1.8.1.tar.gz 2038215 BLAKE2B 85365fd581a665ec08eaf799a22cecdb95c59485f4846544aafdce38fce3819778d5adb3a652e9b5560973fef4acd348d13f1d545ccd7abf7c9bc67ce1c82049 SHA512 c59bbd144afae01a3802065bf507dc1ca70f09e7112a9f502474ec6758d3ccab084550372562d2906f1e0b9509464e316ca6f95e3575d7273aba49f350791caa
diff --git a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch b/net-proxy/haproxy/files/haproxy-1.8-contrib.patch
deleted file mode 100644
index a3e336a57734..000000000000
--- a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From c702537864f7e062d18f4ccce3e29d14d4ccf05f Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Thu, 30 Nov 2017 10:11:36 +0100
-Subject: [PATCH] Fix LDFLAGS vs. LIBS re linking order
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- contrib/mod_defender/Makefile | 5 ++---
- contrib/modsecurity/Makefile  | 5 ++---
- contrib/spoa_example/Makefile | 5 ++---
- 3 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile
-index ac17774d..efc7d7f6 100644
---- a/contrib/mod_defender/Makefile
-+++ b/contrib/mod_defender/Makefile
-@@ -28,9 +28,8 @@ EVENT_INC := /usr/include
- endif
-
- CFLAGS  += -g -Wall -pthread
--LDFLAGS += -lpthread  $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
- INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC)
--LIBS =
-+LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
-
- CXXFLAGS = -g -std=gnu++11
- CXXINCS += -I$(MOD_DEFENDER_SRC) -I$(MOD_DEFENDER_SRC)/deps -I$(APACHE2_INC) -I$(APR_INC)
-@@ -43,7 +42,7 @@ CXXSRCS = $(wildcard $(MOD_DEFENDER_SRC)/*.cpp)
- CXXOBJS = $(patsubst %.cpp, %.o, $(CXXSRCS))
-
- defender: $(OBJS) $(CXXOBJS)
--	$(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- install: defender
-	install defender $(DESTDIR)$(BINDIR)
-diff --git a/contrib/modsecurity/Makefile b/contrib/modsecurity/Makefile
-index bb918c30..aa0d6e38 100644
---- a/contrib/modsecurity/Makefile
-+++ b/contrib/modsecurity/Makefile
-@@ -34,14 +34,13 @@ EVENT_INC := /usr/include
- endif
-
- CFLAGS  += -g -Wall -pthread
--LDFLAGS += -lpthread  $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
- INCS += -I../../include -I../../ebtree -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
--LIBS =
-+LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
-
- OBJS = spoa.o modsec_wrapper.o
-
- modsecurity: $(OBJS)
--	$(LD) $(LDFLAGS) $(LIBS) -o $@ $^ $(MODSEC_LIB)/standalone.a
-+	$(LD) $(LDFLAGS) -o $@ $^ $(MODSEC_LIB)/standalone.a $(LIBS)
-
- install: modsecurity
-	install modsecurity $(DESTDIR)$(BINDIR)
-diff --git a/contrib/spoa_example/Makefile b/contrib/spoa_example/Makefile
-index d04a01e1..c44c2b87 100644
---- a/contrib/spoa_example/Makefile
-+++ b/contrib/spoa_example/Makefile
-@@ -6,15 +6,14 @@ CC = gcc
- LD = $(CC)
-
- CFLAGS  = -g -O2 -Wall -Werror -pthread
--LDFLAGS = -lpthread -levent -levent_pthreads
- INCS += -I../../ebtree -I./include
--LIBS =
-+LIBS = -lpthread -levent -levent_pthreads
-
- OBJS = spoa.o
-
-
- spoa: $(OBJS)
--	$(LD) $(LDFLAGS) $(LIBS) -o $@ $^
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- install: spoa
-	install spoa $(DESTDIR)$(BINDIR)
---
-2.13.6
diff --git a/net-proxy/haproxy/haproxy-1.8.0.ebuild b/net-proxy/haproxy/haproxy-1.8.1.ebuild
index 80e41f24b2ab..258b51e7e7d4 100644
--- a/net-proxy/haproxy/haproxy-1.8.0.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.1.ebuild
@@ -50,8 +50,6 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
-version_is_at_least 1.8.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.8-contrib.patch )
 CONTRIBS=( halog iprange )
 # ip6range is present in 1.6, but broken.
 version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )