xz: Update to 5.2.4

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

diff --git a/lfs/apache2 b/lfs/apache2
index 219ef07dd1b4df18503707b2707db35c1a6a832b..69b05341da653962262b55fe7d536d6263f066e2 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014   IPFire Team  <info@ipfire.org>                    #
+# Copyright (C) 2007-2017   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,11 +25,11 @@
 
 include Config
 
-VER        = 2.4.27
+VER        = 2.4.33
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = https://archive.apache.org/dist/httpd
+DL_FROM    = $(URL_IPFIRE)
 
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -41,14 +41,11 @@ DEPS       = "aprutil pcre"
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-       PR61382-Fix.patch
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-PR61382-Fix.patch = ${DL_FROM}/patches/apply_to_2.4.27/PR61382-Fix.patch
 
-$(DL_FILE)_MD5 = 97b6bbfa83c866dbe20ef317e3afd108
-PR61382-Fix.patch_MD5 = 5c1107bb1f399419574d983ce103c99a
+$(DL_FILE)_MD5 = 6ef469d3f16fffeb688bc6e0346823e5
 
 install : $(TARGET)
 
@@ -78,8 +75,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_DL)/PR61382-Fix.patch
-
        ### Add IPFire's layout, too
        echo "# IPFire layout" >> $(DIR_APP)/config.layout
        echo "<Layout IPFire>" >> $(DIR_APP)/config.layout
@@ -120,5 +115,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
        ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
 
+       # Create captive logging directory
+       -mkdir -pv /var/log/httpd/captive
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)