commit php5 for openSUSE:Factory
Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at Thu Oct 28 15:46:49 CEST 2010. -------- --- php5/php5.changes 2010-04-16 17:53:02.000000000 +0200 +++ php5/php5.changes 2010-10-28 00:12:25.000000000 +0200 @@ -1,0 +2,49 @@ +Wed Oct 27 22:09:03 UTC 2010 - cristian.rodriguez@opensuse.org + +- Update to 5.3.3_svn20101027xx +- Fix init script again. + +------------------------------------------------------------------- +Thu Oct 14 03:36:44 UTC 2010 - crrodriguez@opensuse.org + +- update to 5.3.3_svn201010140300 +- Fix php-fpm init script. + +------------------------------------------------------------------- +Sat Oct 9 16:20:10 UTC 2010 - cristian.rodriguez@opensuse.org + +- Update to an slightly newer PHP 5.3.3.x snap, fixes + around 100 bugs including open_basedir problems. +- add the fpm sapi to the package. + +------------------------------------------------------------------- +Tue Aug 3 04:36:49 UTC 2010 - cristian.rodriguez@opensuse.org + +- Clarify changelog this update fixed: + * VUL-0: php5 new unserialize() flaw CVE-2010-2225 [bnc#616232] + * VUL-0: php5: MOPS-2010-021: fnmatch() Stack Exhaustion Vulnerability [bnc#605097] + * VUL-0: php5: MOPS-2010-017: preg_quote() Interruption Information Leak [bnc#605100] + * VUL-0: php5: MOPS-2010-022 use after free [bnc#609763] + * VUL-0: php5-phar: MOPS-2010-0{24,25,26,27,28} format string bugs [bnc#609766] + * VUL-0: php5: MOPS-2010-0{32,33,34} use space interruption in iconv functions [bnc#609768] + * VUL-0: php5: MOPS-2010-0{36,37,38,39,40} userspace interruptions [bnc#609769] + * VUL-0: php5: MOPS-2010-0{36..46} userspace interruptions [bnc#609769] + * VUL-0: php5: MOPS-2010-047/048 information leak [bnc#612555] + * VUL-0: php5: MOPS-2010-049/50/51/52/53/54/55 memory corruption and/or info leak [bnc#612556] + * VUL-0: PHP5: Session Data Injection Vulnerability [bnc#619483] + * VUL-0: PHP5: multiple heap based buffer overflows [bnc#619486] + * bugzilla numbers 619487,619489,619469,609766.. + +------------------------------------------------------------------- +Tue Jul 20 03:15:19 UTC 2010 - cristian.rodriguez@opensuse.org + +- Update to PHP 5.3.3 RC3 +- Massive lot of security fixes see list + here http://www.php-security.org/category/vulnerabilities/index.html + +------------------------------------------------------------------- +Tue Jun 1 16:32:20 UTC 2010 - cristian.rodriguez@opensuse.org + +- possible fix for [bnc#610633] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Registry.php php-5.3.2.tar.bz2 suhosin-0.9.31.tgz suhosin-patch-5.3.2-0.9.9.1.patch.gz New: ---- install-pear-nozlib.phar php-5.3.3_svn201010272135.tar.xz php-fpm.init suhosin-0.9.32.1.tar.gz suhosin-patch-5.3.3-0.9.10.patch.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package php5 (Version 5.3.2) +# spec file for package php5 (Version 5.3.3_svn201010272135) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,17 +21,17 @@ Name: php5 %global apiver 20090626 %global zendver 20090626 -%define suhosin_version 0.9.31 -%define suhosin_patch_version 0.9.9.1 +%define suhosin_version 0.9.32.1 +%define suhosin_patch_version 0.9.10 %define with_suhosin_patch 0 %define pkg_name php5 %define with_spell 1 -BuildRequires: apache2-devel curl-devel freetype2-devel gcc-c++ libpng-devel xorg-x11-devel +BuildRequires: apache2-devel bison curl-devel freetype2-devel gcc-c++ libpng-devel xorg-x11-devel BuildRequires: db-devel enchant-devel gmp-devel imap-devel libicu-devel libtidy-devel BuildRequires: libtiff-devel libxslt-devel mm-devel mysql-devel net-snmp-devel openldap2-devel BuildRequires: pam-devel pkgconfig postfix postgresql-devel unixODBC-devel update-alternatives -BuildRequires: krb5-devel libmcrypt-devel +BuildRequires: krb5-devel libevent-devel libmcrypt-devel %if %{with_spell} BuildRequires: aspell-devel @@ -58,6 +58,7 @@ #10.3 does not install sendmail binary with the minimal system Requires: smtp_daemon %endif +BuildRequires: xz %define extension_dir %{_libdir}/%{pkg_name}/extensions %define peardir %{_datadir}/%{pkg_name}/PEAR %define php_sysconf %{_sysconfdir}/%{pkg_name} @@ -76,7 +77,7 @@ #define builtin_tz_ver 2007.9 ### ### -Version: 5.3.2 +Version: 5.3.3_svn201010272135 Release: 1 License: The PHP License, version 3.01 Group: Development/Languages/Other @@ -87,21 +88,20 @@ 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-%{version}.tar.xz Source1: php-suse-addons.tar.bz2 -Source2: suhosin-%{suhosin_version}.tgz +Source2: suhosin-%{suhosin_version}.tar.gz Source4: README.SUSE-pear -#until it gets fixed in upstream... -Source5: Registry.php Source6: macros.php +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 -#home made hack to really build against libedit -#Patch5: php5-really-with-libedit.patch +#currently disabled, on purpose ! %if %{with_suhosin_patch} -Patch6: suhosin-patch-%{version}-%{suhosin_patch_version}.patch.gz +Patch6: suhosin-patch-5.3.3-%{suhosin_patch_version}.patch.gz %endif Patch7: php-5.3.1-systzdata-v7.patch #bugs @@ -222,7 +222,7 @@ Group: Development/Libraries/PHP Requires: %{name} = %{version} PreReq: update-alternatives -Provides: php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter +Provides: php-xml php-fastcgi php-cgi php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter %description fastcgi PHP is a server-side, cross-platform HTML embedded scripting language. @@ -241,6 +241,31 @@ The PHP Group See http://www.php.net/credits.php for more details +%package fpm +License: The PHP License, version 3.01 +Summary: FastCGI Process Manager PHP5 Module +Group: Development/Libraries/PHP +Requires: %{name} = %{version} +PreReq: update-alternatives %insserv_prereq +Provides: php-fpm php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter + +%description fpm + PHP is a server-side, cross-platform HTML embedded scripting language. + If you are completely new to PHP and want to get some idea of how it + works, have a look at the Introductory tutorial. Once you get beyond + that have a look at the example archive sites and some of the other + resources available in the links section. + + Please refer to /usr/share/doc/packages/php5/README.FastCGI for + information on how to use this module. + + +{> +(>Authors: + -------- + The PHP Group + See http://www.php.net/credits.php for more details + %package bcmath License: The PHP License, version 3.01 Provides: php-bcmath @@ -1172,12 +1197,13 @@ %{__tar} xf %{S:2} -C ext %{__mv} ext/suhosin-%{suhosin_version} ext/suhosin %{__cp} %{S:4} pear/README.SUSE +%{__cp} %{S:7} pear/ #patch0 -p1 %patch2 %patch3 %patch4 %if %{with_suhosin_patch} -%patch6 -p1 +%patch6 %endif %patch7 %if %{need_libxml2_hack} @@ -1193,11 +1219,12 @@ %patch22 %patch23 %patch24 -%patch25 -p1 +%patch25 # we build three SAPI -%{__mkdir_p} build-apache2 +%{__mkdir_p} build-apache2 build-fpm %{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi %{__mkdir_p} build-cli/ext/sqlite/libsqlite/src/ + # THis happends only with bison 1.875 %if 0%{?suse_version} < 1010 # our bison seems to generate wrong parser, so use the pregenerated ones... @@ -1233,7 +1260,6 @@ fi %build -#find %{_libdir} -name "*.la" | xargs grep 'dependency_libs=''' # Force use of system libtool(when newer than the included) #get rid of bundled libraries which are not used in 10.2 and later %if 0%{?suse_version} > 1010 @@ -1241,11 +1267,11 @@ %endif # regenerate configure etc. # workaround: suhosin-patch updates timestamp of configure, confusing buildconf -%{__rm} configure +%{__rm} -f configure ./buildconf --force # export flags -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -pipe" -CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -pipe" +CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing -pipe" +CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing -pipe" %if 0%{?suse_version} > 1000 CFLAGS="$CFLAGS -fstack-protector" CXXFLAGS="$CXXFLAGS -fstack-protector" @@ -1322,6 +1348,14 @@ --bindir=%{_bindir} \ --disable-cli \ --disable-all \ + +Build fpm \ + --with-mm \ + --enable-fpm \ + --bindir=%{_bindir} \ + --disable-cli \ + --disable-all\ + # cli sapi with all shared modules # Hack the built configure to also link ncurses together with libedit. # this is reported upstream bug http://bugs.php.net/bug.php?id=21153 @@ -1457,11 +1491,13 @@ %{__mv} %{buildroot}%{apache2_libexecdir}/libphp5.so %{buildroot}%{apache2_libexecdir}/mod_php5.so Install fastcgi Install cli +Install fpm # generate php.ini from php.ini-production: %{__install} -d -m 755 %{buildroot}/%{php_sysconf}/conf.d %{__install} -d -m 755 %{buildroot}/%{php_sysconf}/apache2 %{__install} -d -m 755 %{buildroot}/%{php_sysconf}/cli %{__install} -d -m 755 %{buildroot}/%{php_sysconf}/fastcgi +%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/fpm %{__sed} "s=@extdir@=%{extension_dir}=" php.ini-production \ > %{buildroot}/%{php_sysconf}/apache2/php.ini %{__sed} "s=@extdir@=%{extension_dir}=" php.ini-production \ @@ -1508,10 +1544,6 @@ %{__mv} sapi/cgi/README.FastCGI README.FastCGI %{__rm} -rf %{buildroot}/{.channels,.depdb*,.filemap,.lock,usr/bin/peardev} %{__install} -d -m 0755 %{buildroot}/%{peardir}/test -# fix deadlock -%{__cp} %{S:5} %{buildroot}/%{peardir}/PEAR -# reminder: Will be removed when upstream fixes deadlock in pear -test %version = 5.3.2 # for pear XML files %{__install} -d -m 0755 %{buildroot}/var/lib/pear # provide compat symlink @@ -1528,6 +1560,10 @@ install -m 644 -c macros.php \ $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php +#install fpm init script. +install -d %{buildroot}%{_sysconfdir}/init.d +install -m 755 -c %{S:8} %{buildroot}%{_sysconfdir}/init.d/php-fpm + %post update-alternatives --install %{_bindir}/php php %{_bindir}/php5 5 \ --slave %{_mandir}/man1/php.1.gz php.1 %{_mandir}/man1/php5.1.gz @@ -1600,6 +1636,16 @@ %postun -n apache2-mod_php5 %restart_on_update apache2 +%postun fpm +%restart_on_update php-fpm +%insserv_cleanup + +%preun fpm +%stop_on_removal php-fpm + +%post fpm +%{fillup_and_insserv -f php-fpm} + %clean rm -rf %{buildroot} @@ -1642,6 +1688,14 @@ %dir %{php_sysconf}/fastcgi %config(noreplace) %{php_sysconf}/fastcgi/php.ini +%files fpm +%defattr(-, root, root) +%{_sbindir}/php-fpm5 +%dir %{php_sysconf}/fpm +%config %{php_sysconf}/fpm/php-fpm.conf.default +%{_mandir}/man8/php-fpm5.8.gz +%config /etc/init.d/php-fpm + %files -n apache2-mod_php5 %defattr(644,root,root,755) %{apache2_libexecdir}/mod_php5.so ++++++ php-5.3-session.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: ext/session/config.m4 =================================================================== --- ext/session/config.m4.orig 2009-07-28 10:59:08.000000000 +0200 -+++ ext/session/config.m4 2010-04-02 00:00:18.106149000 +0200 ++++ ext/session/config.m4 2010-08-03 06:31:20.968355000 +0200 @@ -12,7 +12,7 @@ if test "$PHP_SESSION" != "no"; then PHP_PWRITE_TEST PHP_PREAD_TEST ++++++ php-5.3.0-bnc513080.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: ext/exif/exif.c =================================================================== --- ext/exif/exif.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ ext/exif/exif.c 2010-04-02 00:00:17.386249000 +0200 ++++ ext/exif/exif.c 2010-08-03 06:31:20.024482000 +0200 @@ -66,7 +66,7 @@ #include "ext/standard/php_image.h" #include "ext/standard/info.h" ++++++ php-5.3.0-fix-rpmlint-errors.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: ext/intl/locale/locale_methods.c =================================================================== ---- ext/intl/locale/locale_methods.c.orig 2010-01-25 14:59:35.000000000 +0100 -+++ ext/intl/locale/locale_methods.c 2010-04-02 00:00:17.182233000 +0200 +--- ext/intl/locale/locale_methods.c.orig 2009-12-23 22:41:05.000000000 +0100 ++++ ext/intl/locale/locale_methods.c 2010-08-03 06:31:19.713445000 +0200 @@ -264,7 +264,7 @@ static char* get_icu_value_internal( cha UErrorCode status = U_ZERO_ERROR; ++++++ php-5.3.0-ldap-checks.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: ext/ldap/config.m4 =================================================================== --- ext/ldap/config.m4.orig 2007-09-26 17:44:16.000000000 +0200 -+++ ext/ldap/config.m4 2010-04-02 00:00:16.872236000 +0200 ++++ ext/ldap/config.m4 2010-08-03 06:31:19.419556000 +0200 @@ -50,7 +50,7 @@ AC_DEFUN([PHP_LDAP_SASL_CHECKS], [ SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2" fi ++++++ php-5.3.1-systzdata-v7.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -18,7 +18,7 @@ Index: ext/date/lib/parse_tz.c =================================================================== --- ext/date/lib/parse_tz.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ ext/date/lib/parse_tz.c 2010-04-02 00:00:16.631318000 +0200 ++++ ext/date/lib/parse_tz.c 2010-08-03 06:31:19.092553000 +0200 @@ -20,6 +20,16 @@ #include "timelib.h" @@ -598,7 +598,7 @@ Index: ext/date/lib/timelib.m4 =================================================================== --- ext/date/lib/timelib.m4.orig 2007-09-26 17:44:16.000000000 +0200 -+++ ext/date/lib/timelib.m4 2010-04-02 00:00:16.634331000 +0200 ++++ ext/date/lib/timelib.m4 2010-08-03 06:31:19.100527000 +0200 @@ -78,3 +78,17 @@ stdlib.h dnl Check for strtoll, atoll ++++++ php-5.3.2-aconf26x.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,12 +1,36 @@ - -Fix use of divert() to work with autoconf 2.6x. - -Index: configure.in -=================================================================== ---- configure.in.orig 2010-03-03 17:36:07.000000000 +0100 -+++ configure.in 2010-04-02 00:00:17.863156000 +0200 +--- scripts/phpize.m4.orig ++++ scripts/phpize.m4 +@@ -1,6 +1,6 @@ + dnl This file becomes configure.in for self-contained extensions. + +-divert(1) ++divert(1001) + + AC_PREREQ(2.13) + AC_INIT(config.m4) +--- ext/standard/config.m4.orig ++++ ext/standard/config.m4 +@@ -1,6 +1,6 @@ + dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*- + +-divert(3)dnl ++divert(1003)dnl + + dnl + dnl Check if flush should be called explicitly after buffered io +@@ -342,7 +342,7 @@ dnl + AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy) + AC_FUNC_FNMATCH + +-divert(5)dnl ++divert(1005)dnl + + dnl + dnl Check if there is a support means of creating a new process +--- configure.in.orig ++++ configure.in @@ -1,7 +1,7 @@ - ## $Id: configure.in 295792 2010-03-03 16:36:07Z johannes $ -*- autoconf -*- + ## $Id: configure.in 304088 2010-10-05 13:43:35Z tony2001 $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) @@ -50,36 +74,3 @@ dnl ## In diversion 5 we check which extensions should be compiled. dnl ## All of these are normally in the extension directories. -Index: ext/standard/config.m4 -=================================================================== ---- ext/standard/config.m4.orig 2010-02-22 01:34:22.000000000 +0100 -+++ ext/standard/config.m4 2010-04-02 00:00:17.880144000 +0200 -@@ -1,6 +1,6 @@ - dnl $Id: config.m4 295350 2010-02-22 00:34:22Z pajoye $ -*- autoconf -*- - --divert(3)dnl -+divert(1003)dnl - - dnl - dnl Check if flush should be called explicitly after buffered io -@@ -333,7 +333,7 @@ dnl - AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy) - AC_FUNC_FNMATCH - --divert(5)dnl -+divert(1005)dnl - - dnl - dnl Check if there is a support means of creating a new process -Index: scripts/phpize.m4 -=================================================================== ---- scripts/phpize.m4.orig 2009-12-02 18:42:58.000000000 +0100 -+++ scripts/phpize.m4 2010-04-02 00:00:17.886143000 +0200 -@@ -1,6 +1,6 @@ - dnl This file becomes configure.in for self-contained extensions. - --divert(1) -+divert(1001) - - AC_PREREQ(2.13) - AC_INIT(config.m4) ++++++ php-5.3.2-ini.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: php.ini-production =================================================================== ---- php.ini-production.orig 2009-11-05 14:29:34.000000000 +0100 -+++ php.ini-production 2010-04-02 00:00:17.674182000 +0200 +--- 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" ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -38,22 +38,25 @@ ; Whether to use cookies. ; http://php.net/session.use-cookies -@@ -1594,11 +1594,10 @@ session.entropy_length = 0 +@@ -1590,14 +1590,14 @@ 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 ; 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 + ; Windows random source (using the CryptoAPI) -;session.entropy_file = /dev/urandom --session.entropy_file = +session.entropy_file = /dev/urandom - ; http://php.net/session.entropy-length --;session.entropy_length = 16 -+session.entropy_length = 16 - ; Set to {nocache,private,public,} to determine HTTP caching aspects ; or leave this empty to avoid sending anti-caching headers. -@@ -1629,7 +1628,7 @@ session.use_trans_sid = 0 - ; the hash extension. A list of available hashes is returned by the hash_alogs() +@@ -1628,7 +1628,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 -session.hash_function = 0 ++++++ php-5.3.2-no-build-date.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,8 +1,6 @@ -Index: sapi/cgi/cgi_main.c -=================================================================== ---- sapi/cgi/cgi_main.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ sapi/cgi/cgi_main.c 2010-04-03 14:42:45.404083000 +0200 -@@ -1926,7 +1926,7 @@ consult the installation file that came +--- 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 @@ -10,11 +8,9 @@ + 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); - exit_status = 0; -Index: sapi/cli/php_cli.c -=================================================================== ---- sapi/cli/php_cli.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ sapi/cli/php_cli.c 2010-04-03 14:42:45.410100000 +0200 + fcgi_shutdown(); +--- sapi/cli/php_cli.c.orig ++++ sapi/cli/php_cli.c @@ -831,8 +831,8 @@ int main(int argc, char *argv[]) } @@ -26,11 +22,9 @@ #if ZEND_DEBUG && defined(HAVE_GCOV) "(DEBUG GCOV)", #elif ZEND_DEBUG -Index: ext/standard/info.c -=================================================================== ---- ext/standard/info.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ ext/standard/info.c 2010-04-03 14:44:31.369445000 +0200 -@@ -686,7 +686,7 @@ PHPAPI void php_print_info(int flag TSRM +--- ext/standard/info.c.orig ++++ ext/standard/info.c +@@ -697,7 +697,7 @@ PHPAPI void php_print_info(int flag TSRM php_info_print_box_end(); php_info_print_table_start(); php_info_print_table_row(2, "System", php_uname ); @@ -39,7 +33,7 @@ #ifdef COMPILER php_info_print_table_row(2, "Compiler", COMPILER); #endif -@@ -694,7 +694,7 @@ PHPAPI void php_print_info(int flag TSRM +@@ -705,7 +705,7 @@ PHPAPI void php_print_info(int flag TSRM php_info_print_table_row(2, "Architecture", ARCHITECTURE); #endif #ifdef CONFIGURE_COMMAND @@ -48,3 +42,14 @@ #endif if (sapi_module.pretty_name) { +--- sapi/fpm/fpm/fpm_main.c.orig ++++ sapi/fpm/fpm/fpm_main.c +@@ -1684,7 +1684,7 @@ int main(int argc, char *argv[]) + #if ZEND_DEBUG + php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 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-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s (%s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); + #endif + php_request_shutdown((void *) 0); + fcgi_shutdown(); ++++++ php-cloexec.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,8 +1,8 @@ -diff --git a/ext/standard/exec.c b/ext/standard/exec.c -index 5850026..efc1aa3 100644 ---- a/ext/standard/exec.c -+++ b/ext/standard/exec.c -@@ -107,8 +107,12 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_ +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, #ifdef PHP_WIN32 fp = VCWD_POPEN(cmd_p, "rb"); #else @@ -15,10 +15,10 @@ if (!fp) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to fork [%s]", cmd); goto err; -diff --git a/ext/standard/file.c b/ext/standard/file.c -index 704ef12..e03a661 100644 ---- a/ext/standard/file.c -+++ b/ext/standard/file.c +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) } } @@ -33,11 +33,11 @@ if (PG(safe_mode)){ b = strchr(command, ' '); if (!b) { -diff --git a/ext/standard/mail.c b/ext/standard/mail.c -index ab65f16..ed421e0 100644 ---- a/ext/standard/mail.c -+++ b/ext/standard/mail.c -@@ -288,8 +288,12 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char +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 * (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-fpm.init ++++++ #!/bin/sh # # Template SUSE system startup script for example service/daemon php-fpm # Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc. # # This library is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2.1 of the License, or (at # your option) any later version. # # This library is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, # USA. # # /etc/init.d/php-fpm # and its symbolic link # /(usr/)sbin/rcphp-fpm # # Template system startup script for some example service/daemon php-fpm # # LSB compatible service control script; see http://www.linuxbase.org/spec/ # # Note: This template uses functions rc_XXX defined in /etc/rc.status on # UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your # script on this template and ensure that it works on non UL based LSB # compliant Linux distributions, you either have to provide the rc.status # functions from UL or change the script to work without them. # See skeleton.compat for a template that works with other distros as well. # ### BEGIN INIT INFO # Provides: php-fpm # Required-Start: $remote_fs $network # Should-Start: nginx lighttpd httpd # Required-Stop: $network $remote_fs # Should-Stop: nginx lighttpd httpd # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: php-fpm daemon # Description: Start php-fpm to # continued on second line by '#<TAB>' # should contain enough info for the runlevel editor # to give admin some idea what this service does and # what it's needed for ... # (The Short-Description should already be a good hint.) ### END INIT INFO # # Any extensions to the keywords given above should be preceeded by # X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. # # Notes on Required-Start/Should-Start: # * There are two different issues that are solved by Required-Start # and Should-Start # (a) Hard dependencies: This is used by the runlevel editor to determine # which services absolutely need to be started to make the start of # this service make sense. Example: nfsserver should have # Required-Start: $portmap # Also, required services are started before the dependent ones. # The runlevel editor will warn about such missing hard dependencies # and suggest enabling. During system startup, you may expect an error, # if the dependency is not fulfilled. # (b) Specifying the init script ordering, not real (hard) dependencies. # This is needed by insserv to determine which service should be # started first (and at a later stage what services can be started # in parallel). The tag Should-Start: is used for this. # It tells, that if a service is available, it should be started # before. If not, never mind. # * When specifying hard dependencies or ordering requirements, you can # use names of services (contents of their Provides: section) # or pseudo names starting with a $. The following ones are available # according to LSB (1.1): # $local_fs all local file systems are mounted # (most services should need this!) # $remote_fs all remote file systems are mounted # (note that /usr may be remote, so # many services should Require this!) # $syslog system logging facility up # $network low level networking (eth card, ...) # $named hostname resolution available # $netdaemons all network daemons are running # The $netdaemons pseudo service has been removed in LSB 1.2. # For now, we still offer it for backward compatibility. # These are new (LSB 1.2): # $time the system time has been set correctly # $portmap SunRPC portmapping service available # UnitedLinux extensions: # $ALL indicates that a script should be inserted # at the end # * The services specified in the stop tags # (Required-Stop/Should-Stop) # specify which services need to be still running when this service # is shut down. Often the entries there are just copies or a subset # from the respective start tag. # * Should-Start/Stop are now part of LSB as of 2.0, # formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. # insserv does support both variants. # * X-UnitedLinux-Default-Enabled: yes/no is used at installation time # (%fillup_and_insserv macro in %post of many RPMs) to specify whether # a startup script should default to be enabled after installation. # It's not used by insserv. # # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) # # Note on script names: # http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html # A registry has been set up to manage the init script namespace. # http://www.lanana.org/ # Please use the names already registered or register one or use a # vendor prefix. # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance PHPFPM_BIN=/usr/sbin/php-fpm5 test -x $PHPFPM_BIN || { echo "$PHPFPM_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } FPM_CONFIG="--fpm-config /etc/php5/fpm/php-fpm.conf" # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. # This is currently not used by UnitedLinux based distributions and # not needed for init scripts for UnitedLinux only. If it is used, # the functions from rc.status should not be sourced or used. #. /lib/lsb/init-functions # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) echo -n "Starting php-fpm" ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. /sbin/startproc $PHPFPM_BIN $FPM_CONFIG # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down php-fpm " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. /sbin/killproc -QUIT $PHPFPM_BIN # Remember status and be verbose rc_status -v ;; try-restart|condrestart) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart the service if it ## is running. echo -n "Reload service php-fpm" ## if it supports it: /sbin/killproc -USR2 $PHPFPM_BIN rc_status -v ## Otherwise: #$0 try-restart #rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signaling, do nothing (!) # If it supports signaling: echo -n "Reload service php-fpm " /sbin/killproc -USR2 $PHPFPM_BIN rc_status -v ## Otherwise if it does not support reload: #rc_failed 3 #rc_status -v ;; status) echo -n "Checking for service php-fpm " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service up and running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running (unused) # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. /sbin/checkproc $PHPFPM_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" exit 1 ;; esac rc_exit ++++++ php5-apache_sapi_install.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -7,7 +7,7 @@ Index: sapi/apache2handler/config.m4 =================================================================== --- sapi/apache2handler/config.m4.orig 2008-03-11 23:47:39.000000000 +0100 -+++ sapi/apache2handler/config.m4 2010-04-02 00:00:15.311457000 +0200 ++++ sapi/apache2handler/config.m4 2010-08-03 06:31:18.512616000 +0200 @@ -68,18 +68,9 @@ if test "$PHP_APXS2" != "no"; then fi ++++++ php5-php-config.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -5,7 +5,7 @@ Index: scripts/php-config.in =================================================================== --- scripts/php-config.in.orig 2007-08-24 13:44:10.000000000 +0200 -+++ scripts/php-config.in 2010-04-02 00:00:16.440342000 +0200 ++++ scripts/php-config.in 2010-08-03 06:31:18.786529000 +0200 @@ -5,7 +5,7 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" version="@PHP_VERSION@" ++++++ php5-phpize.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -5,8 +5,8 @@ Index: scripts/Makefile.frag =================================================================== ---- scripts/Makefile.frag.orig 2005-11-22 00:08:02.000000000 +0100 -+++ scripts/Makefile.frag 2010-04-02 00:00:15.074448000 +0200 +--- scripts/Makefile.frag.orig 2010-07-13 19:24:13.000000000 +0200 ++++ scripts/Makefile.frag 2010-08-03 06:31:18.109614000 +0200 @@ -3,8 +3,8 @@ # Build environment install # @@ -21,7 +21,7 @@ Index: scripts/phpize.in =================================================================== --- scripts/phpize.in.orig 2009-06-24 09:42:33.000000000 +0200 -+++ scripts/phpize.in 2010-04-02 00:00:15.080427000 +0200 ++++ scripts/phpize.in 2010-08-03 06:31:18.115618000 +0200 @@ -3,8 +3,8 @@ # Variable declaration prefix='@prefix@' ++++++ suhosin-patch-5.3.2-0.9.9.1.patch.gz -> suhosin-patch-5.3.3-0.9.10.patch.gz ++++++ Files php5/suhosin-patch-5.3.2-0.9.9.1.patch.gz and php5/suhosin-patch-5.3.3-0.9.10.patch.gz differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de