haproxy: Update to 2.0.5

Message ID 20190903151335.2241-1-michael.tremer@ipfire.org
State Accepted
Commit b58281e0569b4f2abf281b9bab8e4cddbf048503
Headers
Series haproxy: Update to 2.0.5 |

Commit Message

Michael Tremer Sept. 3, 2019, 3:13 p.m. UTC
  This release brings a couple of new features and this
patch enables using the PCRE Jit.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/haproxy | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
  

Patch

diff --git a/lfs/haproxy b/lfs/haproxy
index 8917d30c9..308d96edf 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 1.8.21
+VER        = 2.0.5
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = ""
 
@@ -48,7 +48,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6f86f1272c7daf5ea1d1bae5c9192183
+$(DL_FILE)_MD5 = 497c716adf4b056484601a887f34d152
 
 install : $(TARGET)
 
@@ -82,8 +82,8 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux2628" \
-		USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_REGPARM=1 \
+	cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux-glibc" \
+		USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \
 		ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)"
 
 	cd $(DIR_APP) && make install-bin install-man PREFIX=/usr