Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2012-03-20 12:04:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2012-01-06 11:46:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2012-03-20 12:05:10.000000000 +0100 @@ -1,0 +2,44 @@ +Thu Mar 8 19:40:22 UTC 2012 - [email protected] + +- fix license to spdx.org format + +------------------------------------------------------------------- +Tue Feb 28 09:08:30 UTC 2012 - [email protected] + +- fixed build with new pcre (php bug 60986) + +------------------------------------------------------------------- +Sat Feb 4 16:35:07 UTC 2012 - [email protected] + +- Build with -fpie + +------------------------------------------------------------------- +Thu Feb 2 21:31:00 UTC 2012 - [email protected] + +- PHP 5.3.10, fixes CVE-2012-0830. + +------------------------------------------------------------------- +Sat Jan 28 18:52:35 UTC 2012 - [email protected] + +- remove unapplied patches + +------------------------------------------------------------------- +Wed Jan 18 15:17:02 UTC 2012 - [email protected] + +- buildrequire libjpeg-devel + +------------------------------------------------------------------- +Tue Jan 17 08:35:44 UTC 2012 - [email protected] + +- remove apache module conflict with apache2-worker [bnc#728671] +- amended README.SUSE instead + +------------------------------------------------------------------- +Wed Jan 11 01:46:14 UTC 2012 - [email protected] + +- Update to version 5.3.9 + * Drop already applied patches + * This update only contain minor bug fixes, it is a stop over + php 5.4.0 that should be out very soon. + +------------------------------------------------------------------- Old: ---- php-5.3.8-CVE-2011-1466.patch php-5.3.8-CVE-2011-3379.patch php-5.3.8-CVE-2011-4566.patch php-5.3.8-CVE-2011-4885.patch php-5.3.8.tar.bz2 php-wrong-page_size.patch php5-2g-crash.patch suhosin-0.9.32.1.tar.gz New: ---- php-5.3.10-pcre_fullinfo.patch php-5.3.10.tar.bz2 suhosin-0.9.33.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ ++++ 784 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/php5/php5.spec ++++ and /work/SRC/openSUSE:Factory/.php5.new/php5.spec ++++++ php-5.3.10-pcre_fullinfo.patch ++++++ http://svn.php.net/viewvc/?view=revision&revision=323096 http://svn.php.net/viewvc/?view=revision&revision=323097 Index: ext/pcre/php_pcre.c =================================================================== --- ext/pcre/php_pcre.c.orig +++ ext/pcre/php_pcre.c @@ -241,6 +241,7 @@ PHPAPI pcre_cache_entry* pcre_get_compil char *pattern; int do_study = 0; int poptions = 0; + int count = 0; unsigned const char *tables = NULL; #if HAVE_SETLOCALE char *locale = setlocale(LC_CTYPE, NULL); @@ -252,10 +253,10 @@ PHPAPI pcre_cache_entry* pcre_get_compil back the compiled pattern, otherwise go on and compile it. */ if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) { /* - * We use a quick pcre_info() check to see whether cache is corrupted, and if it + * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it * is, we flush it and compile the pattern from scratch. */ - if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) { + if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) { zend_hash_clean(&PCRE_G(pcre_cache)); } else { #if HAVE_SETLOCALE Index: ext/pcre/php_pcre.def =================================================================== --- ext/pcre/php_pcre.def.orig +++ ext/pcre/php_pcre.def @@ -4,7 +4,6 @@ php_pcre_copy_substring php_pcre_exec php_pcre_get_substring php_pcre_get_substring_list -php_pcre_info php_pcre_maketables php_pcre_study php_pcre_version Index: main/php_compat.h =================================================================== --- main/php_compat.h.orig +++ main/php_compat.h @@ -34,7 +34,6 @@ #define pcre_exec php_pcre_exec #define pcre_get_substring php_pcre_get_substring #define pcre_get_substring_list php_pcre_get_substring_list -#define pcre_info php_pcre_info #define pcre_maketables php_pcre_maketables #define pcre_study php_pcre_study #define pcre_version php_pcre_version ++++++ php-5.3.8.tar.bz2 -> php-5.3.10.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/php5/php-5.3.8.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.3.10.tar.bz2 differ: char 11, line 1 ++++++ php-5.3.2-aconf26x.patch ++++++ --- /var/tmp/diff_new_pack.DRhkKB/_old 2012-03-20 12:05:14.000000000 +0100 +++ /var/tmp/diff_new_pack.DRhkKB/_new 2012-03-20 12:05:14.000000000 +0100 @@ -40,7 +40,7 @@ --- configure.in.orig +++ configure.in @@ -1,7 +1,7 @@ - ## $Id: configure.in 315343 2011-08-23 08:56:29Z johannes $ -*- autoconf -*- + ## $Id: configure.in 323027 2012-02-02 17:29:58Z johannes $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) @@ -81,7 +81,7 @@ dnl ## In diversion 3 we check for compile-time options to the PHP dnl ## core and how to deal with different system dependencies. -@@ -675,7 +675,7 @@ if test "x$php_crypt_r" = "x1"; then +@@ -683,7 +683,7 @@ if test "x$php_crypt_r" = "x1"; then PHP_CRYPT_R_STYLE fi @@ -90,7 +90,7 @@ dnl ## In diversion 4 we check user-configurable general settings. -@@ -916,7 +916,7 @@ else +@@ -924,7 +924,7 @@ else AC_MSG_RESULT([using system default]) fi @@ -99,6 +99,16 @@ dnl ## In diversion 5 we check which extensions should be compiled. dnl ## All of these are normally in the extension directories. +@@ -1351,7 +1351,8 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) + ]) +-AC_PROG_LIBTOOL ++LT_INIT([disable-static pic-only dlopen]) ++#AC_PROG_LIBTOOL + + if test "$enable_debug" != "yes"; then + PHP_SET_LIBTOOL_VARIABLE([--silent]) --- build/buildcheck.sh.orig +++ build/buildcheck.sh @@ -51,7 +51,7 @@ if test "$1" = "2" -a "$2" -gt "59"; the ++++++ php-5.3.4-format-string-issues.patch ++++++ --- /var/tmp/diff_new_pack.DRhkKB/_old 2012-03-20 12:05:14.000000000 +0100 +++ /var/tmp/diff_new_pack.DRhkKB/_new 2012-03-20 12:05:14.000000000 +0100 @@ -11,7 +11,7 @@ PHPAPI char * php_conv_fp(register char format, register double num, --- main/main.c.orig +++ main/main.c -@@ -880,7 +880,7 @@ PHPAPI void php_html_puts(const char *st +@@ -898,7 +898,7 @@ PHPAPI void php_html_puts(const char *st /* {{{ php_error_cb extended error handling function */ @@ -89,25 +89,25 @@ if (p) { --- sapi/cli/php_cli.c.orig +++ sapi/cli/php_cli.c -@@ -832,8 +832,8 @@ int main(int argc, char *argv[]) +@@ -826,8 +826,8 @@ int main(int argc, char *argv[]) } request_started = 1; -- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s", +- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2012 The PHP Group\n%s", - PHP_VERSION, sapi_module.name, __DATE__, __TIME__, -+ php_printf("PHP %s (%s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s", ++ php_printf("PHP %s (%s) %s\nCopyright (c) 1997-2012 The PHP Group\n%s", + PHP_VERSION, sapi_module.name, #if ZEND_DEBUG && defined(HAVE_GCOV) "(DEBUG GCOV)", #elif ZEND_DEBUG --- sapi/cgi/cgi_main.c.orig +++ sapi/cgi/cgi_main.c -@@ -1932,7 +1932,7 @@ consult the installation file that came +@@ -1935,7 +1935,7 @@ consult the installation file that came #if ZEND_DEBUG - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #else -- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); -+ php_printf("PHP %s (%s) \nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); +- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s (%s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); #endif php_request_shutdown((void *) 0); fcgi_shutdown(); ++++++ php-suse-addons.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/php-suse-addons/README.SUSE new/php-suse-addons/README.SUSE --- old/php-suse-addons/README.SUSE 2011-12-20 15:41:52.000000000 +0100 +++ new/php-suse-addons/README.SUSE 2012-01-18 09:56:57.000000000 +0100 @@ -41,7 +41,11 @@ Enabling/disabling the PHP5 module for Apache ============================================= - - do not use PHP module with Apache Worker + - PHP.net does not recommend to use PHP with Apache Worker, as some of the + libraries PHP relies on are not thread safe; see + http://php.net/manual/en/install.unix.apache2.php + http://www.php.net/manual/en/faq.installation.php#faq.installation.apache2 + for details - in /etc/sysconfig/apache2, add "php5" to APACHE_MODULES, or remove it to disable - possibly include /etc/apache2/conf.d/mod_php5.conf in individual virtual -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
