Three little fixes...

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

diff --git a/config/httpd/conf.d/php5.conf b/config/httpd/conf.d/php5.conf
index 30a7b55e26d5bcc8a32b2866eb89aa32ad71d7b5..ecbcc45a55d457b3a349c65820a9309379085814 100644 (file)
--- a/config/httpd/conf.d/php5.conf
+++ b/config/httpd/conf.d/php5.conf
@@ -1,10 +1,10 @@
-<IfModule php5_module>
-        AddType application/x-httpd-php .php3
-        AddType application/x-httpd-php .php4
-        AddType application/x-httpd-php .php5
-        AddType application/x-httpd-php .php
-        DirectoryIndex index.php3
-        DirectoryIndex index.php4
-        DirectoryIndex index.php5
-        DirectoryIndex index.php
-</IfModule>
+LoadModule php5_module /usr/lib/apache/libphp5.so
+
+AddType application/x-httpd-php .php3
+AddType application/x-httpd-php .php4
+AddType application/x-httpd-php .php5
+AddType application/x-httpd-php .php
+DirectoryIndex index.php3
+DirectoryIndex index.php4
+DirectoryIndex index.php5
+DirectoryIndex index.php

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 47d4b9874ab688448ff36181ee5cb98992e87ea7..0b72836f01fc6771e2e6af715407392afcc43a9c 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -88,7 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(PASS)" ""
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                            --with-dbpath=/var/lib/sasl/sasldb2 \
-                           --with-saslauthd=/var/run
+                           --with-saslauthd=/var/run/saslauthd
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        install -v -m700 -d /var/lib/sasl

diff --git a/lfs/hplip b/lfs/hplip
index 6d4592440eefcb628c15a10ecf45cf312937145b..1f86586371f61e09722007613de6a55b5e093fec 100644 (file)
--- a/lfs/hplip
+++ b/lfs/hplip
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hplip
 PAK_VER    = 1
 
-DEPS       = "foomatic"
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules