X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fapache2;h=94c38c72edbc63a5e0ecec7104e2d89dad5f58ba;hp=2e79faf85fa03bd1845539f6f8f13bd846a6a1e1;hb=8c50adedff4c38e6ac78227440e44551c2057cd5;hpb=90c973a6a7ce2efae9f96d7bde8f7c438ab52602 diff --git a/lfs/apache2 b/lfs/apache2 index 2e79faf85f..94c38c72ed 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,40 +1,41 @@ ############################################################################### -# 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 Michael Tremer & Christian Schmidt # +# # +# 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.2.14 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 +ifeq "$(PASS)" "C" + TARGET = $(DIR_INFO)/$(THISAPP)-config +else + TARGET = $(DIR_INFO)/$(THISAPP) +endif ############################################################################### # Top-level Rules @@ -46,7 +47,7 @@ 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 +$(DL_FILE)_MD5 = a5226203aaf97e5b941c41a71c112704 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 install : $(TARGET) @@ -57,9 +58,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -79,6 +77,28 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) +ifeq "$(PASS)" "C" + # DO THIS IN AN EXTRA STEP BECAUSE PHP AND SUBVERSION WILL FAIL. + + cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf + ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/ + + # Copy all html/cgi-bin files + mkdir -p /srv/web/ipfire/{cgi-bin,html} + mkdir -p /var/updatecache/{download,metadata} + cp -aR $(DIR_SRC)/html/* /srv/web/ipfire + + # Change CONFIG_ROOT in cgi-scripts + for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \ + if [ -f $$i ]; then \ + sed -i "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i; \ + fi; \ + done + chown -R root:root /srv/web/ipfire + chmod -R 755 /srv/web/ipfire/cgi-bin + chmod -R 644 /srv/web/ipfire/html + chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*} +else @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 @@ -93,48 +113,29 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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: /home/httpd" >> $(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: /home/httpd/error" >> $(DIR_APP)/config.layout - echo " iconsdir: /home/httpd/icons" >> $(DIR_APP)/config.layout - echo " htdocsdir: /home/httpd/htdocs" >> $(DIR_APP)/config.layout - echo " manualdir: /home/httpd/manual" >> $(DIR_APP)/config.layout - echo " cgidir: /home/httpd/cgi-bin" >> $(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: /home/httpd" >> $(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 - cd $(DIR_APP) && make + --enable-ssl --enable-mods-shared=all --enable-proxy + 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 - - cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf - ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/ - - # Copy all html/cgi-bin files - mkdir -p /home/httpd/{cgi-bin,html} - cp -aR $(DIR_SRC)/html/* /home/httpd - -find /home/httpd -name .svn -exec rm -rf {} \; - cp $(DIR_DL)/sflogo.png /home/httpd/html/images/ - - # Change CONFIG_ROOT in cgi-scripts - for i in /home/httpd/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \ - if [ -f $$i ]; then \ - sed -i "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i; \ - fi; \ - done - chown -R root:root /home/httpd - chmod -R 755 /home/httpd/cgi-bin - chmod -R 644 /home/httpd/html - chmod 755 /home/httpd/html /home/httpd/html/{index.cgi,redirect.cgi,dial.cgi,images,include} @rm -rf $(DIR_APP) +endif @$(POSTBUILD)