X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fhaproxy;h=7fc639a41f53d3fd51f22124c2c8d73c3e07cd83;hb=a05af852c5f2266151479c9424a9b36243fb1c79;hp=4af22730772d6f7205890048af8b8ed26ed98420;hpb=188c4ba444b31343c29b311fcb2d0c0ba84e80ee;p=ipfire-2.x.git

diff --git a/lfs/haproxy b/lfs/haproxy
index 4af2273077..7fc639a41f 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.5.11
+VER        = 1.8.0
 
 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    = 4
 
 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 = 6ccea4619b7183fbcc8c98bae1f9823d
 
 install : $(TARGET)
 
@@ -91,9 +95,8 @@ $(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)
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)