update to latest php upstream, finetune module selections

package/php/Makefile

@@ -4,13 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		php
-PKG_VERSION:=		5.3.15
+PKG_VERSION:=		5.4.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7c885c79a611b89f3a1095fce6eae5c6
+PKG_MD5SUM:=		94661b761dcfdfdd5108e8b12e0dd4f8
 PKG_DESCR:=		PHP language interpreter
 PKG_SECTION:=		lang
-PKG_DEPENDS:=		libopenssl zlib libpthread
-PKG_BUILDDEP:=		openssl zlib
+PKG_DEPENDS:=		libpthread librt libgcc
 PHP_URL:=		http://www.php.net/
 PKG_SITES:=		http://de.php.net/distributions/
 PKG_MULTI:=		1
@@ -19,34 +18,46 @@ PKG_SUBPKGS:=		PHP PHP_CLI PHP_FASTCGI
 PKGSD_PHP_FASTCGI:=	PHP for FastCGI usage
 PKGSD_PHP_CLI:=		PHP CLI
 
-#PKG_FLAVOURS_PHP:=	MOD_CURL MOD_GD MOD_GMP MOD_LDAP MOD_MYSQL
-PKG_FLAVOURS_PHP:=	MOD_CURL MOD_GMP MOD_LDAP MOD_MYSQL
-PKG_FLAVOURS_PHP+=	MOD_PGSQL MOD_SQLITE MOD_XML
+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_SQLITE MOD_SOCKETS MOD_XML MOD_ZLIB
 
+PKGFD_MOD_BZ2:=		Bzip2 support
+PKGFB_MOD_BZ2:=		bzip2
+PKGFS_MOD_BZ2:=		bzip2
 PKGFD_MOD_CURL:=	Curl support
 PKGFB_MOD_CURL:=	curl
 PKGFS_MOD_CURL:=	libcurl
-#PKGFD_MOD_GD:=		Gd support
-#PKGFB_MOD_GD:=		libgd libpng
-#PKGFS_MOD_GD:=		libgd libpng
+PKGFD_MOD_FTP:=		FTP support
+PKGFD_MOD_GD:=		Gd support
+PKGFB_MOD_GD:=		libgd libpng jpeg
+PKGFS_MOD_GD:=		libgd libpng libjpeg
 PKGFD_MOD_GMP:=		GMP support
 PKGFB_MOD_GMP:=		gmp
 PKGFS_MOD_GMP:=		libgmp
-PKGFD_MOD_LDAP:=	LDAP support
-PKGFB_MOD_LDAP:=	openldap
-PKGFS_MOD_LDAP:=	libopenldap
+# segfaults php -m
+#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
+PKGFD_MOD_OPENSSL:=	OpenSSL support
+PKGFB_MOD_OPENSSL:=	openssl
+PKGFS_MOD_OPENSSL:=	libopenssl
 PKGFD_MOD_PGSQL:=	PGSQL support
 PKGFB_MOD_PGSQL:=	postgresql
 PKGFS_MOD_PGSQL:=	libpq
+PKGFD_MOD_SESSION:=	Session support
 PKGFD_MOD_SQLITE:=	SQlite support
 PKGFB_MOD_SQLITE:=	sqlite
 PKGFS_MOD_SQLITE:=	libsqlite
+PKGFD_MOD_SOCKETS:=	Socket support
 PKGFD_MOD_XML:=		XML support
 PKGFB_MOD_XML:=		expat
 PKGFS_MOD_XML:=		libexpat
+PKGFD_MOD_ZLIB:=	ZLIB support
+PKGFB_MOD_ZLIB:=	zlib
+PKGFS_MOD_ZLIB:=	zlib
 
 PKG_ARCH_DEPENDS:=	!cris !avr32
 PKG_HOST_DEPENDS:=	!cygwin
@@ -63,25 +74,20 @@ INSTALL_MODS_$${ADK_PACKAGE_${1}}+=    ${2}-install
 
 ${2}-install:
 	${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/php
-	${INSTALL_DATA} $(WRKBUILD)/modules/$(2).so $$(IDIR_$(1))/usr/lib/php
+	for m in ${2}; do \
+		${INSTALL_DATA} $(WRKBUILD)/modules/$$$${m}.so $$(IDIR_$(1))/usr/lib/php ;\
+	done
 endef
 
 PKG_CONFIGURE_OPTS:=	\
 	--with-config-file-path=/etc \
-	--enable-magic-quotes \
-	--enable-ftp=shared \
-	--enable-session=shared \
-	--enable-sockets=shared \
 	--enable-cli \
 	--enable-cgi \
-	--enable-fastcgi \
-	--enable-force-cgi-redirect \
-	--enable-discard-path \
+	--disable-hash \
 	--disable-mbstring \
 	--disable-mbregex \
 	--disable-phar \
 	--disable-libxml \
-	--disable-spl \
 	--disable-short-tags \
 	--disable-ctype \
 	--disable-simplexml \
@@ -92,61 +98,85 @@ PKG_CONFIGURE_OPTS:=	\
 	--disable-xmlreader \
 	--disable-xmlwriter \
 	--disable-dom \
+	--disable-json \
 	--without-pear \
 	--without-gettext \
 	--without-iconv \
 	--without-libxml-dir \
-	--with-kerberos=no \
-	--with-openssl=shared,"$(STAGING_TARGET_DIR)/usr" \
-	--with-openssl-dir="$(STAGING_TARGET_DIR)/usr" \
-	--with-zlib="$(STAGING_TARGET_DIR)/usr" \
-	--with-zlib-dir="$(STAGING_TARGET_DIR)/usr" \
+	--with-pcre-regex=no \
+	--with-kerberos=no
 
+ifneq ($(ADK_PACKAGE_PHP_MOD_BZ2),)
+PKG_CONFIGURE_OPTS+=	--with-bz2=shared,"$(STAGING_TARGET_DIR)/usr"
+else
+PKG_CONFIGURE_OPTS+=	--without-bz2
+endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),)
 PKG_CONFIGURE_OPTS+=	--with-curl=shared,"$(STAGING_TARGET_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+=	--without-curl
 endif
-#ifneq ($(ADK_PACKAGE_PHP_MOD_GD),)
-#PKG_CONFIGURE_OPTS+=	--with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \
-			--without-jpeg-dir \
+ifneq ($(ADK_PACKAGE_PHP_MOD_FTP),)
+PKG_CONFIGURE_OPTS+=	--enable-ftp=shared
+else
+PKG_CONFIGURE_OPTS+=	--disable-ftp
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_GD),)
+PKG_CONFIGURE_OPTS+=	--with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \
 			--with-png-dir="$(STAGING_TARGET_DIR)/usr" \
+			--with-jpeg-dir="$(STAGING_TARGET_DIR)/usr" \
 			--without-freetype-dir \
 			--without-xpm-dir \
 			--without-ttf \
 			--without-t1lib	\
 			--enable-gd-native-ttf \
 			--disable-gd-jis-conv
-#else
+else
 PKG_CONFIGURE_OPTS+=	--without-gd
-#endif
+endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),)
 PKG_CONFIGURE_OPTS+=	--with-gmp=shared,"$(STAGING_TARGET_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+=	--without-gmp
 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
 PKG_CONFIGURE_OPTS+=	--without-mysql
 endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_OPENSSL),)
+PKG_CONFIGURE_OPTS+=	--with-openssl=shared,"$(STAGING_TARGET_DIR)/usr" \
+			--with-openssl-dir="$(STAGING_TARGET_DIR)/usr"
+else
+PKG_CONFIGURE_OPTS+=	--without-openssl
+endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),)
 PKG_CONFIGURE_OPTS+=	--with-pgsql=shared,"$(STAGING_TARGET_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+=	--without-pgsql
 endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_SESSION),)
+PKG_CONFIGURE_OPTS+=	--enable-session=shared
+else
+PKG_CONFIGURE_OPTS+=	--without-session
+endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),)
-PKG_CONFIGURE_OPTS+=	--without-sqlite
+PKG_CONFIGURE_OPTS+=	--with-sqlite3="$(STAGING_TARGET_DIR)/usr"
 PKG_CONFIGURE_OPTS+=	--with-pdo-sqlite=shared,"$(STAGING_TARGET_DIR)/usr"
 PKG_CONFIGURE_OPTS+=	--enable-pdo=shared
 else
-PKG_CONFIGURE_OPTS+=	--without-sqlite
+PKG_CONFIGURE_OPTS+=	--without-sqlite3 --without-pdo-sqlite
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_SOCKETS),)
+PKG_CONFIGURE_OPTS+=	--enable-sockets=shared
+else
+PKG_CONFIGURE_OPTS+=	--without-sockets
 endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_XML),)
 PKG_CONFIGURE_OPTS+=	--enable-xml=shared,"$(STAGING_TARGET_DIR)/usr" \
@@ -154,12 +184,18 @@ PKG_CONFIGURE_OPTS+=	--enable-xml=shared,"$(STAGING_TARGET_DIR)/usr" \
 else
 PKG_CONFIGURE_OPTS+=	--disable-xml
 endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_ZLIB),)
+PKG_CONFIGURE_OPTS+=	--with-zlib=shared,"$(STAGING_TARGET_DIR)/usr"
+else
+PKG_CONFIGURE_OPTS+=	--without-zlib
+endif
 
+$(eval $(call PKG_template,PHP_MOD_BZ2,php-mod-bz2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(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_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}))
@@ -167,19 +203,22 @@ $(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-${PKG_
 $(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_SQLITE,php-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_XML,php-mod-xml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_ZLIB,php-mod-zlib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+$(eval $(call PKG_mod_template,PHP_MOD_BZ2,bz2))
 $(eval $(call PKG_mod_template,PHP_MOD_CURL,curl))
 $(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_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))
 $(eval $(call PKG_mod_template,PHP_MOD_SESSION,session))
 $(eval $(call PKG_mod_template,PHP_MOD_SOCKETS,sockets))
-$(eval $(call PKG_mod_template,PHP_MOD_SQLITE,pdo))
+$(eval $(call PKG_mod_template,PHP_MOD_SQLITE,pdo pdo_sqlite))
 $(eval $(call PKG_mod_template,PHP_MOD_XML,xml))
+$(eval $(call PKG_mod_template,PHP_MOD_ZLIB,zlib))
 
 INSTALL_STYLE:=		manual
 TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/usr/lib/mysql
@@ -190,11 +229,11 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} $(IDIR_PHP)/etc
 	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP)/etc
 	${INSTALL_DIR} $(IDIR_PHP_CLI)/usr/bin
-	${INSTALL_DIR} $(IDIR_PHP_CLI)/etc
-	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc
+	#${INSTALL_DIR} $(IDIR_PHP_CLI)/etc
+	#${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc
 	${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php $(IDIR_PHP_CLI)/usr/bin/php
-	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc
-	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_FASTCGI)/etc
+	#${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc
+	#${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_FASTCGI)/etc
 	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/usr/bin
 	${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi \
 		$(IDIR_PHP_FASTCGI)/usr/bin/php

package/php/files/php-mod-bz2.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=bz2.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-curl.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=curl.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-ftp.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=ftp.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-gd.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=gd.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-gmp.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=gmp.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-ldap.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=ldap.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-mysql.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=mysql.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-openssl.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=openssl.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-pgsql.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=pgsql.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-session.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=session.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-sockets.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=sockets.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-sqlite.postinst

@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=pdo.so" >> $IPKG_INSTROOT/etc/php.ini
+echo "extension=pdo_sqlite.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-xml.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=xml.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php-mod-zlib.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+echo "extension=zlib.so" >> $IPKG_INSTROOT/etc/php.ini

package/php/files/php.ini

@@ -17,8 +17,6 @@ implicit_flush = Off
 unserialize_callback_func=
 serialize_precision = 100
 
-allow_call_time_pass_reference = On
-
 safe_mode = Off
 
 safe_mode_gid = Off