buildprocess: Add extra metadata to pak lfs files

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

diff --git a/lfs/haproxy b/lfs/haproxy
index bc5ef8021a7e0ae8123a0ae5b28a7f49c962951c..1101eeafc4afe43340a0f0b4d3f47d26ce7dc384 100644 (file)
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  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,9 @@
 
 include Config
 
-VER        = 2.1.7
+SUMMARY    = The Reliable, High Performance TCP/HTTP Load Balancer 
+
+VER        = 2.2.4
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,11 +34,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 15
+PAK_VER    = 19
 
 DEPS       =
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
+SERVICES   = haproxy
+
+ifeq "$(BUILD_ARCH)" "riscv64"
        LDFLAGS += -latomic
 endif
 
@@ -48,7 +52,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f0ddf67e2be18cfe1b996f9914cfa67e
+$(DL_FILE)_MD5 = c2717fcff503ef8574cd6395e2ca4d24
 
 install : $(TARGET)
 
@@ -83,7 +87,7 @@ $(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_LUA=1 USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \
+               USE_LUA=1 USE_OPENSSL=1 USE_PCRE2=1 USE_PCRE2_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
@@ -96,7 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                /var/ipfire/backup/addons/includes/haproxy
 
        #install initscripts
-       $(call INSTALL_INITSCRIPT,haproxy)
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
 
        # Logrotate
        -mkdir -pv /etc/logrotate.d