X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fapache2;h=57c344718ae51aadbbf77eb40070c7053d97f1fa;hp=920bccdb4bab9540ee318891162d8ed6e923ecb8;hb=afdf1483887e7c31567ed4469b3b9922d213e295;hpb=2f2b526964081aab5872404691c2c3615e45da12

diff --git a/lfs/apache2 b/lfs/apache2
index 920bccdb4b..57c344718a 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014   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        #
@@ -25,17 +25,14 @@
 
 include Config
 
-VER        = 2.2.15
+VER        = 2.2.29
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(PASS)" "C"
-	TARGET     = $(DIR_INFO)/$(THISAPP)-config
-else
-	TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -47,7 +44,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 = 016cec97337eccead2aad6a7c27f2e14
+$(DL_FILE)_MD5 = 579342fdeaa7b8b68d17fee91f8fab6e
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)
@@ -77,28 +74,6 @@ $(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
 
@@ -133,9 +108,13 @@ else
 	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/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
+
+	# Install apache config
+	cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
+	ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
+
 	@rm -rf $(DIR_APP)
-endif
 	@$(POSTBUILD)