From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 16 Sep 2011 17:46:03 +0000 (+0200)
Subject: apache2: update to 2.2.21.
X-Git-Tag: v2.9-core53~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=736d1ed96ec00bafb3635f67673796151de02774;p=people%2Fstevee%2Fipfire-2.x.git

apache2: update to 2.2.21.
---

diff --git a/config/rootfiles/core/53/filelists/apache2 b/config/rootfiles/core/53/filelists/apache2
new file mode 120000
index 0000000000..eef95efa72
--- /dev/null
+++ b/config/rootfiles/core/53/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh
index 10b45b98e8..fbf19954a8 100644
--- a/config/rootfiles/core/53/update.sh
+++ b/config/rootfiles/core/53/update.sh
@@ -36,6 +36,7 @@ done
 #Stop services
 
 /etc/init.d/ipsec stop
+/etc/init.d/apache stop
 
 #
 # Remove old strongswan libs
@@ -65,6 +66,7 @@ sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_r
 #
 #Start services
 
+/etc/init.d/apache start
 if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
 	/etc/init.d/ipsec start
 fi
diff --git a/lfs/apache2 b/lfs/apache2
index c5fd754291..f548271c5f 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.2.20
+VER        = 2.2.21
 
 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 = 1ac251431c8c4285f6b085c1d156bb56
+$(DL_FILE)_MD5 = 1696ae62cd879ab1d4dd9ff021a470f2
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)