Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / lfs / haproxy

diff --git a/lfs/haproxy b/lfs/haproxy
index 02e3b25f88ec32ae2ffd1d47c9c4c3521ba7cf13..fcb3199c92c81a160c48dd3305cc7ca7d463db22 100644 (file)
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.8.0
+VER        = 2.2.4
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 3
+PAK_VER    = 17
 
-DEPS       = ""
+DEPS       =
 
 ifeq "$(BUILD_ARCH)" "armv5tel"
        LDFLAGS += -latomic
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6ccea4619b7183fbcc8c98bae1f9823d
+$(DL_FILE)_MD5 = c2717fcff503ef8574cd6395e2ca4d24
 
 install : $(TARGET)
 
@@ -82,9 +82,9 @@ $(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 \
-               ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)"
+       cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux-glibc" \
+               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
 
@@ -98,5 +98,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        #install initscripts
        $(call INSTALL_INITSCRIPT,haproxy)
 
+       # Logrotate
+       -mkdir -pv /etc/logrotate.d
+       install -v -m 644 $(DIR_SRC)/config/haproxy/logrotate \
+               /etc/logrotate.d/haproxy
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)