commit php5 for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package php5 for openSUSE:Factory checked in at 2013-03-26 07:01:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5 (Old)
and /work/SRC/openSUSE:Factory/.php5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5", Maintainer is "PGajdos@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5/php5.changes 2013-03-08 11:20:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2013-03-26 07:01:11.000000000 +0100
@@ -1,0 +2,77 @@
+Thu Mar 21 11:58:40 UTC 2013 - pgajdos@suse.com
+
+- updated to 5.4.13:
+ Core:
+ Fixed bug #64235 (Insteadof not work for class method in 5.4.11).
+ Implemented FR #64175 (Added HTTP codes as of RFC 6585).
+ Fixed bug #64142 (dval to lval different behavior on ppc64).
+ Fixed bug #64070 (Inheritance with Traits failed with error).
+ CLI server:
+ Fixed bug #64128 (buit-in web server is broken on ppc64).
+ Mbstring:
+ mb_split() can now handle empty matches like preg_split() does.
+ OpenSSL:
+ Fixed bug #61930 (openssl corrupts ssl key resource when using openssl_get_publickey()).
+ PDO_mysql:
+ Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs).
+ Phar:
+ Fixed timestamp update on Phar contents modification.
+ SOAP
+ Added check that soap.wsdl_cache_dir conforms to open_basedir (CVE-2013-1635).
+ Disabled external entities loading (CVE-2013-1643, CVE-2013-1824).
+ SPL:
+ Fixed bug #64264 (SPLFixedArray toArray problem).
+ Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
+ Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended).
+ Fixed bug #52861 (unset fails with ArrayObject and deep arrays).
+ SNMP:
+ Fixed bug #64124 (IPv6 malformed).
+
+-------------------------------------------------------------------
+Thu Mar 21 09:27:28 UTC 2013 - pgajdos@suse.com
+
+- updated to 5.4.12:
+ * dropped sqlite.so (no longer shipped with 5.4)
+ * dropped t1lib support
+ * dropped %{suse_version} 10.x support
+ * see /usr/share/doc/packages/php5/UPGRADING or
+ http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/UPGRADING
+ for details
+ * source changes:
+ D php-5.2.9-BNC-457056.patch -- renamed to php5-BNC-457056.patch
+ D php-5.3.0-bnc513080.patch -- there's no relevant code in exif.c
+ D php-5.3.1-systzdata-v7.patch -- renamed to php5-systzdata-v7.patch
+ D php-5.3.2-aconf26x.patch -- dropped, it is not needed yet
+ D php-5.3.2-ini.patch -- renamed to php5-ini.patch
+ D php-5.3.2-no-build-date.patch -- renamed to php5-no-build-date.patch
+ D php-5.3.22.tar.bz2 -- old tarball
+ D php-5.3.4-format-string-issues.patch -- renamed to php5-format-string-issues.patch
+ D php-5.3.4-pts.patch -- renamed to php5-pts.patch
+ D php-5.3.6-gcc_builtins.patch -- renamed to php5-gcc_builtins.patch
+ D php-5.3.6-ini-date.timezone.patch -- part of php5-ini.patch
+ D php-5.3.8-CVE-2011-4153.patch -- fixed in 5.4 branch
+ D php-5.3.8-crypt-tests.patch -- renamed to php5-crypt-tests.patch
+ D php-5.3.8-no-reentrant-crypt.patch -- renamed to php5-no-reentrant-crypt.patch
+ A php-5.4.13.tar.bz2 -- new version tarball
+ D php-cloexec.patch -- renamed to php5-cloexec.patch
+ M php-suse-addons.tar.bz2 -- content of tar balls are actualy equal
+ A php5-BNC-457056.patch -- renamed from php-5.2.9-BNC-457056.patch, not rebased
+ A php5-cloexec.patch -- renamed from php-cloexec.patch, rebased
+ A php5-sytzdata-v7.patch -- renamed from sytzdata-v7.pach, not rebased
+ A php-format-string-issues.patch -- renamed from php5-5.3.4-format-string-issues.patch, not rebased
+ A php5-crypt-tests.patch -- renamed from php-5.3.8-crypt-tests.patch, not rebased
+ A php5-gcc_builtins.patch -- renamed from php-5.3.6-gcc_builtins.patch, not rebased
+ A php5-ini.patch -- renamed from php-5.3.2-ini.patch, rebased
+ A php5-mbstring-missing-return.patch -- new patch, missing return
+ M php5-missing-extdeps.patch -- rebased
+ A php5-no-build-date.patch -- renamed from php-5.3.2-no-build-date.patch, rebased
+ A php5-no-reentrant-crypt.patch -- renamed from php-5.3.8-no-reentrant-crypt.patch, not rebased
+ M php5-openssl.patch -- rebased
+ M php5-phpize.patch -- rebased
+ A php5-pts.patch -- renamed from php-5.3.4-pts.patch, not rebased
+ A php5-suhosin-php54.patch -- patch on top of suhosin-0.9.33.tgz to work with php 5.4
+ M php5.changes -- this change log
+ M php5.spec -- new version, etc
+ D suhosin-patch-5.3.3-0.9.10.patch.gz -- dropped, seems not be used for some time
+
+-------------------------------------------------------------------
Old:
----
php-5.2.9-BNC-457056.patch
php-5.3.0-bnc513080.patch
php-5.3.1-systzdata-v7.patch
php-5.3.2-aconf26x.patch
php-5.3.2-ini.patch
php-5.3.2-no-build-date.patch
php-5.3.22.tar.bz2
php-5.3.4-format-string-issues.patch
php-5.3.4-pts.patch
php-5.3.6-gcc_builtins.patch
php-5.3.6-ini-date.timezone.patch
php-5.3.8-CVE-2011-4153.patch
php-5.3.8-crypt-tests.patch
php-5.3.8-no-reentrant-crypt.patch
php-cloexec.patch
suhosin-patch-5.3.3-0.9.10.patch.gz
New:
----
php-5.4.13.tar.bz2
php5-BNC-457056.patch
php5-cloexec.patch
php5-crypt-tests.patch
php5-format-string-issues.patch
php5-gcc_builtins.patch
php5-ini.patch
php5-mbstring-missing-return.patch
php5-no-build-date.patch
php5-no-reentrant-crypt.patch
php5-pts.patch
php5-suhosin-php54.patch
php5-systzdata-v7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.SQLBfU/_old 2013-03-26 07:01:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SQLBfU/_new 2013-03-26 07:01:14.000000000 +0100
@@ -17,11 +17,9 @@
Name: php5
-%global apiver 20090626
-%global zendver 20090626
+%global apiver 20100412
+%global zendver 20100525
%define suhosin_version 0.9.33
-%define suhosin_patch_version 0.9.10
-%define with_suhosin_patch 0
%define pkg_name php5
%define with_spell 1
@@ -59,35 +57,22 @@
%if 0%{suse_version} > 1110
BuildRequires: freetds-devel
%endif
-#BuildRequires: mysql-devel
%if %{with_spell}
BuildRequires: aspell-devel
%endif
-%if 0%{?suse_version} > 1000
# I would like this to become a hard dependency, as PHP is
# documented to have this modules by default (no addtional libs are needed)
Recommends: php-ctype php-dom php-iconv php-sqlite php-tokenizer
Recommends: php-xmlreader php-xmlwriter php-json
# other highly reccommended extensions
Suggests: php-mbstring php-gd php-pear php-gettext php-mysql php-suhosin
-%else
-BuildRequires: libgcrypt-devel
-BuildRequires: libjpeg
-BuildRequires: rpm-devel
-%endif
BuildRequires: libedit-devel
BuildRequires: libjpeg-devel
BuildRequires: pcre-devel
BuildRequires: re2c
-BuildRequires: sqlite-devel
-BuildRequires: sqlite2-devel
-BuildRequires: t1lib-devel
+BuildRequires: sqlite3-devel
#10.3 does not install sendmail binary with the minimal system
Requires: smtp_daemon
-%if 0%{?suse_version} < 1100
-#10 requires tcpd-devel to build
-BuildRequires: tcpd-devel
-%endif
%define extension_dir %{_libdir}/%{pkg_name}/extensions
%define peardir %{_datadir}/%{pkg_name}/PEAR
%define php_sysconf %{_sysconfdir}/%{pkg_name}
@@ -101,12 +86,8 @@
%define apache2_sysconfdir %(%{apxs2} -q SYSCONFDIR)
%define apache2_includedir %(%{apxs2} -q INCLUDEDIR)
%define apache2_serverroot %(%{apxs2} -q PREFIX)
-%define need_libxml2_hack %(if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h;then echo 1; else echo 0; fi)
-#unfortunately at this stage we dont have a working PHP binary..
-#define builtin_tz_ver 2007.9
-###
-###
-Version: 5.3.22
+%define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h;then echo 1; else echo 0; fi; else echo 0; fi)
+Version: 5.4.13
Release: 0
Provides: php
Provides: php-api = %{apiver}
@@ -145,31 +126,23 @@
Source7: install-pear-nozlib.phar
Source8: php-fpm.init
#SUSE specific stuff
-Patch2: php5-phpize.patch
-Patch3: php5-apache_sapi_install.patch
-Patch4: php5-php-config.patch
-#currently disabled, on purpose !
-%if %{with_suhosin_patch}
-Patch6: suhosin-patch-5.3.3-%{suhosin_patch_version}.patch.gz
-%endif
-Patch7: php-5.3.1-systzdata-v7.patch
+Patch0: php5-phpize.patch
+Patch1: php5-apache_sapi_install.patch
+Patch2: php5-php-config.patch
+Patch3: php5-ini.patch
+Patch4: php5-no-build-date.patch
+Patch5: php5-pts.patch
+Patch6: php5-openssl.patch
+Patch7: php5-systzdata-v7.patch
#bugs
-Patch13: php-5.2.9-BNC-457056.patch
-Patch19: php-5.3.0-bnc513080.patch
-Patch20: php-5.3.2-ini.patch
-# PATCH-FIX-UPSTREAM php5-autoconf-2.65.patch http://bugs.php.ney/bug.php?id=50291 dimstar@opensuse.org -- Build fails with autoconf > 2.63
-# Modified to work with PHP 5.3.7 release
-Patch22: php-5.3.2-aconf26x.patch
-Patch24: php-5.3.2-no-build-date.patch
-Patch25: php-cloexec.patch
-Patch26: php-5.3.4-pts.patch
-Patch27: php-5.3.4-format-string-issues.patch
-Patch29: php5-openssl.patch
-Patch30: php-5.3.6-ini-date.timezone.patch
-Patch31: php5-missing-extdeps.patch
+Patch10: php5-suhosin-php54.patch
+Patch11: php5-mbstring-missing-return.patch
+Patch12: php5-BNC-457056.patch
+Patch13: php5-cloexec.patch
+Patch14: php5-missing-extdeps.patch
%if 0%{suse_version} > 1120
%ifarch x86_64
-Patch33: php-5.3.6-gcc_builtins.patch
+Patch15: php5-gcc_builtins.patch
%endif
%endif
# following patch is to fix configure tests for crypt; the aim is to have php
@@ -177,11 +150,10 @@
# DES, so as soon as upstream fixes this, don't forgot to remove extended DES
# from their checking as I indicated in crypt-tests.patch yet, or php will
# silently use his own implementation again
-Patch36: php-5.3.8-crypt-tests.patch
+Patch16: php5-crypt-tests.patch
# related to previous patch; !(defined(_REENTRANT) || defined(_THREAD_SAFE))
-Patch37: php-5.3.8-no-reentrant-crypt.patch
-# following is fixed in 5.4 branch
-Patch38: php-5.3.8-CVE-2011-4153.patch
+Patch17: php5-no-reentrant-crypt.patch
+Patch18: php5-format-string-issues.patch
Url: http://www.php.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: PHP5 Core Files
@@ -990,14 +962,14 @@
See http://www.php.net/credits.php for more details
%package sqlite
-Provides: php-sqlite = %{version}
+Provides: php-sqlite
Provides: php-sqlite3 = %{version}
Provides: php5-pdo_sqlite = %{version}
+Provides: php5-sqlite3 = %{version}
Summary: PHP5 Extension Module
Group: Development/Libraries/PHP
Requires: %{name} = %{version}
Requires: %{name}-pdo = %{version}
-Obsoletes: php5-pdo_sqlite < %{version}
%description sqlite
This is an extension for the SQLite Embeddable SQL Database Engine.
@@ -1248,43 +1220,39 @@
See http://www.php.net/credits.php for more details
%prep
+echo %{apache2_mmn}
%setup -q -n php-%{version} -a 1
%{__tar} xf %{S:2} -C ext
%{__mv} ext/suhosin-%{suhosin_version} ext/suhosin
%{__cp} %{S:4} pear/README.SUSE
%{__cp} %{S:5} .
%{__cp} %{S:7} pear/
+%patch0
+%patch1
%patch2
%patch3
%patch4
-%if %{with_suhosin_patch}
+%patch5
%patch6
-%endif
%patch7
+%patch10
+%patch11 -p1
%if %{need_libxml2_hack}
-echo "***APPLY LIBXML2.7 FIX***"
-%patch13
+echo "*** APPLY LIBXML2.7 FIX ***"
+%patch12
%else
-echo "***SKIPPING LIBMXL2.7 FIX ***"
+echo "*** SKIPPING LIBMXL2.7 FIX ***"
%endif
-%patch19
-%patch20
-%patch22
-%patch24
-%patch25
-%patch26
-%patch27
-%patch29
-%patch30
-%patch31
+%patch13
+%patch14
%if 0%{suse_version} > 1120
%ifarch x86_64·
-%patch33
+%patch15
%endif
%endif
-%patch36
-%patch37
-%patch38
+%patch16
+%patch17
+%patch18
# Safety check for API version change.
vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h`
if test "x${vapi}" != "x%{apiver}"; then
@@ -1310,19 +1278,20 @@
# Regenerate configure scripts (patches change config.m4's)
touch configure.in
# we build three SAPI
-%{__mkdir_p} build-apache2 build-fpm
-%{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi
-%{__mkdir_p} build-cli/ext/sqlite/libsqlite/src/
+%{__mkdir_p} build-apache2
+%{__mkdir_p} build-fpm
+%{__mkdir_p} build-fastcgi
+%{__mkdir_p} build-cli
for parser in `find -name "*.re"`;do
re2c --no-generation-date -gi "$parser" > ${parser%.*}.c
done
-%{__rm} -rf ext/pcre/pcrelib ext/pdo_sqlite/sqlite
+%{__rm} -r ext/pcre/pcrelib
# regenerate configure etc.
# workaround: suhosin-patch updates timestamp of configure, confusing buildconf
-%{__rm} -f configure
+%{__rm} configure
./buildconf --force
# export flags
CFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing"
@@ -1376,16 +1345,16 @@
--enable-hash \
--with-mhash \
"$@" || cat config.log
-# Some modules are builtin, reasons:
-# - libxml can not be shared (and is needed by PEAR)
-# - spl doesn't build shared
-# - simplexml is needed by spl
-# - session need to be builtin, otherwise sqlite and other session engines fail
-# - pcre is needed for PEAR
-# - filter is builtin due security reasons
-#We have still have harcoded RPATH in some modules
-%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=LIBTOOL_IS_BROKED|g' libtool
+ # Some modules are builtin, reasons:
+ # - libxml can not be shared (and is needed by PEAR)
+ # - spl doesn't build shared
+ # - simplexml is needed by spl
+ # - session need to be builtin, otherwise sqlite and other session engines fail
+ # - pcre is needed for PEAR
+ # - filter is builtin due security reasons
+ # We have still have harcoded RPATH in some modules
+ %{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+ %{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=LIBTOOL_IS_BROKED|g' libtool
%{__make} %{?jobs:-j%jobs PHP_PEAR_PHP_BIN=%{_bindir}/php}
popd
}
@@ -1446,9 +1415,6 @@
--with-png-dir=%{_usr} \
--with-jpeg-dir=%{_usr} \
--with-zlib-dir=%{_usr} \
-%if 0%{?suse_version} > 1020
- --with-t1lib=%{_usr} \
-%endif
--with-gettext=shared \
--with-gmp=shared \
--with-iconv=shared \
@@ -1488,22 +1454,12 @@
--with-inifile \
--with-flatfile \
--enable-pdo=shared \
-%if 0%{?suse_version} > 1010
--with-pdo_sqlite=shared,%{_usr} \
--with-sqlite3=shared,%{_usr} \
-%else
- --with-pdo_sqlite=shared \
- --with-sqlite3=shared \
-%endif
+ --enable-sqlite-utf8 \
--with-pdo-mysql=shared,mysqlnd \
--with-pdo-pgsql=shared,%{_usr} \
--with-pdo-odbc=shared,unixODBC,%{_usr} \
-%if 0%{?suse_version} > 1010
- --with-sqlite=shared,%{_usr} \
-%else
- --with-sqlite=shared \
-%endif
- --enable-sqlite-utf8 \
--enable-zip=shared \
--enable-suhosin=shared \
--enable-intl=shared,%{_usr} \
@@ -1642,12 +1598,9 @@
%post fpm
%{fillup_and_insserv -f php-fpm}
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-, root, root)
-%doc README* CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS TODO* php-suse-addons/test.php5
+%doc README* CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS UPGRADING php-suse-addons/test.php5
%doc %{_mandir}/man1/*
%dir %{php_sysconf}
%dir %{php_sysconf}/conf.d
@@ -1812,7 +1765,6 @@
%defattr(644,root,root,755)
%{extension_dir}/mssql.so
%config(noreplace) %{php_sysconf}/conf.d/mssql.ini
-
%endif
%files mysql
@@ -1899,8 +1851,6 @@
%files sqlite
%defattr(644,root,root,755)
-%{extension_dir}/sqlite.so
-%config(noreplace) %{php_sysconf}/conf.d/sqlite.ini
%{extension_dir}/pdo_sqlite.so
%config(noreplace) %{php_sysconf}/conf.d/pdo_sqlite.ini
%{extension_dir}/sqlite3.so
++++++ php-5.3.22.tar.bz2 -> php-5.4.13.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/php5/php-5.3.22.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.4.13.tar.bz2 differ: char 11, line 1
++++++ php-suse-addons.tar.bz2 ++++++
++++++ php-5.2.9-BNC-457056.patch -> php5-BNC-457056.patch ++++++
++++++ php-cloexec.patch -> php5-cloexec.patch ++++++
--- /work/SRC/openSUSE:Factory/php5/php-cloexec.patch 2011-09-23 12:39:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.php5.new/php5-cloexec.patch 2013-03-26 07:01:11.000000000 +0100
@@ -1,43 +1,41 @@
Index: ext/standard/exec.c
===================================================================
---- ext/standard/exec.c.orig 2010-03-12 11:28:59.000000000 +0100
-+++ ext/standard/exec.c 2010-08-03 06:31:21.692327000 +0200
-@@ -107,8 +107,12 @@ PHPAPI int php_exec(int type, char *cmd,
+--- ext/standard/exec.c.orig
++++ ext/standard/exec.c
+@@ -76,7 +76,11 @@ PHPAPI int php_exec(int type, char *cmd,
#ifdef PHP_WIN32
- fp = VCWD_POPEN(cmd_p, "rb");
+ fp = VCWD_POPEN(cmd, "rb");
#else
-+#if defined(__linux__) && __GLIBC_PREREQ(2, 9)
-+ fp = VCWD_POPEN(cmd_p, "re");
-+#else
- fp = VCWD_POPEN(cmd_p, "r");
++ #if defined(__linux__) && __GLIBC_PREREQ(2, 9)
++ fp = VCWD_POPEN(cmd, "re");
++ #else
+ fp = VCWD_POPEN(cmd, "r");
++ #endif
#endif
-+#endif
if (!fp) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to fork [%s]", cmd);
- goto err;
Index: ext/standard/file.c
===================================================================
---- ext/standard/file.c.orig 2010-05-02 22:11:22.000000000 +0200
-+++ ext/standard/file.c 2010-08-03 06:31:21.701320000 +0200
-@@ -957,6 +957,13 @@ PHP_FUNCTION(popen)
+--- ext/standard/file.c.orig
++++ ext/standard/file.c
+@@ -925,6 +925,12 @@ PHP_FUNCTION(popen)
}
}
#endif
+#if defined(__linux__) && __GLIBC_PREREQ(2, 9)
-+ char *e = memchr(posix_mode, 'e', mode_len);
-+ if (e) {
-+ memmove(e, e + 1, mode_len - (e - posix_mode));
-+ }
++ char *e = memchr(posix_mode, 'e', mode_len);
++ if (e) {
++ memmove(e, e + 1, mode_len - (e - posix_mode));
++ }
+#endif
-+
- if (PG(safe_mode)){
- b = strchr(command, ' ');
- if (!b) {
+
+ fp = VCWD_POPEN(command, posix_mode);
+ if (!fp) {
Index: ext/standard/mail.c
===================================================================
---- ext/standard/mail.c.orig 2010-07-19 15:38:53.000000000 +0200
-+++ ext/standard/mail.c 2010-08-03 06:31:21.709286000 +0200
-@@ -294,8 +294,12 @@ PHPAPI int php_mail(char *to, char *subj
+--- ext/standard/mail.c.orig
++++ ext/standard/mail.c
+@@ -286,8 +286,12 @@ PHPAPI int php_mail(char *to, char *subj
* (e.g. the shell can't be executed) we explicitely set it to 0 to be
* sure we don't catch any older errno value. */
errno = 0;
++++++ php-5.3.8-crypt-tests.patch -> php5-crypt-tests.patch ++++++
++++++ php-5.3.4-format-string-issues.patch -> php5-format-string-issues.patch ++++++
++++++ php-5.3.6-gcc_builtins.patch -> php5-gcc_builtins.patch ++++++
++++++ php-5.3.2-ini.patch -> php5-ini.patch ++++++
--- /work/SRC/openSUSE:Factory/php5/php-5.3.2-ini.patch 2011-09-23 12:39:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.php5.new/php5-ini.patch 2013-03-26 07:01:11.000000000 +0100
@@ -1,8 +1,8 @@
Index: php.ini-production
===================================================================
---- php.ini-production.orig 2010-06-24 02:15:12.000000000 +0200
-+++ php.ini-production 2010-08-03 06:31:20.319461000 +0200
-@@ -781,7 +781,7 @@ default_mimetype = "text/html"
+--- php.ini-production.orig
++++ php.ini-production
+@@ -702,7 +702,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -11,7 +11,16 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -1189,7 +1189,7 @@ mysql.allow_local_infile = On
+@@ -916,7 +916,7 @@ cli_server.color = On
+ [Date]
+ ; Defines the default timezone used by the date functions
+ ; http://php.net/date.timezone
+-;date.timezone =
++date.timezone = 'UTC'
+
+ ; http://php.net/date.default-latitude
+ ;date.default_latitude = 31.7667
+@@ -1106,7 +1106,7 @@ mysql.allow_local_infile = On
; Allow or prevent persistent links.
; http://php.net/mysql.allow-persistent
@@ -20,7 +29,7 @@
; If mysqlnd is used: Number of cache slots for the internal result set cache
; http://php.net/mysql.cache_size
-@@ -1252,7 +1252,7 @@ mysqli.max_persistent = -1
+@@ -1169,7 +1169,7 @@ mysqli.max_persistent = -1
; Allow or prevent persistent links.
; http://php.net/mysqli.allow-persistent
@@ -29,7 +38,7 @@
; Maximum number of links. -1 means no limit.
; http://php.net/mysqli.max-links
-@@ -1474,7 +1474,7 @@ session.save_handler = files
+@@ -1391,7 +1391,7 @@ session.save_handler = files
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
; http://php.net/session.save-path
@@ -38,24 +47,25 @@
; Whether to use cookies.
; http://php.net/session.use-cookies
-@@ -1590,14 +1590,14 @@ session.referer_check =
+@@ -1507,7 +1507,7 @@ session.referer_check =
; How many bytes to read from the file.
; http://php.net/session.entropy-length
--session.entropy_length = 0
+-;session.entropy_length = 32
+session.entropy_length = 32
; Specified here to create the session id.
; http://php.net/session.entropy-file
- ; On systems that don't have /dev/urandom /dev/arandom can be used
- ; On windows, setting the entropy_length setting will activate the
+@@ -1516,7 +1516,7 @@ session.referer_check =
+ ; If neither are found at compile time, the default is no entropy file.
+ ; On windows, setting the entropy_length setting will activate the
; Windows random source (using the CryptoAPI)
-;session.entropy_file = /dev/urandom
+session.entropy_file = /dev/urandom
; Set to {nocache,private,public,} to determine HTTP caching aspects
; or leave this empty to avoid sending anti-caching headers.
-@@ -1628,7 +1628,7 @@ session.use_trans_sid = 0
+@@ -1547,7 +1547,7 @@ session.use_trans_sid = 0
; the hash extension. A list of available hashes is returned by the hash_algos()
; function.
; http://php.net/session.hash-function
++++++ php5-mbstring-missing-return.patch ++++++
Index: php-5.4.4/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
===================================================================
--- php-5.4.4.orig/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
+++ php-5.4.4/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
@@ -672,6 +672,8 @@ retry:
CK(mbfl_filt_conv_illegal_output(c, filter));
}
}
+
+ return c;
}
int
++++++ php5-missing-extdeps.patch ++++++
--- /var/tmp/diff_new_pack.SQLBfU/_old 2013-03-26 07:01:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SQLBfU/_new 2013-03-26 07:01:14.000000000 +0100
@@ -1,15 +1,8 @@
+Index: ext/soap/soap.c
+===================================================================
--- ext/soap/soap.c.orig
+++ ext/soap/soap.c
-@@ -439,7 +439,7 @@ unsigned char arginfo_soapclient___soapc
- # define arginfo_soapserver_setobject NULL
- # define arginfo_soapserver_addfunction NULL
- # define arginfo_soapserver_getfunctions NULL
--# defina arginfo_soapserver_handle NULL
-+# define arginfo_soapserver_handle NULL
- # define arginfo_soapserver_fault NULL
- # define arginfo_soapserver_addsoapheader NULL
-
-@@ -516,10 +516,18 @@ static const zend_function_entry soap_he
+@@ -442,10 +442,18 @@ static const zend_function_entry soap_he
PHP_FE_END
};
@@ -31,6 +24,8 @@
"soap",
soap_functions,
PHP_MINIT(soap),
+Index: ext/wddx/wddx.c
+===================================================================
--- ext/wddx/wddx.c.orig
+++ ext/wddx/wddx.c
@@ -154,10 +154,21 @@ ZEND_GET_MODULE(wddx)
@@ -56,6 +51,8 @@
"wddx",
wddx_functions,
PHP_MINIT(wddx),
+Index: ext/filter/filter.c
+===================================================================
--- ext/filter/filter.c.orig
+++ ext/filter/filter.c
@@ -132,12 +132,17 @@ static const zend_function_entry filter_
@@ -79,26 +76,28 @@
"filter",
filter_functions,
PHP_MINIT(filter),
+Index: ext/mbstring/mbstring.c
+===================================================================
--- ext/mbstring/mbstring.c.orig
+++ ext/mbstring/mbstring.c
-@@ -561,9 +561,19 @@ const zend_function_entry mbstring_funct
+@@ -570,9 +570,19 @@ const zend_function_entry mbstring_funct
};
/* }}} */
+/* {{{ mbstring dependencies */
+static const zend_module_dep mbstring_module_deps[] = {
-+ ZEND_MOD_REQUIRED("standard")
++ ZEND_MOD_REQUIRED("standard")
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !HAVE_ONIG
-+ ZEND_MOD_REQUIRED("pcre")
++ ZEND_MOD_REQUIRED("pcre")
+#endif
-+ {NULL, NULL, NULL}
++ {NULL, NULL, NULL}
+};
+
/* {{{ zend_module_entry mbstring_module_entry */
zend_module_entry mbstring_module_entry = {
-- STANDARD_MODULE_HEADER,
-+ STANDARD_MODULE_HEADER_EX, NULL,
-+ mbstring_module_deps,
+- STANDARD_MODULE_HEADER,
++ STANDARD_MODULE_HEADER_EX, NULL,
++ mbstring_module_deps,
"mbstring",
mbstring_functions,
PHP_MINIT(mbstring),
++++++ php-5.3.2-no-build-date.patch -> php5-no-build-date.patch ++++++
--- /work/SRC/openSUSE:Factory/php5/php-5.3.2-no-build-date.patch 2013-03-08 11:20:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.php5.new/php5-no-build-date.patch 2013-03-26 07:01:11.000000000 +0100
@@ -24,7 +24,7 @@
===================================================================
--- sapi/fpm/fpm/fpm_main.c.orig
+++ sapi/fpm/fpm/fpm_main.c
-@@ -1719,7 +1719,7 @@ int main(int argc, char *argv[])
+@@ -1710,7 +1710,7 @@ int main(int argc, char *argv[])
#if ZEND_DEBUG
php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#else
@@ -37,7 +37,7 @@
===================================================================
--- configure.in.orig
+++ configure.in
-@@ -1202,8 +1202,8 @@ fi
+@@ -1257,8 +1257,8 @@ fi
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
@@ -48,7 +48,7 @@
AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
case $host_alias in
-@@ -1214,7 +1214,8 @@ case $host_alias in
+@@ -1269,7 +1269,8 @@ case $host_alias in
AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host])
;;
*)
@@ -62,14 +62,14 @@
===================================================================
--- sapi/cli/php_cli.c.orig
+++ sapi/cli/php_cli.c
-@@ -826,8 +826,8 @@ int main(int argc, char *argv[])
- }
+@@ -687,8 +687,8 @@ static int do_cli(int argc, char **argv
+ goto out;
- request_started = 1;
+ case 'v': /* show php version & quit */
- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2013 The PHP Group\n%s",
-- PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
+- PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,
+ php_printf("PHP %s (%s) %s\nCopyright (c) 1997-2013 The PHP Group\n%s",
-+ PHP_VERSION, sapi_module.name,
++ PHP_VERSION, cli_sapi_module.name,
#if ZEND_DEBUG && defined(HAVE_GCOV)
"(DEBUG GCOV)",
#elif ZEND_DEBUG
@@ -77,7 +77,7 @@
===================================================================
--- sapi/cgi/cgi_main.c.orig
+++ sapi/cgi/cgi_main.c
-@@ -1958,7 +1958,7 @@ consult the installation file that came
+@@ -2218,7 +2218,7 @@ consult the installation file that came
#if ZEND_DEBUG
php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#else
++++++ php-5.3.8-no-reentrant-crypt.patch -> php5-no-reentrant-crypt.patch ++++++
++++++ php5-openssl.patch ++++++
--- /var/tmp/diff_new_pack.SQLBfU/_old 2013-03-26 07:01:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SQLBfU/_new 2013-03-26 07:01:14.000000000 +0100
@@ -1,6 +1,8 @@
+Index: ext/openssl/openssl.c
+===================================================================
--- ext/openssl/openssl.c.orig
+++ ext/openssl/openssl.c
-@@ -47,6 +47,7 @@
+@@ -51,6 +51,7 @@
#include
participants (1)
-
root@hilbert.suse.de