X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fhaproxy;h=bc5ef8021a7e0ae8123a0ae5b28a7f49c962951c;hb=af7f9fc43d84cdce163a699992d8cf3ff74817dc;hp=4af22730772d6f7205890048af8b8ed26ed98420;hpb=15847a8001e5adda6bf253f3c329fce11d5a05b1;p=ipfire-2.x.git

diff --git a/lfs/haproxy b/lfs/haproxy
index 4af2273077..bc5ef8021a 100644
--- 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.5.11
+VER        = 2.1.7
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 2
+PAK_VER    = 15
 
-DEPS       = ""
+DEPS       =
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+	LDFLAGS += -latomic
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5500a79d0d2b238d4a1e9749bd0c2cb2
+$(DL_FILE)_MD5 = f0ddf67e2be18cfe1b996f9914cfa67e
 
 install : $(TARGET)
 
@@ -78,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
 
@@ -91,9 +95,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/haproxy \
 		/var/ipfire/backup/addons/includes/haproxy
 
-	# Restore initscript
-	install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/haproxy \
-		/etc/rc.d/init.d/haproxy
+	#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)