Merge branch 'master' into next

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

diff --git a/lfs/apache2 b/lfs/apache2
index d2175e71c9eb808f345eb12271adf86278a62739..11c61580bb976855b7449e7fa89432fbd2bcc3aa 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  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        #
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.4.35
+VER        = 2.4.53
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-DEPS       = "aprutil pcre"
+DEPS       = aprutil pcre
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 30c1cde80ffe814a8d16b4fdffda330a
+$(DL_FILE)_BLAKE2 = 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727
 
 install : $(TARGET)
 
@@ -53,10 +53,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -65,8 +65,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -101,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        echo "</Layout>" >> $(DIR_APP)/config.layout
 
        cd $(DIR_APP) && ./configure --enable-layout=IPFire \
-                               --enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event
+                               --enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event --disable-lua --disable-md
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        chown -v root:root /usr/lib/apache/httpd.exp \