| 1 |
commit: 2df7fdcc546b4b8d9db9198771fae6f8278324c0 |
| 2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 4 09:08:19 2017 +0000 |
| 4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 4 09:08:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df7fdcc |
| 7 |
|
| 8 |
net-proxy/haproxy: Version bump to 1.8.1 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
net-proxy/haproxy/Manifest | 2 +- |
| 13 |
net-proxy/haproxy/files/haproxy-1.8-contrib.patch | 81 ---------------------- |
| 14 |
.../{haproxy-1.8.0.ebuild => haproxy-1.8.1.ebuild} | 2 - |
| 15 |
3 files changed, 1 insertion(+), 84 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest |
| 18 |
index a5314a77b67..82fd0ce0096 100644 |
| 19 |
--- a/net-proxy/haproxy/Manifest |
| 20 |
+++ b/net-proxy/haproxy/Manifest |
| 21 |
@@ -3,4 +3,4 @@ DIST haproxy-1.5.19.tar.gz 1362834 SHA256 e00ae2a633da614967f2e3ebebdb817ec537cb |
| 22 |
DIST haproxy-1.6.11.tar.gz 1574029 SHA256 62fe982edb102a9f55205792bc14b0d05745cc7993cd6bee5d73cd3c5ae16ace SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434 WHIRLPOOL 4454c51da89bb089579aefcf54093fd4c09b42918e81e41772d263ebc19f243a37b42135a02c4012705e4cc31370f377cf0b429e81707f307cffe9ed23f5183b |
| 23 |
DIST haproxy-1.6.13.tar.gz 1580214 SHA256 7d318583f3a1bf185e857bd40449004b29c95547c89bbb36718f284e29502a1b SHA512 ffed3b347e0cd9cefdc379c91890a3c104d6848b976a9f28984878a9c2d05ca7ddea678f7a93f75cb9d29ae2be921e5a5bd295b1a8771765b099d1c619ded7a3 WHIRLPOOL 70176ee090dacbbdc822c74bba137589f168482c560734c06b98dc23b4d957ed1e016309f11f25a0b486bc6917633455f1174dc6688d6aef53667c61b83a9ff3 |
| 24 |
DIST haproxy-1.7.9.tar.gz 1748159 BLAKE2B 6826ad3519ff300fb1c91992014834543f971fade8a8b89956d4cd1fc0000b1b3e259586a21ee9fa8ca0ee1f4520517dfc328d83d7a858f469f0366df6e3da43 SHA512 d1ed791bc9607dbeabcfc6a1853cf258e28b3a079923b63d3bf97504dd59e64a5f5f44f9da968c23c12b4279e8d45ff3bd39418942ca6f00d9d548c9a0ccfd73 |
| 25 |
-DIST haproxy-1.8.0.tar.gz 2036854 BLAKE2B c7cebcb3e27f61f8fd65e084c8557c6ecbde07a9517c5950330b315cc76a4ced86272ca7b75a292380a867229be5e2b4e65514d4daae276472fa4d6a7919798c SHA512 7461c49cc00e7d6baf08dad9aba77e2b5cbbb532a902131838b0cc670a9ea85232f2da7187c3463c3bb76ca6955e17ce7eeec57378c002aaac3cf1dfbaf6cceb |
| 26 |
+DIST haproxy-1.8.1.tar.gz 2038215 BLAKE2B 85365fd581a665ec08eaf799a22cecdb95c59485f4846544aafdce38fce3819778d5adb3a652e9b5560973fef4acd348d13f1d545ccd7abf7c9bc67ce1c82049 SHA512 c59bbd144afae01a3802065bf507dc1ca70f09e7112a9f502474ec6758d3ccab084550372562d2906f1e0b9509464e316ca6f95e3575d7273aba49f350791caa |
| 27 |
|
| 28 |
diff --git a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch b/net-proxy/haproxy/files/haproxy-1.8-contrib.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index a3e336a5773..00000000000 |
| 31 |
--- a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,81 +0,0 @@ |
| 34 |
-From c702537864f7e062d18f4ccce3e29d14d4ccf05f Mon Sep 17 00:00:00 2001 |
| 35 |
-From: Christian Ruppert <idl0r@g.o> |
| 36 |
-Date: Thu, 30 Nov 2017 10:11:36 +0100 |
| 37 |
-Subject: [PATCH] Fix LDFLAGS vs. LIBS re linking order |
| 38 |
- |
| 39 |
-Signed-off-by: Christian Ruppert <idl0r@g.o> |
| 40 |
---- |
| 41 |
- contrib/mod_defender/Makefile | 5 ++--- |
| 42 |
- contrib/modsecurity/Makefile | 5 ++--- |
| 43 |
- contrib/spoa_example/Makefile | 5 ++--- |
| 44 |
- 3 files changed, 6 insertions(+), 9 deletions(-) |
| 45 |
- |
| 46 |
-diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile |
| 47 |
-index ac17774d..efc7d7f6 100644 |
| 48 |
---- a/contrib/mod_defender/Makefile |
| 49 |
-+++ b/contrib/mod_defender/Makefile |
| 50 |
-@@ -28,9 +28,8 @@ EVENT_INC := /usr/include |
| 51 |
- endif |
| 52 |
- |
| 53 |
- CFLAGS += -g -Wall -pthread |
| 54 |
--LDFLAGS += -lpthread $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm |
| 55 |
- INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC) |
| 56 |
--LIBS = |
| 57 |
-+LIBS += -lpthread $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm |
| 58 |
- |
| 59 |
- CXXFLAGS = -g -std=gnu++11 |
| 60 |
- CXXINCS += -I$(MOD_DEFENDER_SRC) -I$(MOD_DEFENDER_SRC)/deps -I$(APACHE2_INC) -I$(APR_INC) |
| 61 |
-@@ -43,7 +42,7 @@ CXXSRCS = $(wildcard $(MOD_DEFENDER_SRC)/*.cpp) |
| 62 |
- CXXOBJS = $(patsubst %.cpp, %.o, $(CXXSRCS)) |
| 63 |
- |
| 64 |
- defender: $(OBJS) $(CXXOBJS) |
| 65 |
-- $(LD) -o $@ $^ $(LDFLAGS) $(LIBS) |
| 66 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 67 |
- |
| 68 |
- install: defender |
| 69 |
- install defender $(DESTDIR)$(BINDIR) |
| 70 |
-diff --git a/contrib/modsecurity/Makefile b/contrib/modsecurity/Makefile |
| 71 |
-index bb918c30..aa0d6e38 100644 |
| 72 |
---- a/contrib/modsecurity/Makefile |
| 73 |
-+++ b/contrib/modsecurity/Makefile |
| 74 |
-@@ -34,14 +34,13 @@ EVENT_INC := /usr/include |
| 75 |
- endif |
| 76 |
- |
| 77 |
- CFLAGS += -g -Wall -pthread |
| 78 |
--LDFLAGS += -lpthread $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl |
| 79 |
- INCS += -I../../include -I../../ebtree -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC) |
| 80 |
--LIBS = |
| 81 |
-+LIBS += -lpthread $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl |
| 82 |
- |
| 83 |
- OBJS = spoa.o modsec_wrapper.o |
| 84 |
- |
| 85 |
- modsecurity: $(OBJS) |
| 86 |
-- $(LD) $(LDFLAGS) $(LIBS) -o $@ $^ $(MODSEC_LIB)/standalone.a |
| 87 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(MODSEC_LIB)/standalone.a $(LIBS) |
| 88 |
- |
| 89 |
- install: modsecurity |
| 90 |
- install modsecurity $(DESTDIR)$(BINDIR) |
| 91 |
-diff --git a/contrib/spoa_example/Makefile b/contrib/spoa_example/Makefile |
| 92 |
-index d04a01e1..c44c2b87 100644 |
| 93 |
---- a/contrib/spoa_example/Makefile |
| 94 |
-+++ b/contrib/spoa_example/Makefile |
| 95 |
-@@ -6,15 +6,14 @@ CC = gcc |
| 96 |
- LD = $(CC) |
| 97 |
- |
| 98 |
- CFLAGS = -g -O2 -Wall -Werror -pthread |
| 99 |
--LDFLAGS = -lpthread -levent -levent_pthreads |
| 100 |
- INCS += -I../../ebtree -I./include |
| 101 |
--LIBS = |
| 102 |
-+LIBS = -lpthread -levent -levent_pthreads |
| 103 |
- |
| 104 |
- OBJS = spoa.o |
| 105 |
- |
| 106 |
- |
| 107 |
- spoa: $(OBJS) |
| 108 |
-- $(LD) $(LDFLAGS) $(LIBS) -o $@ $^ |
| 109 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 110 |
- |
| 111 |
- install: spoa |
| 112 |
- install spoa $(DESTDIR)$(BINDIR) |
| 113 |
--- |
| 114 |
-2.13.6 |
| 115 |
|
| 116 |
diff --git a/net-proxy/haproxy/haproxy-1.8.0.ebuild b/net-proxy/haproxy/haproxy-1.8.1.ebuild |
| 117 |
similarity index 96% |
| 118 |
rename from net-proxy/haproxy/haproxy-1.8.0.ebuild |
| 119 |
rename to net-proxy/haproxy/haproxy-1.8.1.ebuild |
| 120 |
index 80e41f24b2a..258b51e7e7d 100644 |
| 121 |
--- a/net-proxy/haproxy/haproxy-1.8.0.ebuild |
| 122 |
+++ b/net-proxy/haproxy/haproxy-1.8.1.ebuild |
| 123 |
@@ -50,8 +50,6 @@ RDEPEND="${DEPEND}" |
| 124 |
S="${WORKDIR}/${MY_P}" |
| 125 |
|
| 126 |
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) |
| 127 |
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch ) |
| 128 |
-version_is_at_least 1.8.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.8-contrib.patch ) |
| 129 |
CONTRIBS=( halog iprange ) |
| 130 |
# ip6range is present in 1.6, but broken. |
| 131 |
version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop ) |
Archives