Hello community,
here is the log from the commit of package php5 for openSUSE:Factory
checked in at Wed Mar 16 14:31:09 CET 2011.
--------
--- php5/php5.changes 2011-03-10 00:58:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/php5/php5.changes 2011-03-16
04:53:39.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Mar 16 03:49:41 UTC 2011 - crrodrig...@opensuse.org
+
+- Upgrade to PHP 5.3.6.RC3
+ * Drop obsoleted patches
+ * fix some rpmlint warnings
+ * Hundreds of changes, see NEWS for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
php-5.3.5-CVE-2011-0420.patch
php-5.3.5-CVE-2011-0708.patch
php-5.3.5-fopen_https_proxy_auth_fix.patch
php-5.3.5.tar.bz2
New:
----
_service
_service:download_url:php-5.3.6RC3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.l4HACk/_old 2011-03-16 14:30:16.000000000 +0100
+++ /var/tmp/diff_new_pack.l4HACk/_new 2011-03-16 14:30:16.000000000 +0100
@@ -76,8 +76,8 @@
#define builtin_tz_ver 2007.9
###
###
-Version: 5.3.5
-Release: 10
+Version: 5.3.5.90
+Release: 1
License: The PHP License, version 3.01
Group: Development/Languages/Other
Provides: php zend php-xml php-spl php-simplexml php-session php-pcre
php-date php-reflection php-filter
@@ -87,7 +87,7 @@
PreReq: update-alternatives
#extensions that are no longer here
Obsoletes: php5-dbx php5-dio php5-fam php5-filepro php5-yp php5-dbase
php5-ncurses
-Source0: php-%{version}.tar.bz2
+Source0: php-5.3.6RC3.tar.bz2
Source1: php-suse-addons.tar.bz2
Source2: suhosin-%{suhosin_version}.tar.gz
Source4: README.SUSE-pear
@@ -107,7 +107,7 @@
#bugs
Patch13: php-5.2.9-BNC-457056.patch
Patch14: php-5.3.0-ldap-checks.patch
-Patch15: php-5.3.0-fix-rpmlint-errors.patch
+#Patch15: php-5.3.0-fix-rpmlint-errors.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 dims...@opensuse.org -- Build fails with
autoconf > 2.63
@@ -117,9 +117,6 @@
Patch25: php-cloexec.patch
Patch26: php-5.3.4-pts.patch
Patch27: php-5.3.4-format-string-issues.patch
-Patch28: php-5.3.5-fopen_https_proxy_auth_fix.patch
-Patch29: php-5.3.5-CVE-2011-0420.patch
-Patch30: php-5.3.5-CVE-2011-0708.patch
Url: http://www.php.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: PHP5 Core Files
@@ -1200,7 +1197,7 @@
See http://www.php.net/credits.php for more details
%prep
-%setup -q -n php-%{version} -a 1
+%setup -q -n php-5.3.6RC3 -a 1
%{__tar} xf %{S:2} -C ext
%{__mv} ext/suhosin-%{suhosin_version} ext/suhosin
%{__cp} %{S:4} pear/README.SUSE
@@ -1221,7 +1218,7 @@
echo "***SKIPPING LIBMXL2.7 FIX ***"
%endif
%patch14
-%patch15
+#%patch15
%patch19
%patch20
%patch22
@@ -1230,10 +1227,6 @@
%patch25
%patch26
%patch27
-%patch28 -p1
-%patch29
-%patch30
-
# we build three SAPI
%{__mkdir_p} build-apache2 build-fpm
%{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi
++++++ _service ++++++
<services>
<service name="download_url">
<param name="protocol">http</param>
<param name="host">downloads.php.net</param>
<param name="path">/johannes/php-5.3.6RC3.tar.bz2</param>
</service>
<service name="verify_file">
<param name="file">_service:download_url:php-5.3.6RC3.tar.bz2</param>
<param name="verifier">sha256</param>
<param
name="checksum">713f053b56ae0028565cc75deade2d04d7ceb506f4b361b5cc4fff70af69777c</param>
</service>
</services>++++++ install-pear-nozlib.phar ++++++
++++ 7475 lines (skipped)
++++ between install-pear-nozlib.phar
++++ and /mounts/work_src_done/STABLE/php5/install-pear-nozlib.phar
++++++ php-5.3.2-aconf26x.patch ++++++
--- /var/tmp/diff_new_pack.l4HACk/_old 2011-03-16 14:30:17.000000000 +0100
+++ /var/tmp/diff_new_pack.l4HACk/_new 2011-03-16 14:30:17.000000000 +0100
@@ -40,7 +40,7 @@
--- configure.in.orig
+++ configure.in
@@ -1,7 +1,7 @@
- ## $Id: configure.in 307133 2011-01-05 16:35:33Z johannes $ -*- autoconf -*-
+ ## $Id: configure.in 309051 2011-03-09 16:37:58Z johannes $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
-divert(1)
++++++ php-5.3.2-no-build-date.patch ++++++
--- /var/tmp/diff_new_pack.l4HACk/_old 2011-03-16 14:30:17.000000000 +0100
+++ /var/tmp/diff_new_pack.l4HACk/_new 2011-03-16 14:30:17.000000000 +0100
@@ -1,27 +1,3 @@
---- sapi/cgi/cgi_main.c.orig
-+++ sapi/cgi/cgi_main.c
-@@ -1932,7 +1932,7 @@ consult the installation file that came
- #if ZEND_DEBUG
- php_printf("PHP %s (%s)
(built: %s %s) (DEBUG)\nCopyright (c) 1997-2010 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-2010 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ php_printf("PHP %s
(%s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, get_zend_version());
- #endif
-
php_request_shutdown((void *) 0);
- fcgi_shutdown();
---- sapi/cli/php_cli.c.orig
-+++ sapi/cli/php_cli.c
-@@ -832,8 +832,8 @@ int main(int argc, char *argv[])
- }
-
- request_started = 1;
-- php_printf("PHP %s (%s) (built: %s %s)
%s\nCopyright (c) 1997-2010 The PHP Group\n%s",
-- PHP_VERSION, sapi_module.name,
__DATE__, __TIME__,
-+ php_printf("PHP %s (%s) %s\nCopyright (c)
1997-2010 The PHP Group\n%s",
-+ PHP_VERSION, sapi_module.name,
- #if ZEND_DEBUG && defined(HAVE_GCOV)
- "(DEBUG GCOV)",
- #elif ZEND_DEBUG
--- ext/standard/info.c.orig
+++ ext/standard/info.c
@@ -697,7 +697,7 @@ PHPAPI void php_print_info(int flag TSRM
++++++ php-5.3.4-format-string-issues.patch ++++++
--- /var/tmp/diff_new_pack.l4HACk/_old 2011-03-16 14:30:17.000000000 +0100
+++ /var/tmp/diff_new_pack.l4HACk/_new 2011-03-16 14:30:17.000000000 +0100
@@ -1,34 +1,6 @@
-Index: ext/phar/stream.c
-===================================================================
---- ext/phar/stream.c (revisión: 306350)
-+++ ext/phar/stream.c (copia de trabajo)
-@@ -250,7 +250,7 @@
- if (!*internal_file && (options & STREAM_OPEN_FOR_INCLUDE)) {
- /* retrieve the stub */
- if (FAILURE == phar_get_archive(&phar, resource->host,
host_len, NULL, 0, NULL TSRMLS_CC)) {
-- php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, "file %s is not a valid phar archive");
-+ php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, "file %s is not a valid phar archive", resource->host);
- efree(internal_file);
- php_url_free(resource);
- return NULL;
-Index: Zend/zend_exceptions.c
-===================================================================
---- Zend/zend_exceptions.c (revisión: 306350)
-+++ Zend/zend_exceptions.c (copia de trabajo)
-@@ -742,7 +742,7 @@
- }
- /* }}} */
-
--static void zend_error_va(int type, const char *file, uint lineno, const char
*format, ...) /* {{{ */
-+static void ZEND_ATTRIBUTE_FORMAT(printf, 4, 5) zend_error_va(int type, const
char *file, uint lineno, const char *format, ...) /* {{{ */
- {
- va_list args;
-
-Index: main/snprintf.h
-===================================================================
---- main/snprintf.h (revisión: 306350)
-+++ main/snprintf.h (copia de trabajo)
-@@ -83,7 +83,7 @@
+--- main/snprintf.h.orig
++++ main/snprintf.h
+@@ -83,7 +83,7 @@ PHPAPI int ap_php_vslprintf(char *buf, s
PHPAPI int ap_php_snprintf(char *, size_t, const char *, ...);
PHPAPI int ap_php_vsnprintf(char *, size_t, const char *, va_list ap);
PHPAPI int ap_php_vasprintf(char **buf, const char *format, va_list ap);
@@ -37,33 +9,9 @@
PHPAPI int php_sprintf (char* s, const char* format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
PHPAPI char * php_gcvt(double value, int ndigit, char dec_point, char
exponent, char *buf);
PHPAPI char * php_conv_fp(register char format, register double num,
-Index: main/php_streams.h
-===================================================================
---- main/php_streams.h (revisión: 306350)
-+++ main/php_streams.h (copia de trabajo)
-@@ -292,7 +292,7 @@
- #define php_stream_write_string(stream, str) _php_stream_write(stream, str,
strlen(str) TSRMLS_CC)
- #define php_stream_write(stream, buf, count) _php_stream_write(stream,
(buf), (count) TSRMLS_CC)
-
--PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char
*fmt, ...);
-+PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char
*fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
- /* php_stream_printf macro & function require TSRMLS_CC */
- #define php_stream_printf _php_stream_printf
-
-@@ -548,7 +548,7 @@
- php_stream_open_wrapper_ex(Z_STRVAL_PP((zstream)),
(mode), (options), (opened), (context)) : NULL
-
- /* pushes an error message onto the stack for a wrapper instance */
--PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int
options TSRMLS_DC, const char *fmt, ...);
-+PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int
options TSRMLS_DC, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
-
-
- #define PHP_STREAM_UNCHANGED 0 /* orig stream was seekable anyway */
-Index: main/main.c
-===================================================================
---- main/main.c (revisión: 306350)
-+++ main/main.c (copia de trabajo)
-@@ -878,7 +878,7 @@
+--- main/main.c.orig
++++ main/main.c
+@@ -880,7 +880,7 @@ PHPAPI void php_html_puts(const char *st
/* {{{ php_error_cb
extended error handling function */
@@ -72,11 +20,9 @@
{
char *buffer;
int buffer_len, display;
-Index: Zend/zend.h
-===================================================================
---- Zend/zend.h (revisión: 306414)
-+++ Zend/zend.h (copia de trabajo)
-@@ -146,6 +146,14 @@
+--- Zend/zend.h.orig
++++ Zend/zend.h
+@@ -146,6 +146,14 @@ char *alloca ();
# define ZEND_ATTRIBUTE_MALLOC
#endif
@@ -91,11 +37,9 @@
#if ZEND_GCC_VERSION >= 2007
# define ZEND_ATTRIBUTE_FORMAT(type, idx, first) __attribute__ ((format(type,
idx, first)))
#else
-Index: Zend/zend_alloc.h
-===================================================================
---- Zend/zend_alloc.h (revisión: 306414)
-+++ Zend/zend_alloc.h (copia de trabajo)
-@@ -54,14 +54,14 @@
+--- Zend/zend_alloc.h.orig
++++ Zend/zend_alloc.h
+@@ -54,14 +54,14 @@ BEGIN_EXTERN_C()
ZEND_API char *zend_strndup(const char *s, unsigned int length)
ZEND_ATTRIBUTE_MALLOC;
@@ -117,7 +61,7 @@
ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC
ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC
ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC
ZEND_FILE_LINE_ORIG_DC);
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ ZEND_API size_t _zend_mem_block_size(voi
#define estrndup_rel(s, length)
_estrndup((s), (length) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
#define zend_mem_block_size_rel(ptr)
_zend_mem_block_size((ptr) TSRMLS_CC ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
@@ -126,7 +70,7 @@
{
void *tmp = malloc(len);
if (tmp) {
-@@ -100,14 +100,14 @@
+@@ -100,14 +100,14 @@ inline static void * __zend_malloc(size_
exit(1);
}
@@ -143,3 +87,27 @@
{
p = realloc(p, len);
if (p) {
+--- sapi/cli/php_cli.c.orig
++++ sapi/cli/php_cli.c
+@@ -832,8 +832,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_VERSION, sapi_module.name,
__DATE__, __TIME__,
++ php_printf("PHP %s (%s) %s\nCopyright (c)
1997-2011 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
+ #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());
+ #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());
+ #endif
+
php_request_shutdown((void *) 0);
+ fcgi_shutdown();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
