X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fapache2;h=be5ffd9ec638ec5a6c73cac0459570f59113c866;hb=e37e796206b575d87d652c5c68a96296dbbb8543;hp=57c344718ae51aadbbf77eb40070c7053d97f1fa;hpb=e448795559f316992b336b4304fd1b9b7847c16c;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/lfs/apache2 b/lfs/apache2 index 57c344718a..be5ffd9ec6 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team # +# Copyright (C) 2007-2018 IPFire Team # # # # 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,27 +25,27 @@ include Config -VER = 2.2.29 +VER = 2.4.38 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) + DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +DEPS = "aprutil pcre" + ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) \ - httpd-2.2.2-config-1.patch +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch -$(DL_FILE)_MD5 = 579342fdeaa7b8b68d17fee91f8fab6e -httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 +$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084 install : $(TARGET) @@ -75,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 -Np1 -i $(DIR_DL)/httpd-2.2.2-config-1.patch - ### Add IPFire's layout, too echo "# IPFire layout" >> $(DIR_APP)/config.layout echo "" >> $(DIR_APP)/config.layout @@ -103,18 +101,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) echo "" >> $(DIR_APP)/config.layout cd $(DIR_APP) && ./configure --enable-layout=IPFire \ - --enable-ssl --enable-mods-shared=all --enable-proxy + --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 \ - /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \ - /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \ - /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \ - /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 + /usr/bin/{apxs,dbmmanage} \ + /usr/sbin/apachectl \ + /usr/share/man/man1/{ab,apxs,dbmmanage,ht{dbm,digest,passwd,txt2dbm},logresolve}.1 \ + /usr/share/man/man8/{apachectl,htcacheclean,httpd}.8 \ + /usr/share/man/man8/{rotatelogs,suexec}.8 # Install apache config cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf - ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/ + touch /etc/httpd/conf/hostname.conf + + # Create captive logging directory + -mkdir -pv /var/log/httpd/captive @rm -rf $(DIR_APP) @$(POSTBUILD)