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

Conflicts:
	BUGS
	package/autoconf/Makefile

4 files changed, 42 insertions, 135 deletions

diff --git a/package/php/Config.in b/package/php/Config.in
deleted file mode 100644
index 57ab1f333..000000000
--- a/package/php/Config.in
+++ /dev/null
@@ -1,116 +0,0 @@
-menu "php.............................. PHP Hypertext preprocessor"
-
-config ADK_COMPILE_PHP
-	prompt "php.............................. PHP Hypertext preprocessor"
-	bool
-	default n
-	 
-choice
-prompt "PHP Mode"
-default ADK_PACKAGE_PHP_FASTCGI
-depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_FASTCGI
-	prompt "PHP built for FastCGI"
-	bool 
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	 PHP is a widely-used general-purpose scripting language that is especially 
-	 suited for Web development and can be embedded into HTML.
-	 
-	 http://www.php.net/
-
-endchoice
-
-config ADK_PACKAGE_PHP_MOD_CURL
-	prompt "php-mod-curl..................... cURL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBCURL
-
-config ADK_PACKAGE_PHP_MOD_FTP
-	prompt "php-mod-ftp...................... FTP module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_MOD_GD
-	prompt "php-mod-gd....................... GD graphics library module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBGD
-	select ADK_PACKAGE_LIBPNG
-
-config ADK_PACKAGE_PHP_MOD_GMP
-	prompt "php-mod-gmp...................... GMP module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBGMP
-
-config ADK_PACKAGE_PHP_MOD_LDAP
-	prompt "php-mod-ldap..................... LDAP module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBOPENLDAP
-
-config ADK_PACKAGE_PHP_MOD_MYSQL
-	prompt "php-mod-mysql.................... MySQL module"
-	tristate 
-	default n
-	depends on ADK_CXX
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBMYSQLCLIENT
-
-config ADK_PACKAGE_PHP_MOD_OPENSSL
-	prompt "php-mod-openssl.................. OpenSSL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBOPENSSL
-
-config ADK_PACKAGE_PHP_MOD_PCRE
-	prompt "php-mod-pcre..................... PCRE module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBPCRE
-
-config ADK_PACKAGE_PHP_MOD_PGSQL
-	prompt "php-mod-pgsql.................... PostgreSQL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBPQ
-
-config ADK_PACKAGE_PHP_MOD_SESSION
-	prompt "php-mod-session.................. Sessions module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_MOD_SQLITE
-	prompt "php-mod-sqlite................... SQLite module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBSQLITE
-
-config ADK_PACKAGE_PHP_MOD_SOCKETS
-	prompt "php-mod-sockets.................. Sockets module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_MOD_XML
-	prompt "php-mod-xml...................... XML module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBEXPAT
-
-endmenu
diff --git a/package/php/Makefile b/package/php/Makefile
index 6f3e8aa86..adee72b2d 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -4,23 +4,53 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		php
-PKG_VERSION:=		5.3.0
+PKG_VERSION:=		5.3.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f4905eca4497da3f0beb5c96863196b4
-PKG_DESCR:=		PHP cli
+PKG_MD5SUM:=		4480d7c6d6b4a86de7b8ec8f0c2d1871
+PKG_DESCR:=		PHP CLI
 PKG_SECTION:=		net
+PKG_MULTI:=		1
 PKG_DEPENDS:=		libopenssl zlib
+PKG_BUILDDEP+=		openssl zlib
+ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),)
+PKG_BUILDDEP+=		curl
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_GD),)
+PKG_BUILDDEP+=		libgd libpng
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),)
+PKG_BUILDDEP+=		gmp
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),)
+PKG_BUILDDEP+=		openldap
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),)
+PKG_BUILDDEP+=		mysql
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),)
+PKG_BUILDDEP+=		pcre
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),)
+PKG_BUILDDEP+=		sqlite
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_XML),)
+PKG_BUILDDEP+=		expat
+endif
 PHP_URL:=		http://www.php.net
 PKG_SITES:=		http://de.php.net/distributions/
 
-PKG_DESCR_1:=		PHP for FastCGI usage
+PKG_DESCR_FCGI:=	PHP for FastCGI usage
 
 # FIX PKG_DEPENDS
 
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call PKG_template,PHP,php,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FCGI},${PKG_SECTION}))
 
 define PKG_mod_template
 
@@ -153,20 +183,21 @@ $(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_XML,xml))
 
+INSTALL_STYLE:=		manual
+
 TLDFLAGS+=		-L$(STAGING_DIR)/usr/lib/mysql
 CONFIGURE_ENV+=		LIBS="-ldl"
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	$(PKG_CONFIGURE_OPTS)
-BUILD_STYLE:=		auto
 
 do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
-	${INSTALL_DIR} $(IDIR_PHP_CLI)/etc
-	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc/
+	${INSTALL_DIR} $(IDIR_PHP)/etc
+	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP)/etc/
 	${INSTALL_DIR} $(IDIR_PHP_CLI)/usr/bin
 	${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)/usr/sbin
-	${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi $(IDIR_PHP_FASTCGI)/usr/sbin/php
+	${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi \
+		$(IDIR_PHP_FASTCGI)/usr/sbin/php
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/php/files/php.ini b/package/php/files/php.ini
index ae16d0b61..e6fb3c5fa 100644
--- a/package/php/files/php.ini
+++ b/package/php/files/php.ini
@@ -200,11 +200,6 @@ variables_order = "EGPCS"
 ; to possible security problems, if the code is not very well thought of.
 register_globals = Off
 
-; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-; and friends.  If you're not using them, it's recommended to turn them off,
-; for performance reasons.
-register_long_arrays = On
-
 ; This directive tells PHP whether to declare the argv&argc variables (that
 ; would contain the GET information).  If you don't use these variables, you
 ; should turn it off for increased performance.
@@ -216,9 +211,6 @@ post_max_size = 8M
 ; Magic quotes
 ;
 
-; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = On
-
 ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
 magic_quotes_runtime = Off
 
diff --git a/package/php/files/php.init b/package/php/files/php.init
index 63a91d4c7..3d404ac79 100644
--- a/package/php/files/php.init
+++ b/package/php/files/php.init
@@ -16,7 +16,7 @@ start)
 	php ${php_flags} &
 	;;
 stop)
-	killall php
+	pkill php
 	;;
 restart)
 	sh $0 stop