Updated apr, stabilized apache build

- Updated apr to 1.6.5
- Stabilized apache build (rebuild)

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr
index dfde82400596d3029cb5338e63324cad71bd3fae..0fb0d7d37abf6fd038df2cbeb8904b4cd46441e4 100644 (file)
--- a/config/rootfiles/common/apr
+++ b/config/rootfiles/common/apr
@@ -44,7 +44,7 @@ usr/bin/apr-1-config
 #usr/lib/libapr-1.la
 #usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.6.3
+usr/lib/libapr-1.so.0.6.5
 #usr/lib/pkgconfig/apr-1.pc
 #usr/share/apr-1
 #usr/share/apr-1/build

diff --git a/lfs/apache2 b/lfs/apache2
index bedbb7f87424676063950ace4314c4fb619d5ecd..be5ffd9ec638ec5a6c73cac0459570f59113c866 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -101,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        echo "</Layout>" >> $(DIR_APP)/config.layout
 
        cd $(DIR_APP) && ./configure --enable-layout=IPFire \
-                               --enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event
+                               --enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event --disable-lua --disable-md
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        chown -v root:root /usr/lib/apache/httpd.exp \

diff --git a/lfs/apr b/lfs/apr
index e384ab3c07fff350446a15cd555e26e39233a6e1..c5d342d2ca87c02f406b726efaa85e4e305a3bbb 100644 (file)
--- a/lfs/apr
+++ b/lfs/apr
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 1.6.3
+VER        = 1.6.5
 
 THISAPP    = apr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 12f2a349483ad6f12db49ba01fbfdbfa
+$(DL_FILE)_MD5 = ad4add8efdfe87330b88e5e788241775
 
 install : $(TARGET)