suricata: Change midstream policy to "pass-flow"

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

diff --git a/lfs/haproxy b/lfs/haproxy
index 9a54095a84c2037a1fbecee40e96aeaa71e0cac5..bae1a7b165009d79bc96828af9d2f9d4a2118c77 100644 (file)
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  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,11 @@
 
 include Config
 
-VER        = 1.8.0
+SUMMARY    = The Reliable, High Performance TCP/HTTP Load Balancer
+
+VER        = 2.9.2
+
+# From: https://www.haproxy.org/download/2.9/src/haproxy-2.9.2.tar.gz
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,11 +36,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 4
+PAK_VER    = 29
 
-DEPS       = ""
+DEPS       =
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
+SERVICES   = haproxy
+
+ifeq "$(BUILD_ARCH)" "riscv64"
        LDFLAGS += -latomic
 endif
 
@@ -48,7 +54,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6ccea4619b7183fbcc8c98bae1f9823d
+$(DL_FILE)_BLAKE2 = 257a594fdb18e50c99e4256aa364d2ea55b56e39bfda0435c921927939a09231be5ae2bd7f39e23286febb343fa0dca5fc33f9b279461c5083050898390b21db
 
 install : $(TARGET)
 
@@ -56,13 +62,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 dist:
        @$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -71,8 +77,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -82,9 +88,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_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 +102,12 @@ $(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
+       install -v -m 644 $(DIR_SRC)/config/haproxy/logrotate \
+               /etc/logrotate.d/haproxy
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)