commit 6c35df55cd96887a42076944f276b032d2279a3f Author: Juergen Daubert <jue@jue.li> Date: Mon Feb 25 13:00:36 2013 +0100 [notify] php: update to 5.4.12 besides the version bump this release of opt/php* introduces some changes which might require extra attention: - sqlite3 is no longer a build-in driver but can be found in opt/php-sqlite3 now - the mbstring extension is now part of opt/php, the contrib port php-mbstring is no longer required and will be removed - opt/php-mysql includes the native and the PDO driver for mysql, the contrib port php-pdo-mysql is no longer required and will be removed diff --git a/php/.footprint b/php/.footprint index 20f45b8..2899583 100644 --- a/php/.footprint +++ b/php/.footprint @@ -132,6 +132,30 @@ drwxr-xr-x root/root usr/include/php/ext/json/ -rw-r--r-- root/root usr/include/php/ext/json/php_json.h drwxr-xr-x root/root usr/include/php/ext/libxml/ -rw-r--r-- root/root usr/include/php/ext/libxml/php_libxml.h +drwxr-xr-x root/root usr/include/php/ext/mbstring/ +drwxr-xr-x root/root usr/include/php/ext/mbstring/libmbfl/ +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/config.h +drwxr-xr-x root/root usr/include/php/ext/mbstring/libmbfl/mbfl/ +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/eaw_table.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/mbstring.h +drwxr-xr-x root/root usr/include/php/ext/mbstring/oniguruma/ +-rw-r--r-- root/root usr/include/php/ext/mbstring/oniguruma/oniguruma.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/php_mbregex.h +-rw-r--r-- root/root usr/include/php/ext/mbstring/php_onig_compat.h drwxr-xr-x root/root usr/include/php/ext/pcre/ -rw-r--r-- root/root usr/include/php/ext/pcre/php_pcre.h drwxr-xr-x root/root usr/include/php/ext/pdo/ @@ -153,9 +177,6 @@ drwxr-xr-x root/root usr/include/php/ext/spl/ -rw-r--r-- root/root usr/include/php/ext/spl/spl_heap.h -rw-r--r-- root/root usr/include/php/ext/spl/spl_iterators.h -rw-r--r-- root/root usr/include/php/ext/spl/spl_observer.h -drwxr-xr-x root/root usr/include/php/ext/sqlite3/ -drwxr-xr-x root/root usr/include/php/ext/sqlite3/libsqlite/ --rw-r--r-- root/root usr/include/php/ext/sqlite3/libsqlite/sqlite3.h drwxr-xr-x root/root usr/include/php/ext/standard/ -rw-r--r-- root/root usr/include/php/ext/standard/base64.h -rw-r--r-- root/root usr/include/php/ext/standard/basic_functions.h @@ -283,6 +304,7 @@ drwxr-xr-x root/root usr/lib/php/extensions/ -rwxr-xr-x root/root usr/lib/php/extensions/bz2.so -rwxr-xr-x root/root usr/lib/php/extensions/curl.so -rwxr-xr-x root/root usr/lib/php/extensions/dba.so +-rwxr-xr-x root/root usr/lib/php/extensions/mbstring.so -rwxr-xr-x root/root usr/lib/php/extensions/openssl.so -rwxr-xr-x root/root usr/lib/php/extensions/zip.so drwxr-xr-x root/root usr/man/ diff --git a/php/.md5sum b/php/.md5sum index a7fbcae..0c63e85 100644 --- a/php/.md5sum +++ b/php/.md5sum @@ -1,2 +1,2 @@ -683de3db60200bc38aa6e154aa925fa6 extensions.ini -9975e68c22b86b013b934743ad2d2276 php-5.4.11.tar.bz2 +65690a2a454c5f5d934cb04b070219ea extensions.ini +5c7b614242ae12e9cacca21c8ab84818 php-5.4.12.tar.bz2 diff --git a/php/Pkgfile b/php/Pkgfile index 8159315..9e82a6d 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -1,10 +1,10 @@ # Description: PHP interpreter, extension modules and support stuff # URL: http://www.php.net # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: ncurses readline libpcre libxml2 curl db gdbm zip +# Depends on: readline libpcre libxml2 curl db gdbm zip name=php -version=5.4.11 +version=5.4.12 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2 extensions.ini) @@ -18,14 +18,17 @@ build () { --with-config-file-scan-dir=/etc/php/conf.d \ --with-zlib \ --with-pcre-regex=/usr \ - --disable-static --disable-debug --without-pear" + --disable-static --disable-debug \ + --without-sqlite3 --without-pdo-sqlite \ + --without-pear" local PHP_SHARED=" --enable-dba=shared --with-gdbm --with-db4 \ --with-bz2=shared \ --with-curl=shared \ --with-openssl=shared \ - --enable-zip=shared" + --enable-zip=shared \ + --enable-mbstring=shared" EXTENSION_DIR=/usr/lib/php/extensions \ ./configure \ @@ -42,5 +45,8 @@ build () { sed -i '/^extension_dir/s|=.*$|= "/usr/lib/php/extensions"|' php.ini-* install -d $PKG/etc/php/conf.d install -m 644 php.ini-* $PKG/etc/php - install -m 644 $SRC/extensions.ini $PKG/etc/php/conf.d + + # order matters ! + printf 'extension=%s\n' {zip,bz2,curl,openssl,dba,mbstring}.so \ + > $PKG/etc/php/conf.d/extensions.ini } diff --git a/php/extensions.ini b/php/extensions.ini deleted file mode 100644 index bbc81a8..0000000 --- a/php/extensions.ini +++ /dev/null @@ -1,10 +0,0 @@ -; -; /etc/php/conf.d/extensions.ini -; - -extension=bz2.so -extension=curl.so -extension=dba.so -extension=openssl.so -extension=zip.so -