]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
haproxy: Update to 2.1.3
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Feb 2020 15:20:55 +0000 (15:20 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 15 Feb 2020 11:04:01 +0000 (11:04 +0000)
This updates haproxy to the latest version.

In addition, support for Lua scripts is compiled in.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
lfs/haproxy

index 308d96edf316f1a90d77e37fa2f21797d6af30ca..fadb084bd77048c55f545f70e9488a402bf49e86 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.5
+VER        = 2.1.3
 
 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    = 12
+PAK_VER    = 13
 
 DEPS       = ""
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 497c716adf4b056484601a887f34d152
+$(DL_FILE)_MD5 = bea4726d8c99f5d9bac0e62906a1f2d0
 
 install : $(TARGET)
 
@@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
        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)"
+               USE_LUA=1 USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \
+               LUA_LIB_NAME="lua" ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)"
 
        cd $(DIR_APP) && make install-bin install-man PREFIX=/usr