Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at Tue Dec 14 10:10:12 CET 2010. -------- --- php5/php5.changes 2010-12-13 03:09:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2010-12-14 02:10:35.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Dec 14 01:08:07 UTC 2010 - cristian.rodriguez@opensuse.org + +- fix format string bug in Phar extension I just found + http://bugs.php.net/bug.php?id=53541 and the underlying + issue, which is the lack of format attributes in several + core prototypes. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- php-5.3.4-format-string-issues.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.nbRqRQ/_old 2010-12-14 09:54:17.000000000 +0100 +++ /var/tmp/diff_new_pack.nbRqRQ/_new 2010-12-14 09:54:17.000000000 +0100 @@ -77,7 +77,7 @@ ### ### Version: 5.3.4 -Release: 1 +Release: 2 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 @@ -115,6 +115,7 @@ 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 Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -1221,6 +1222,7 @@ %patch24 %patch25 %patch26 +%patch27 # we build three SAPI %{__mkdir_p} build-apache2 build-fpm %{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi @@ -1271,8 +1273,8 @@ %{__rm} -f configure ./buildconf --force # export flags -CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing -pipe" -CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing -pipe" +CFLAGS="$RPM_OPT_FLAGS -Wmissing-format-attribute -D_GNU_SOURCE -fno-strict-aliasing -pipe" +CXXFLAGS="$RPM_OPT_FLAGS -Wmissing-format-attribute -D_GNU_SOURCE -fno-strict-aliasing -pipe" %if 0%{?suse_version} > 1000 CFLAGS="$CFLAGS -fstack-protector" CXXFLAGS="$CXXFLAGS -fstack-protector" ++++++ php-5.3.4-format-string-issues.patch ++++++ 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 @@ 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); -PHPAPI int ap_php_asprintf(char **buf, const char *format, ...); +PHPAPI int ap_php_asprintf(char **buf, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 2, 3); 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 @@ /* {{{ php_error_cb extended error handling function */ -static void php_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) +static PHP_ATTRIBUTE_FORMAT(printf, 4, 0) void php_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) { char *buffer; int buffer_len, display; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org