###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2014 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 #
include Config
-VER = 2.4.27
+VER = 2.4.52
THISAPP = httpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
TARGET = $(DIR_INFO)/$(THISAPP)
-DEPS = "aprutil pcre"
+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 = a94ae42b84309d5ef6e613ae825b92fa
install : $(TARGET)
$(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
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 \
# Install apache config
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
+ touch /etc/httpd/conf/hostname.conf
+
+ # Create captive logging directory
+ -mkdir -pv /var/log/httpd/captive
@rm -rf $(DIR_APP)
@$(POSTBUILD)