X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fapache2;h=be5ffd9ec638ec5a6c73cac0459570f59113c866;hb=728f3d2e8f3d26e80154236c6d67e303e1f7f3b9;hp=4f2019551c66497e6a87c7f1fdc79dc682b059db;hpb=7b6b8153b32705869288eac1a3c1b4a1e6435eca;p=ipfire-2.x.git diff --git a/lfs/apache2 b/lfs/apache2 index 4f2019551c..be5ffd9ec6 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,53 +1,51 @@ ############################################################################### -# This file is part of the IPCop Firewall. # # # -# IPCop is free software; you can redistribute it and/or modify # +# IPFire.org - A linux based firewall # +# 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 # -# the Free Software Foundation; either version 2 of the License, or # +# the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # -# IPCop is distributed in the hope that it will be useful, # +# This program is distributed in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # GNU General Public License for more details. # # # # You should have received a copy of the GNU General Public License # -# along with IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # +# along with this program. If not, see . # # # ############################################################################### + ############################################################################### # Definitions ############################################################################### include Config -VER = 2.2.2 +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) -PROG = apache2 -PAK_VER = 1 + +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 = 9c759a9744436de6a6aa2ddbc49d6e81 -httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 +$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084 install : $(TARGET) @@ -57,9 +55,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -80,14 +75,48 @@ $(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 - cd $(DIR_APP) && ./configure --enable-layout=FHS --enable-mods-shared=all - cd $(DIR_APP) && make + ### Add IPFire's layout, too + echo "# IPFire layout" >> $(DIR_APP)/config.layout + echo "" >> $(DIR_APP)/config.layout + echo " prefix: /usr" >> $(DIR_APP)/config.layout + echo " exec_prefix: /usr" >> $(DIR_APP)/config.layout + echo " bindir: /usr/bin" >> $(DIR_APP)/config.layout + echo " sbindir: /usr/sbin" >> $(DIR_APP)/config.layout + echo " libdir: /usr/lib" >> $(DIR_APP)/config.layout + echo " libexecdir: /usr/lib/apache" >> $(DIR_APP)/config.layout + echo " mandir: /usr/share/man" >> $(DIR_APP)/config.layout + echo " sysconfdir: /etc/httpd/conf" >> $(DIR_APP)/config.layout + echo " datadir: /srv/web/ipfire" >> $(DIR_APP)/config.layout + echo " installbuilddir: /usr/lib/apache/build" >> $(DIR_APP)/config.layout + echo " errordir: /srv/web/ipfire/error" >> $(DIR_APP)/config.layout + echo " iconsdir: /srv/web/ipfire/icons" >> $(DIR_APP)/config.layout + echo " htdocsdir: /srv/web/ipfire/htdocs" >> $(DIR_APP)/config.layout + echo " manualdir: /srv/web/ipfire/manual" >> $(DIR_APP)/config.layout + echo " cgidir: /srv/web/ipfire/cgi-bin" >> $(DIR_APP)/config.layout + echo " includedir: /usr/include/apache" >> $(DIR_APP)/config.layout + echo " localstatedir: /srv/web/ipfire" >> $(DIR_APP)/config.layout + echo " runtimedir: /var/run" >> $(DIR_APP)/config.layout + echo " logfiledir: /var/log/httpd" >> $(DIR_APP)/config.layout + echo " proxycachedir: /var/cache/apache/proxy" >> $(DIR_APP)/config.layout + echo "" >> $(DIR_APP)/config.layout + + cd $(DIR_APP) && ./configure --enable-layout=IPFire \ + --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}}.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 + touch /etc/httpd/conf/hostname.conf + + # Create captive logging directory + -mkdir -pv /var/log/httpd/captive + @rm -rf $(DIR_APP) @$(POSTBUILD)