Merge branch 'master' of git+ssh://openadk.org/git/openadk

4 files changed, 41 insertions, 19 deletions

diff --git a/package/openldap/patches/patch-build_ltmain_sh b/package/openldap/patches/patch-build_ltmain_sh
index 3b48ef1c9..b96b508b6 100644
--- a/package/openldap/patches/patch-build_ltmain_sh
+++ b/package/openldap/patches/patch-build_ltmain_sh
@@ -1,6 +1,6 @@
---- openldap-2.4.25.orig/build/ltmain.sh	2011-01-05 00:49:25.000000000 +0100
-+++ openldap-2.4.25/build/ltmain.sh	2011-03-30 18:26:08.621808325 +0200
-@@ -1668,7 +1672,7 @@ EOF
+--- openldap-2.4.36.orig/build/ltmain.sh	2013-08-16 20:12:59.000000000 +0200
++++ openldap-2.4.36/build/ltmain.sh	2013-10-31 21:12:49.000000000 +0100
+@@ -1668,7 +1668,7 @@ EOF
        # -pg pass through profiling flag for GCC
        # @file GCC response files
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
diff --git a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h b/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h
new file mode 100644
index 000000000..a80083bc2
--- /dev/null
+++ b/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h
@@ -0,0 +1,21 @@
+--- openldap-2.4.36.orig/libraries/librewrite/rewrite-int.h	2013-08-16 20:12:59.000000000 +0200
++++ openldap-2.4.36/libraries/librewrite/rewrite-int.h	2013-11-01 14:30:43.000000000 +0100
+@@ -40,12 +40,18 @@
+ 
+ #include <rewrite.h>
+ 
++/*
++#undef malloc
+ #define malloc(x)	ber_memalloc(x)
++#undef calloc
+ #define calloc(x,y)	ber_memcalloc(x,y)
++#undef realloc
+ #define realloc(x,y)	ber_memrealloc(x,y)
++#undef free
+ #define free(x)	ber_memfree(x)
+ #undef strdup
+ #define	strdup(x)	ber_strdup(x)
++*/
+ 
+ /* Uncomment to use ldap pvt threads */
+ #define USE_REWRITE_LDAP_PVT_THREADS
diff --git a/package/php/Makefile b/package/php/Makefile
index 7742b874b..88d51ceb9 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		php
-PKG_VERSION:=		5.4.19
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		9e7ad2494ba3de519328f74267de8342
+PKG_VERSION:=		5.4.21
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		cc8da0d18683e3a83b332f264af7ca83
 PKG_DESCR:=		PHP language interpreter
 PKG_SECTION:=		lang
 PKG_DEPENDS:=		libpthread librt libgcc
@@ -21,6 +21,7 @@ PKGSD_PHP_CLI:=		PHP CLI
 PKG_FLAVOURS_PHP:=	MOD_BZ2 MOD_CURL MOD_FTP MOD_GD MOD_GMP MOD_MYSQL
 PKG_FLAVOURS_PHP+=	MOD_OPENSSL MOD_PGSQL MOD_SESSION MOD_SNMP MOD_SQLITE 
 PKG_FLAVOURS_PHP+=	MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB MOD_JSON
+PKG_FLAVOURS_PHP+=	MOD_LDAP
 
 PKGFD_MOD_BZ2:=		Bzip2 support
 PKGFB_MOD_BZ2:=		bzip2
@@ -36,10 +37,9 @@ PKGFD_MOD_GMP:=		GMP support
 PKGFB_MOD_GMP:=		gmp
 PKGFS_MOD_GMP:=		libgmp
 PKGFD_MOD_JSON:=	JSON support
-# segfaults php -m
-#PKGFD_MOD_LDAP:=	LDAP support
-#PKGFB_MOD_LDAP:=	openldap
-#PKGFS_MOD_LDAP:=	libopenldap
+PKGFD_MOD_LDAP:=	LDAP support
+PKGFB_MOD_LDAP:=	openldap
+PKGFS_MOD_LDAP:=	libopenldap
 PKGFD_MOD_MYSQL:=	MySQL support
 PKGFS_MOD_MYSQL:=	libmysqlclient
 PKGFB_MOD_MYSQL:=	mysql
@@ -148,12 +148,12 @@ PKG_CONFIGURE_OPTS+=	--enable-json=shared,"$(STAGING_TARGET_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+=	--disable-json
 endif
-#ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),)
-#PKG_CONFIGURE_OPTS+=	--with-ldap=shared,"$(STAGING_TARGET_DIR)/usr" \
-#			--with-ldap-sasl="$(STAGING_TARGET_DIR)/usr"
-#else
+ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),)
+PKG_CONFIGURE_OPTS+=	--with-ldap=shared,"$(STAGING_TARGET_DIR)/usr" \
+			--with-ldap-sasl="$(STAGING_TARGET_DIR)/usr"
+else
 PKG_CONFIGURE_OPTS+=	--without-ldap
-#endif
+endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),)
 PKG_CONFIGURE_OPTS+=	--with-mysql=shared,"$(STAGING_TARGET_DIR)/usr"
 else
@@ -216,7 +216,7 @@ $(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-${PKG_RELEASE}
 $(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_JSON,php-mod-json,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-#$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -234,7 +234,7 @@ $(eval $(call PKG_mod_template,PHP_MOD_FTP,ftp))
 $(eval $(call PKG_mod_template,PHP_MOD_GD,gd))
 $(eval $(call PKG_mod_template,PHP_MOD_GMP,gmp))
 $(eval $(call PKG_mod_template,PHP_MOD_JSON,json))
-#$(eval $(call PKG_mod_template,PHP_MOD_LDAP,ldap))
+$(eval $(call PKG_mod_template,PHP_MOD_LDAP,ldap))
 $(eval $(call PKG_mod_template,PHP_MOD_MYSQL,mysql))
 $(eval $(call PKG_mod_template,PHP_MOD_OPENSSL,openssl))
 $(eval $(call PKG_mod_template,PHP_MOD_PGSQL,pgsql))
diff --git a/package/pkg-config/Makefile b/package/pkg-config/Makefile
index 78d81765e..875e95621 100644
--- a/package/pkg-config/Makefile
+++ b/package/pkg-config/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pkg-config
 PKG_VERSION:=		0.28
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		aa3c86e67551adc3ac865160e34a2a0d
 PKG_DESCR:=		a helper tool used when compiling applications and libraries.
 PKG_SECTION:=		lang
@@ -21,7 +21,8 @@ $(eval $(call HOST_template,PKG_CONFIG,pkg-config,$(PKG_VERSION)-${PKG_RELEASE})
 $(eval $(call PKG_template,PKG_CONFIG,pkg-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 HOST_STYLE:=		auto
-HOST_CONFIGURE_ARGS+=	--with-internal-glib
+HOST_CONFIGURE_ARGS+=	--with-internal-glib \
+			--disable-host-tool
 CONFIGURE_ARGS+=	--with-installed-glib \
 			--with-installed-popt