Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 1f8282ef8557db76e0611f830386e3e0aa5a20ef..749011f26711a25e14aa26747da3a9357b89622d 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -82,6 +82,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
        cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
        cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.in
 

diff --git a/lfs/openldap b/lfs/openldap
index aca5ed75d5539cc0db2612e084334322a75a7d93..b2d3167099547384881aa0e51925fb797983d03c 100644 (file)
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.3.20
+VER        = 2.4.32
 
 THISAPP    = openldap-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -32,12 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = openldap
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
-export CPPFLAGS = -D_GNU_SOURCE
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -46,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 49d2c5b9378a7b57e1fb03948acb8e32
+$(DL_FILE)_MD5 = 6a3e85cf61860ca5e8a1eba6753dd9d0
 
 install : $(TARGET)
 
@@ -79,23 +77,23 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-                           --libexecdir=/usr/sbin \
-                           --sysconfdir=/etc \
-                           --localstatedir=/srv/ldap \
-                           --disable-debug \
-                           --enable-dynamic \
-                           --enable-crypt \
-                           --enable-modules \
-                           --enable-ldap \
-                           --enable-ldbm \
-                           --enable-dyngroup \
-                           --enable-dynlist \
-                           --enable-ppolicy \
-                           --enable-valsort
-       cd $(DIR_APP) && make depend
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --libexecdir=/usr/lib \
+               --sysconfdir=/etc \
+               --localstatedir=/srv/ldap \
+               --with-threads=posix \
+               --disable-perl \
+               --enable-dynamic \
+               --enable-crypt \
+               --enable-modules \
+               --enable-rlookups \
+               --enable-backends=mod \
+               --enable-overlays=mod \
+               --enable-sql=no \
+               --enable-ndb=no \
+               --disable-static
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
-       chmod -v 755 /usr/lib/libl*-2.3.so.0.2.8
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/php b/lfs/php
index 3fcac171724655b22e7534b9889bed3bd1db7a91..f068035e7fab1a5a69c5277eef7170756a77a661 100644 (file)
--- a/lfs/php
+++ b/lfs/php
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3.14
+VER        = 5.3.15
 
 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
 Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
 
-$(DL_FILE)_MD5 = 7caac4f71e2f21426c11ac153e538392
+$(DL_FILE)_MD5 = 5cfcfd0fa4c4da7576f397073e7993cc
 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
 

diff --git a/src/patches/cyrus-sasl-2.1.22-bad-elif.patch b/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
new file mode 100644 (file)
index 0000000..33550c4
--- /dev/null
+++ b/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
@@ -0,0 +1,21 @@
+diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c
+--- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif 2009-01-23 09:40:31.000000000 +0100
++++ cyrus-sasl-2.1.22/plugins/digestmd5.c      2009-02-06 15:20:15.000000000 +0100
+@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv
+       "DIGEST-MD5",                   /* mech_name */
+ #ifdef WITH_RC4
+       128,                            /* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+       112,
+ #else 
+       1,
+@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie
+       "DIGEST-MD5",
+ #ifdef WITH_RC4                               /* mech_name */
+       128,                            /* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+       112,
+ #else
+       1,