X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fapache2;h=7b5b791d3c35e9f95ce6f58deb36fce2aa4a6b67;hb=b5e9f17b665341a8f11ab85b7978904246908a63;hp=7c5027a0e918d176df30beacad994a975641ffe5;hpb=c268e9f208b25f84a5ef5be0b90841f2166581ae;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/apache2 b/lfs/apache2
index 7c5027a0e9..7b5b791d3c 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.2.6
+VER        = 2.2.17
 
 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 = 9c759a9744436de6a6aa2ddbc49d6e81
+$(DL_FILE)_MD5 = 16eadc59ea6b38af33874d300973202e
 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 \
@@ -101,6 +100,7 @@ ifeq "$(PASS)" "C"
 	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
 
 	### Add IPFire's layout, too
 	echo "# IPFire layout" >> $(DIR_APP)/config.layout
@@ -128,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 \