X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fhaproxy;h=2cf23526e4f098a303a139697260b6d64c61f1ab;hp=0e5a067f88e1a21a14d203af461cfb36b8b102d1;hb=5a40f7aebb0ba46e83260fda2d198362ae72d3a6;hpb=e804a70256d72c7ad76913bde373f2f97f84c21f

diff --git a/lfs/haproxy b/lfs/haproxy
index 0e5a067f88..2cf23526e4 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-2018  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        = 1.8.14
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,10 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 2
+PAK_VER    = 6
 
 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 = a050bcb90426d1c939b4b0ce3098a8c4
 
 install : $(TARGET)
 
@@ -94,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)