Fortschritt zur Migration auf Apache2.2

TESTMODUS

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@279 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7f2ba242565d4f285b41317ed51730eac9bf9b55..178ae0b7a0ad167635394084f19fe1256270f936 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,9 @@
 ------------------------------------------------------------------------
+r278 | delaco | 2006-09-13 22:20:37 +0200 (Wed, 13 Sep 2006) | 2 lines
+
+Update:
+  * OutgoingFW - Script hinzugefuegt
+------------------------------------------------------------------------
 r277 | delaco | 2006-09-13 17:30:27 +0200 (Wed, 13 Sep 2006) | 3 lines
 
 Fixes:

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 373d15ce9308a11b682756db13cd80ee86aa02ab..6185026a27253b0dc31046c28017683bbd9ef5ca 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -114,9 +114,7 @@
   * inetutils-1.4.2
   * ipac-ng-1.31
   * ipaddr-1.2
-  * ipfire-logs-2006-09-12-23:48.tgz
-  * ipfire-logs-2006-09-13-13:45.tgz
-  * ipfire-logs-2006-09-13-14:26.tgz
+  * ipfire-logs-2006-09-13-22:31.tgz
   * iproute2-2.4.7-now-ss010824
   * iptables-1.3.5
   * iptraf-3.0.0

diff --git a/lfs/apache2 b/lfs/apache2
index 4f2019551c66497e6a87c7f1fdc79dc682b059db..cb9471e3dac28582914cd990e07405c9be2abfb2 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -81,7 +81,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @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
-       cd $(DIR_APP) && ./configure --enable-layout=FHS --enable-mods-shared=all
+       cd $(DIR_APP) && ./configure --enable-layout=FHS \
+                               --prefix=/home/httpd --exec-prefix=/usr \
+                               --sysconfdir=/etc/httpd/conf \
+                               --includedir=/usr/include/apache --mandir=/usr/share/man \
+                               --localstatedir=/var \
+                               --enable-rewrite --enable-ssl \
+                               --enable-mods-shared=all
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        chown -v root:root /usr/lib/apache/httpd.exp \

diff --git a/make.sh b/make.sh
index a1908d59a47dfb95fc8e743943794a8120fbc699..5d1f285579894fb73dc9d25e55238f20074903e7 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -606,7 +606,7 @@ buildipcop() {
   ipcopmake mysql
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
-  ipcopmake apache
+  #ipcopmake apache
   ipcopmake apache2
   ipcopmake php
   ipcopmake arping