X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fapache2;h=920bccdb4bab9540ee318891162d8ed6e923ecb8;hp=71938e7e02cbb175754c29f3cb6c7a75231a1a8a;hb=f36498f3281c77df67c38508a67042c947ffebd8;hpb=6a99d946e6979fb9c998282faf58719f9a1f125b

diff --git a/lfs/apache2 b/lfs/apache2
index 71938e7e02..920bccdb4b 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.2.6
+VER        = 2.2.15
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,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 = 203bea91715064f0c787f6499d33a377
+$(DL_FILE)_MD5 = 016cec97337eccead2aad6a7c27f2e14
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)
@@ -82,12 +82,11 @@ ifeq "$(PASS)" "C"
 
 	cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
 	ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
-	-find /etc/httpd/conf -name .svn -exec rm -rf {} \;
 
 	# Copy all html/cgi-bin files
-	mkdir -p /srv/web/ipfire/{cgi-bin,html/updatecache/{download,metadata}}
+	mkdir -p /srv/web/ipfire/{cgi-bin,html}
+	mkdir -p /var/updatecache/{download,metadata}
 	cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
-	-find /srv/web/ipfire -name .svn -exec rm -rf {} \;
 
 	# Change CONFIG_ROOT in cgi-scripts
 	for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
@@ -129,7 +128,7 @@ else
 	echo "</Layout>" >> $(DIR_APP)/config.layout
 
 	cd $(DIR_APP) && ./configure --enable-layout=IPFire \
-				--enable-ssl --enable-mods-shared=all
+				--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 \