Merge branch 'captive-portal' into next

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

diff --git a/lfs/apache2 b/lfs/apache2
index 1e6f01655daa8d84c44c30b7e0fa390208964399..138ede8de3121f10ceb36872514a5caa2612d3fd 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -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
 
 install : $(TARGET)
 
@@ -78,8 +75,8 @@ $(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
-
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/apache-2.4.27-PR61382-fix.patch
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/apache-2.4.27-CVE-2017-9798-fix.patch
        ### Add IPFire's layout, too
        echo "# IPFire layout" >> $(DIR_APP)/config.layout
        echo "<Layout IPFire>" >> $(DIR_APP)/config.layout
@@ -120,13 +117,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 logdir for captive-portal
-       mkdir -pv /var/log/httpd/captive
-       
-       # Create logodir for captive portal
-       mkdir -pv /srv/web/ipfire/html/captive/logo
-       chown nobody.nobody  /srv/web/ipfire/html/captive/logo
-       chmod 775 /srv/web/ipfire/html/captive/logo
+       # Create captive logging directory
+       -mkdir -pv /var/log/httpd/captive
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)