Merge branch 'PHP_5_5' into PHP_5_6

Conflicts:
	php.spec

diff --git a/bug-52448.patch b/bug-52448.patch
deleted file mode 100644 (file)
index b15ea82..0000000
--- a/bug-52448.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- php-5.3.3/ext/curl/tests/curl_error_basic.phpt~    2009-07-03 03:09:08.000000000 +0300
-+++ php-5.3.3/ext/curl/tests/curl_error_basic.phpt     2010-07-26 21:02:34.822382923 +0300
-@@ -30,4 +30,4 @@
- ?>
- --EXPECT--
- == Testing curl_error with a fake URL ==
--Error: Couldn't resolve host 'fakeURL'
-+Error: Could not resolve host: fakeURL (Domain name not found)

diff --git a/mysqlnd-shared.patch b/mysqlnd-shared.patch
deleted file mode 100644 (file)
index 43eceb6..0000000
--- a/mysqlnd-shared.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- php-5.4.0alpha2/ext/mysqlnd/config9.m4~    2011-03-23 19:14:28.000000000 +0200
-+++ php-5.4.0alpha2/ext/mysqlnd/config9.m4     2011-08-07 12:45:42.205921715 +0300
-@@ -28,7 +28,7 @@
-   AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
- 
-   mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
--  PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
-+  PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, yes)
-   PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
-   PHP_INSTALL_HEADERS([ext/mysqlnd/])
- fi
---- php-5.3.2/ext/mysqlnd/php_mysqlnd.c~       2010-01-20 19:09:28.000000000 +0200
-+++ php-5.3.2/ext/mysqlnd/php_mysqlnd.c        2010-04-14 09:18:30.725599897 +0300
-@@ -273,6 +273,9 @@
- };
- /* }}} */
- 
-+#ifdef COMPILE_DL_MYSQLND
-+ZEND_GET_MODULE(mysqlnd)
-+#endif
- 
- /*
-  * Local variables:

diff --git a/php-curl-limit-speed.patch b/php-curl-limit-speed.patch
deleted file mode 100644 (file)
index 8348dd4..0000000
--- a/php-curl-limit-speed.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- php-5.2.5.orig/ext/curl/interface.c        2008-03-26 17:05:19.000000000 +0100
-+++ php-5.2.5/ext/curl/interface.c     2008-03-26 17:09:05.000000000 +0100
-@@ -462,6 +462,14 @@
-       REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY);
- #endif
-       REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
-+
-+/* Added constants to support limiting the transfer speed in PHP */
-+/* Fixed by Tijnema (admin@tijnema.info) */
-+#if LIBCURL_VERSION_NUM > 0x070fff /* CURLOPT_MAX_SEND_SPEED_LARGE and CURLOPT_MAX_SEND_SPEED_LARGE are available since curl 7.16.0 */
-+      REGISTER_CURL_CONSTANT(CURLOPT_MAX_SEND_SPEED_LARGE);
-+      REGISTER_CURL_CONSTANT(CURLOPT_MAX_RECV_SPEED_LARGE);
-+#endif
-+
-       REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
-       REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
-       REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
-@@ -1288,6 +1296,12 @@
- #if LIBCURL_VERSION_NUM > 0x070b01 /* CURLOPT_TCP_NODELAY is available since curl 7.11.2 */
-               case CURLOPT_TCP_NODELAY:
- #endif
-+/* Added case options to support limiting the transfer speed in PHP */
-+/* Fixed by Tijnema (admin@tijnema.info) */
-+#if LIBCURL_VERSION_NUM > 0x070fff /* CURLOPT_MAX_SEND_SPEED_LARGE and CURLOPT_MAX_SEND_SPEED_LARGE are available since curl 7.16.0 */
-+              case CURLOPT_MAX_SEND_SPEED_LARGE:
-+              case CURLOPT_MAX_RECV_SPEED_LARGE:
-+#endif
-                       convert_to_long_ex(zvalue);
-                       error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
-                       break;

diff --git a/php-gd_imagerotate_enable.patch b/php-gd_imagerotate_enable.patch
deleted file mode 100644 (file)
index 6d1e74c..0000000
--- a/php-gd_imagerotate_enable.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -ur php5.3-200812262130/ext/gd/config.m4 mod/ext/gd/config.m4
---- php5.3-200812262130/ext/gd/config.m4       2008-07-18 04:34:20.000000000 +0200
-+++ mod/ext/gd/config.m4       2008-12-27 01:12:23.000000000 +0100
-@@ -255,6 +255,7 @@
-   PHP_CHECK_LIBRARY(gd, gdFreeFontCache,        [AC_DEFINE(HAVE_GD_FREEFONTCACHE,    1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
-   PHP_CHECK_LIBRARY(gd, gdFontCacheMutexSetup,  [AC_DEFINE(HAVE_GD_FONTMUTEX,        1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
-   PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,      [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
-+  PHP_CHECK_LIBRARY(gd, gdImageRotate,          [AC_DEFINE(HAVE_GD_ROTATE,           1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
- ])
- 
- dnl
-@@ -308,6 +309,7 @@
-   AC_DEFINE(HAVE_GD_FONTMUTEX,        1, [ ])
-   AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])
-   AC_DEFINE(HAVE_GD_GIF_CTX,          1, [ ])
-+  AC_DEFINE(HAVE_GD_ROTATE,           1, [ ])
- 
- dnl Make sure the libgd/ is first in the include path
-   GDLIB_CFLAGS="-DHAVE_LIBPNG"
-diff -ur php5.3-200812262130/ext/gd/gd.c mod/ext/gd/gd.c
---- php5.3-200812262130/ext/gd/gd.c    2008-12-12 14:35:20.000000000 +0100
-+++ mod/ext/gd/gd.c    2008-12-27 01:18:43.000000000 +0100
-@@ -296,7 +296,7 @@
- ZEND_END_ARG_INFO()
- #endif
- 
--#ifdef HAVE_GD_BUNDLED
-+#ifdef HAVE_GD_ROTATE
- ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
-       ZEND_ARG_INFO(0, im)
-       ZEND_ARG_INFO(0, angle)
-@@ -927,9 +927,12 @@
-       PHP_FE(imagegrabscreen,                                                 arginfo_imagegrabscreen)
- #endif
- 
-+#ifdef HAVE_GD_ROTATE
-+      PHP_FE(imagerotate,                                                     arginfo_imagerotate)
-+#endif
-+
- #ifdef HAVE_GD_BUNDLED
--      PHP_FE(imagerotate,                                                     arginfo_imagerotate)
--      PHP_FE(imageantialias,                                                  arginfo_imageantialias)
-+      PHP_FE(imageantialias,                                                  arginfo_imageantialias)
- #endif
- 
- #if HAVE_GD_IMAGESETTILE
-@@ -1079,7 +1082,7 @@
-       PHP_INI_ENTRY("gd.jpeg_ignore_warning", "0", PHP_INI_ALL, NULL)
- PHP_INI_END()
- /* }}} */
--      
-+
- /* {{{ php_free_gd_image
-  */
- static void php_free_gd_image(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-@@ -1140,7 +1143,7 @@
- #endif
- 
-       REGISTER_INI_ENTRIES();
--      
-+
-       REGISTER_LONG_CONSTANT("IMG_GIF", 1, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("IMG_JPG", 2, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("IMG_JPEG", 2, CONST_CS | CONST_PERSISTENT);
-@@ -1168,11 +1171,14 @@
- #ifdef GD2_FMT_COMPRESSED
-       REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
- #endif
--#if HAVE_GD_BUNDLED
-+#if HAVE_GD_ROTATE
-       REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("IMG_EFFECT_OVERLAY", gdEffectOverlay, CONST_CS | CONST_PERSISTENT);
-+#endif
-+
-+#if HAVE_GD_BUNDLED
-       REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT);
- 
-       /* Section Filters */
-@@ -1760,7 +1766,7 @@
-       long cx, cy, w, h, ST, E, col, style;
-       gdImagePtr im;
-       int e, st;
--      
-+
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllllllll", &IM, &cx, &cy, &w, &h, &ST, &E, &col, &style) == FAILURE) {
-               return;
-       }
-@@ -2008,7 +2014,7 @@
-       if ( handle == 0 ) {
-               goto clean;
-       }
--      pPrintWindow = (tPrintWindow) GetProcAddress(handle, "PrintWindow");  
-+      pPrintWindow = (tPrintWindow) GetProcAddress(handle, "PrintWindow");
- 
-       if ( pPrintWindow )  {
-               pPrintWindow(window, memDC, (UINT) client_area);
-@@ -2105,7 +2111,7 @@
- /* }}} */
- #endif /* PHP_WIN32 */
- 
--#ifdef HAVE_GD_BUNDLED
-+#ifdef HAVE_GD_ROTATE
- /* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor [, int ignoretransparent])
-    Rotate an image using a custom angle */
- PHP_FUNCTION(imagerotate)
-@@ -3362,7 +3368,7 @@
- {
-       zval *IM;
-       gdImagePtr im;
--      
-+
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &IM) == FAILURE) {
-               return;
-       }
-@@ -3946,7 +3952,7 @@
-                       if (zend_hash_get_current_data_ex(HASH_OF(EXT), (void **) &item, &pos) == FAILURE) {
-                               continue;
-                       }
--              
-+
-                       if (strcmp("linespacing", key) == 0) {
-                               convert_to_double_ex(item);
-                               strex.flags |= gdFTEX_LINESPACE;
-@@ -3972,7 +3978,7 @@
- #endif
- 
-       PHP_GD_CHECK_OPEN_BASEDIR((char *)fontname, "Invalid font filename");
--      
-+
- #ifdef USE_GD_IMGSTRTTF
- # if HAVE_GD_STRINGFTEX
-       if (extended) {
-@@ -4373,11 +4379,11 @@
-       if (argc != 3 && argc != 6) {
-               ZEND_WRONG_PARAM_COUNT();
-       }
--      
-+
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "srl|lld", &str, &str_len, &fnt, &sz, &sp, &wd, &angle) == FAILURE) {
-               return;
-       }
--      
-+
-       if (argc == 6) {
-               space = sp;
-               add_width = wd;
-@@ -4562,7 +4568,7 @@
- #ifdef HAVE_GD_JPG
-     long ignore_warning;
- #endif
--      
-+
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sslll", &f_org, &f_org_len, &f_dest, &f_dest_len, &height, &width, &threshold) == FAILURE) {
-               return;
-       }
-diff -ur php5.3-200812262130/ext/gd/php_gd.h mod/ext/gd/php_gd.h
---- php5.3-200812262130/ext/gd/php_gd.h        2008-07-18 04:34:20.000000000 +0200
-+++ mod/ext/gd/php_gd.h        2008-12-27 01:20:04.000000000 +0100
-@@ -119,8 +119,11 @@
- PHP_FUNCTION(imagegrabscreen);
- #endif
- 
--#ifdef HAVE_GD_BUNDLED
-+#ifdef HAVE_GD_ROTATE
- PHP_FUNCTION(imagerotate);
-+#endif
-+
-+#ifdef HAVE_GD_BUNDLED
- PHP_FUNCTION(imageantialias);
- #endif
- 

diff --git a/php-krb5-ac.patch b/php-krb5-ac.patch
deleted file mode 100644 (file)
index c7bddd1..0000000
--- a/php-krb5-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-5.3.3/acinclude.m4.orig        2010-10-19 21:38:42.000000000 +0200
-+++ php-5.3.3/acinclude.m4     2010-10-19 22:53:11.792893220 +0200
-@@ -2252,7 +2252,7 @@
-     KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi`
-     KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi`
- 
--    if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then
-+    if test -n "$KERBEROS_LIBS" || test -n "$KERBEROS_CFLAGS"; then
-       found_kerberos=yes
-       PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
-       PHP_EVAL_INCLINE($KERBEROS_CFLAGS)

diff --git a/php-m4-divert.patch b/php-m4-divert.patch
deleted file mode 100644 (file)
index f4e5bb5..0000000
--- a/php-m4-divert.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ur php-5.3.0.org/configure.in php-5.3.0/configure.in
---- php-5.3.0.org/configure.in 2009-06-26 17:44:18.000000000 +0200
-+++ php-5.3.0/configure.in     2009-08-18 12:45:19.126841759 +0200
-@@ -1,7 +1,7 @@
- ## $Id$ -*- autoconf -*-
- dnl ## Process this file with autoconf to produce a configure script.
- 
--divert(1)
-+divert(1001)
- 
- dnl ## Diversion 1 is the autoconf + automake setup phase. We also
- dnl ## set the PHP version, deal with platform-specific compile
-@@ -308,7 +308,7 @@
- sinclude(TSRM/tsrm.m4)
- 
- 
--divert(2)
-+divert(1002)
- 
- dnl ## Diversion 2 is where we set PHP-specific options and come up
- dnl ## with reasonable default values for them. We check for pthreads here
-@@ -347,7 +347,7 @@
-   PTHREADS_FLAGS
- fi
- 
--divert(3)
-+divert(1003)
- 
- dnl ## In diversion 3 we check for compile-time options to the PHP
- dnl ## core and how to deal with different system dependencies. 
-@@ -702,7 +702,7 @@
-   PHP_CRYPT_R_STYLE
- fi
- 
--divert(4)
-+divert(1004)
- 
- dnl ## In diversion 4 we check user-configurable general settings.
- 
-@@ -943,7 +943,7 @@
-   AC_MSG_RESULT([using system default])
- fi
- 
--divert(5)
-+divert(1005)
- 
- dnl ## In diversion 5 we check which extensions should be compiled.
- dnl ## All of these are normally in the extension directories.
-diff -ur php-5.3.0.org/ext/standard/config.m4 php-5.3.0/ext/standard/config.m4
---- php-5.3.0.org/ext/standard/config.m4       2009-01-12 00:37:16.000000000 +0100
-+++ php-5.3.0/ext/standard/config.m4   2009-08-18 12:45:19.130174674 +0200
-@@ -1,6 +1,6 @@
- dnl $Id$ -*- autoconf -*-
- 
--divert(3)dnl
-+divert(1003)dnl
- 
- dnl
- dnl Check if flush should be called explicitly after buffered io
-@@ -220,7 +220,7 @@
- AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
- AC_FUNC_FNMATCH       
- 
--divert(5)dnl
-+divert(1005)dnl
- 
- dnl
- dnl Check if there is a support means of creating a new process
-diff -ur php-5.3.0.org/scripts/phpize.m4 php-5.3.0/scripts/phpize.m4
---- php-5.3.0.org/scripts/phpize.m4    2009-06-02 21:54:03.000000000 +0200
-+++ php-5.3.0/scripts/phpize.m4        2009-08-18 12:45:19.126841759 +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)

diff --git a/php-m4.patch b/php-m4.patch
deleted file mode 100644 (file)
index e7981a4..0000000
--- a/php-m4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-5.3.7/build/buildcheck.sh~     2011-05-18 21:55:34.000000000 +0200
-+++ php-5.3.7/build/buildcheck.sh      2011-08-20 18:28:38.223862911 +0200
-@@ -51,7 +51,7 @@
-   echo "           On Debian/Ubuntu both autoconf2.13 and autoconf2.59 packages exist."
-   echo "           Install autoconf2.13 and set the PHP_AUTOCONF env var to "
-   echo "           autoconf2.13 and try again."
--  exit 1
-+  echo "           CONTINUING ANYWAY."
- else
-   echo "buildconf: autoconf version $ac_version (ok)"
- fi

diff --git a/php-mod_php.conf b/php-mod_php.conf
index 9a9f298fb5aaf860de1f57bf64e829b2ae67c192..a5f5f592dc5771496ad51bbc8bafd3ae5cfec4bf 100644 (file)
--- a/php-mod_php.conf
+++ b/php-mod_php.conf
@@ -19,4 +19,14 @@ LoadModule php5_module modules/libphp5.so
        <Files *.phtml>
                AddType application/x-httpd-php .phtml
        </Files>
+
+       # Uncomment to disable php in user directories.
+       # To re-enable php in user directories comment the following lines
+       # (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
+       # prevents .htaccess files from disabling it.
+#      <IfModule mod_userdir.c>
+#              <Directory /home/users/*/public_html>
+#                      php_admin_value engine Off
+#              </Directory>
+#      </IfModule>
 </IfModule>

diff --git a/php-zlib.patch b/php-zlib.patch
deleted file mode 100644 (file)
index 1ee4b30..0000000
--- a/php-zlib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -burN php-5.0.0b3/ext/zlib/zlib.c php-5.0.0b3-zlib/ext/zlib/zlib.c
---- php-5.0.0b3/ext/zlib/zlib.c        2003-09-26 10:09:53.000000000 +0200
-+++ php-5.0.0b3-zlib/ext/zlib/zlib.c   2003-12-27 00:40:53.000000000 +0100
-@@ -979,6 +979,11 @@
- 
-       if (ZLIBG(output_handler) && strlen(ZLIBG(output_handler))) {
-               php_start_ob_buffer_named(ZLIBG(output_handler), 0, 1 TSRMLS_CC);
-+              if (sapi_add_header("Content-Encoding: gzip", sizeof("Content-Encoding: gzip") - 1        , 1)!=FAILURE) {
-+                      if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
-+                              SG(sapi_headers).send_default_content_type = 0;
-+                      }
-+              }
-       }
-       return SUCCESS;
- }

diff --git a/php.spec b/php.spec
index 84f3a68190c48e4303bcd6787c9e8dabd1091a64..cebc18be1e43ca6101083007574c98aeae828296 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -3,13 +3,11 @@
 # - enable --with-fpm-systemd, but ensure it checks for sd_booted()
 # - build with system libgd 2.1, see 73c5128
 # TODO 5.4:
-# - do not remove PatchX: definitions until merged to HEAD, needed for tracking their state
 # - check php-sapi-ini-file.patch for safe mode removal
 # - update imap annotations patch (needs api porting)
 # - update imap myrights patch (needs api porting)
 # --with-libmbfl=DIR      MBSTRING: Use external libmbfl.  DIR is the libmbfl base install directory BUNDLED
 # --with-onig=DIR         MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
-# - uses libvpx for webp support, should use libwebp-devel instead?
 # NOTE: mysqlnd does not support ssl or compression (see FAQ at http://dev.mysql.com/downloads/connector/php-mysqlnd/)
 # UNPACKAGED EXTENSION NOTES:
 # - com_dotnet is Win32-only
@@ -47,7 +45,7 @@
 %bcond_with    interbase_inst  # use InterBase install., not Firebird  (BR: proprietary libs)
 %bcond_with    oci             # with Oracle oci8 extension module     (BR: proprietary libs)
 %bcond_without instantclient   # build Oracle oci8 extension module against oracle-instantclient package
-%bcond_with    system_gd       # with system gd (we prefer internal since it enables few more features)
+%bcond_with    system_gd       # with system gd (imageantialias function is missing then)
 %bcond_with    system_libzip   # with system libzip (reported broken currently)
 %bcond_with    default_php     # use this PHP as default PHP in distro
 %bcond_without curl            # without CURL extension module
@@ -182,10 +180,8 @@ Patch11:   embed.patch
 Patch12:       http://ilia.ws/patch/type_hint_53_v2.txt
 %endif
 Patch14:       %{orgname}-no_pear_install.patch
-#Patch15:      %{orgname}-zlib.patch # no longer needed?
 Patch17:       %{orgname}-readline.patch
 Patch18:       %{orgname}-nohttpd.patch
-Patch19:       %{orgname}-gd_imagerotate_enable.patch
 Patch20:       %{orgname}-uint32_t.patch
 Patch21:       %{orgname}-dba-link.patch
 Patch22:       %{orgname}-both-apxs.patch
@@ -196,7 +192,6 @@ Patch26:    %{orgname}-pear.patch
 Patch27:       %{orgname}-config-dir.patch
 Patch29:       %{orgname}-fcgi-graceful.patch
 Patch31:       %{orgname}-fcgi-error_log-no-newlines.patch
-#Patch32:      %{orgname}-curl-limit-speed.patch # applied upstream
 Patch34:       %{orgname}-libtool.patch
 Patch35:       %{orgname}-tds.patch
 Patch36:       %{orgname}-mysql-charsetphpini.patch
@@ -210,20 +205,15 @@ Patch44:  %{orgname}-include_path.patch
 Patch45:       %{orgname}-imap-annotations.patch
 Patch46:       %{orgname}-imap-myrights.patch
 Patch47:       suhosin.patch
-#Patch49:      %{orgname}-m4-divert.patch # no longer needed, upstream supports new ac
 Patch50:       extension-shared-optional-dep.patch
 Patch51:       spl-shared.patch
 Patch52:       pcre-shared.patch
 Patch53:       fix-test-run.patch
-#Patch54:      mysqlnd-shared.patch # shared build supported upstream
 Patch55:       bug-52078-fileinode.patch
-#Patch57:      bug-52448.patch # outdated
 Patch59:       %{orgname}-systzdata.patch
 Patch60:       %{orgname}-oracle-instantclient.patch
-#Patch61:      %{orgname}-krb5-ac.patch # not needed on 5.4 anymore
 Patch62:       mcrypt-libs.patch
 Patch63:       %{orgname}-mysql-nowarning.patch
-#Patch64:      %{orgname}-m4.patch # not needed on 5.4 branch
 Patch65:       system-libzip.patch
 Patch66:       php-db.patch
 Patch67:       mysql-lib-ver-mismatch.patch
@@ -240,7 +230,6 @@ BuildRequires:      cyrus-sasl-devel
 BuildRequires: db-devel >= 4.0
 BuildRequires: elfutils-devel
 %{?with_enchant:BuildRequires: enchant-devel >= 1.1.3}
-#BuildRequires:        fcgi-devel
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 %{?with_system_libzip:BuildRequires:   libzip-devel >= 0.10.1-2}
 %{!?with_mysqlnd:BuildRequires:        mysql-devel}
@@ -261,7 +250,6 @@ BuildRequires:      libjpeg-devel
 BuildRequires: libltdl-devel >= 1.4
 BuildRequires: libmcrypt-devel >= 2.4.4
 BuildRequires: libpng-devel >= 1.0.8
-#BuildRequires:        libtiff-devel
 %{?with_webp:BuildRequires:    libvpx-devel}
 BuildRequires: tokyocabinet-devel
 %if "%{pld_release}" != "ac"
@@ -269,7 +257,6 @@ BuildRequires:      libtool >= 2:2.2
 %else
 BuildRequires: libtool >= 1.4.3
 %endif
-#BuildRequires:        libwrap-devel
 BuildRequires: libxml2-devel >= 1:2.7.6-4
 BuildRequires: libxslt-devel >= 1.1.0
 %{?with_mm:BuildRequires:      mm-devel >= 1.3.0}
@@ -309,9 +296,6 @@ BuildRequires:      apache-devel >= 2.0.52-2
 BuildRequires: apr-devel >= 1:1.0.0
 BuildRequires: apr-util-devel >= 1:1.0.0
 %endif
-%if %{with fpm}
-#BuildRequires:        judy-devel
-%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                php_sysconfdir          /etc/%{name}
@@ -322,6 +306,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                php_api_version         20131106
 %define                zend_module_api         20131226
 %define                zend_extension_api      220131226
+%define                php_pdo_api_version     20080721
 
 # Extension versions
 %define                bz2ver          1.0
@@ -336,7 +321,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                zipver          1.12.4
 %define                phpdbgver       0.4.0
 
-%define                zend_zts                %{!?with_zts:0}%{?with_zts:1}
+%define                _zend_zts               %{!?with_zts:0}%{?with_zts:1}
 %define                php_debug               %{!?debug:0}%{?debug:1}
 
 %if %{with gcov}
@@ -405,12 +390,12 @@ PHP - це мова написання скриптів, що вбудовуют
 Summary:       PHP DSO module for Apache 1.3.x
 Summary(pl.UTF-8):     Moduł DSO (Dynamic Shared Object) PHP dla Apache 1.3.x
 Group:         Development/Languages/PHP
-Requires(triggerpostun):       sed >= 4.0
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      apache1(EAPI) >= 1.3.33-2
 Requires:      apache1-mod_mime
 Provides:      webserver(php) = %{version}
 Obsoletes:     apache-mod_php < 1:4.1.1
+Obsoletes:     apache1-mod_php < 4:5.3.28-7
 Obsoletes:     phpfi
 
 %description -n apache1-mod_%{name}
@@ -427,6 +412,7 @@ Requires:   %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      apache(modules-api) = %{apache_modules_api}
 Requires:      apache-mod_mime
 Provides:      webserver(php) = %{version}
+Obsoletes:     apache-mod_php < 4:5.3.28-7
 Obsoletes:     phpfi
 
 %description -n apache-mod_%{name}
@@ -442,6 +428,7 @@ Group:              Development/Languages/PHP
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(litespeed)
 Provides:      webserver(php) = %{version}
+Obsoletes:     php-litespeed < 4:5.3.28-7
 
 %description litespeed
 PHP for litespeed HTTP server.
@@ -458,6 +445,7 @@ Provides:   %{name}-fcgi = %{epoch}:%{version}-%{release}
 Provides:      php(cgi)
 Provides:      php(fcgi)
 Provides:      webserver(php) = %{version}
+Obsoletes:     php-cgi < 4:5.3.28-7
 Obsoletes:     php-fcgi < 4:5.3.0
 %if "%{pld_release}" != "ac"
 Conflicts:     logrotate < 3.8.0
@@ -474,6 +462,7 @@ Summary:    PHP as CLI interpreter
 Summary(pl.UTF-8):     PHP jako interpreter działający z linii poleceń
 Group:         Development/Languages/PHP
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Obsoletes:     php-cli < 4:5.3.28-7
 
 %description cli
 PHP as CLI interpreter.
@@ -486,6 +475,7 @@ Summary:    PHP library for embedding in applications
 Summary(pl.UTF-8):     Biblioteka PHP do osadzania w aplikacjach
 Group:         Libraries
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Obsoletes:     php-embedded < 4:5.3.28-7
 
 %description embedded
 The php-embedded package contains a library which can be embedded into
@@ -501,6 +491,7 @@ Summary(pl.UTF-8):  Dowiązanie symboliczne /usr/bin/php
 Group:         Development/Languages/PHP
 Requires:      %{name}-cli = %{epoch}:%{version}-%{release}
 Obsoletes:     /usr/bin/php
+Obsoletes:     php-program < 4:5.3.28-7
 
 %description program
 Package providing /usr/bin/php symlink to PHP CLI.
@@ -522,6 +513,7 @@ Requires:   rc-scripts
 Provides:      php(fpm)
 Provides:      user(http)
 Provides:      webserver(php) = %{version}
+Obsoletes:     php-fpm < 4:5.3.28-7
 
 %description fpm
 PHP FastCGI Process Manager.
@@ -559,7 +551,7 @@ Requires:   rpm-whiteout >= 1.28
 Requires:      tzdata
 Provides:      %{name}(debug) = %{php_debug}
 Provides:      %{name}(modules_api) = %{php_api_version}
-Provides:      %{name}(thread-safety) = %{zend_zts}
+Provides:      %{name}(thread-safety) = %{_zend_zts}
 Provides:      %{name}(zend_extension_api) = %{zend_extension_api}
 Provides:      %{name}(zend_module_api) = %{zend_module_api}
 Provides:      %{name}-core
@@ -575,6 +567,7 @@ Provides:   php(reflection)
 Provides:      php(standard)
 %{!?with_mysqlnd:Obsoletes:    php-mysqlnd}
 %{?with_pcre:%requires_ge_to   pcre pcre-devel}
+Obsoletes:     php-common < 4:5.3.28-7
 Obsoletes:     php-pecl-domxml
 Conflicts:     php4-common < 3:4.4.4-8
 Conflicts:     php55-common < 4:5.5.10-4
@@ -611,10 +604,12 @@ Requires: libtool
 %endif
 %{?with_pcre:Requires: pcre-devel >= 8.10}
 Requires:      shtool
+Provides:      php-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     php-devel
 Obsoletes:     php-pear-devel
 Obsoletes:     php4-devel
 Obsoletes:     php52-devel
+Obsoletes:     php53-devel
 Obsoletes:     php54-devel
 
 %description devel
@@ -657,6 +652,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.bc.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(bcmath)
+Obsoletes:     php-bcmath < 4:5.3.28-7
 
 %description bcmath
 This is a dynamic shared object (DSO) for PHP that will add bc style
@@ -675,6 +671,7 @@ Requires:   %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(bz2) = %{bz2ver}
 Provides:      php(bzip2)
 Provides:      php-bzip2 = %{epoch}:%{version}-%{release}
+Obsoletes:     php-bz2 < 4:5.3.28-7
 Obsoletes:     php-bzip2 < 4:5.2.14-3
 Obsoletes:     php-pecl-bz2 < %{bz2ver}
 
@@ -692,6 +689,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.calendar.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(calendar)
+Obsoletes:     php-calendar < 4:5.3.28-7
 
 %description calendar
 This is a dynamic shared object (DSO) for PHP that will add calendar
@@ -707,6 +705,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.ctype.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(ctype)
+Obsoletes:     php-ctype < 4:5.3.28-7
 
 %description ctype
 This is a dynamic shared object (DSO) for PHP that will add ctype
@@ -722,6 +721,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.curl.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(curl)
+Obsoletes:     php-curl < 4:5.3.28-7
 
 %description curl
 This is a dynamic shared object (DSO) for PHP that will add curl
@@ -737,6 +737,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.dba.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(dba)
+Obsoletes:     php-dba < 4:5.3.28-7
 
 %description dba
 This is a dynamic shared object (DSO) for PHP that will add flat-file
@@ -756,6 +757,7 @@ Provides:   php(dom)
 # it has some compatibility functions
 Provides:      %{name}-domxml = %{epoch}:%{version}-%{release}
 Provides:      php(domxml)
+Obsoletes:     php-dom < 4:5.3.28-7
 Obsoletes:     php-domxml <= 3:4.3.8-1
 
 %description dom
@@ -772,6 +774,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.exif.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(enchant) = %{enchantver}
+Obsoletes:     php-enchant < 4:5.3.28-7
 Obsoletes:     php-pecl-enchant < %{enchantver}
 
 %description enchant
@@ -801,6 +804,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.exif.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(exif)
+Obsoletes:     php-exif < 4:5.3.28-7
 
 %description exif
 This is a dynamic shared object (DSO) for PHP that will add EXIF tags
@@ -817,6 +821,7 @@ URL:                http://www.php.net/manual/en/book.fileinfo.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:      php(fileinfo) = %{fileinfover}
+Obsoletes:     php-fileinfo < 4:5.3.28-7
 Obsoletes:     php-mime_magic
 Obsoletes:     php-pecl-fileinfo < %{fileinfover}
 
@@ -843,6 +848,7 @@ URL:                http://www.php.net/manual/en/book.filter.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:      php(filter)
+Obsoletes:     php-filter < 4:5.3.28-7
 Obsoletes:     php-pecl-filter
 
 %description filter
@@ -866,6 +872,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.ftp.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(ftp)
+Obsoletes:     php-ftp < 4:5.3.28-7
 
 %description ftp
 This is a dynamic shared object (DSO) for PHP that will add FTP
@@ -881,11 +888,11 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.image.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 %if %{with system_gd}
-Requires:      gd >= 2.0.28-4
+Requires:      gd >= 2.1
 Requires:      gd(gif)
-Requires:      gd(imagerotate) = 5.2.0
 %endif
 Provides:      php(gd)
+Obsoletes:     php-gd < 4:5.3.28-7
 
 %description gd
 This is a dynamic shared object (DSO) for PHP that will add GD
@@ -902,6 +909,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.gettext.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(gettext)
+Obsoletes:     php-gettext < 4:5.3.28-7
 
 %description gettext
 This is a dynamic shared object (DSO) for PHP that will add gettext
@@ -917,6 +925,7 @@ Group:              Libraries
 URL:           http://www.php.net/manual/en/book.gmp.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(gmp)
+Obsoletes:     php-gmp < 4:5.3.28-7
 
 %description gmp
 This is a dynamic shared object (DSO) for PHP that will add arbitrary
@@ -938,6 +947,7 @@ Provides:   php(mhash)
 Provides:      php-mhash = %{epoch}:%{version}-%{release}
 Obsoletes:     php-mhash < 4:5.3.0
 %endif
+Obsoletes:     php-hash < 4:5.3.28-7
 Obsoletes:     php-pecl-hash < %{hashver}
 
 %description hash
@@ -957,6 +967,7 @@ Requires:   %{_libdir}/gconv
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      iconv
 Provides:      php(iconv)
+Obsoletes:     php-iconv < 4:5.3.28-7
 
 %description iconv
 This is a dynamic shared object (DSO) for PHP that will add iconv
@@ -975,6 +986,7 @@ Requires:   %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pcre = %{epoch}:%{version}-%{release}
 Requires:      imap-lib >= 1:2007e-2
 Provides:      php(imap)
+Obsoletes:     php-imap < 4:5.3.28-7
 
 %description imap
 This is a dynamic shared object (DSO) for PHP that will add IMAP
@@ -991,9 +1003,13 @@ Summary:  InterBase/Firebird database module for PHP
 Summary(pl.UTF-8):     Moduł bazy danych InterBase/Firebird dla PHP
 Group:         Libraries
 URL:           http://www.php.net/manual/en/book.ibase.php
+%if %{with interbase_inst}
+%{?requires_php_extension}
+%else
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+%endif
 Provides:      php(interbase)
-%{?with_interbase_inst:Autoreq:        false}
+Obsoletes:     php-interbase < 4:5.3.28-7
 
 %description interbase
 This is a dynamic shared object (DSO) for PHP that will add InterBase
@@ -1009,6 +1025,7 @@ Group:            Libraries
 URL:           http://www.php.net/intl
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(intl) = %{intlver}
+Obsoletes:     php-intl < 4:5.3.28-7
 Obsoletes:     php-pecl-intl < %{intlver}
 
 %description intl
@@ -1030,6 +1047,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.json.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(json) = %{jsonver}
+Obsoletes:     php-json < 4:5.3.28-7
 Obsoletes:     php-pecl-json < %{jsonver}
 
 %description json
@@ -1048,6 +1066,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.ldap.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(ldap)
+Obsoletes:     php-ldap < 4:5.3.28-7
 
 %description ldap
 This is a dynamic shared object (DSO) for PHP that will add LDAP
@@ -1066,6 +1085,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.mbstring.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(mbstring)
+Obsoletes:     php-mbstring < 4:5.3.28-7
 
 %description mbstring
 This is a dynamic shared object (DSO) for PHP that will add multibyte
@@ -1081,6 +1101,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.mcrypt.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(mcrypt)
+Obsoletes:     php-mcrypt < 4:5.3.28-7
 
 %description mcrypt
 This is a dynamic shared object (DSO) for PHP that will add mcrypt
@@ -1096,6 +1117,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.mssql.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(mssql)
+Obsoletes:     php-mssql < 4:5.3.28-7
 
 %description mssql
 This is a dynamic shared object (DSO) for PHP that will add MS SQL
@@ -1114,6 +1136,7 @@ URL:              http://www.php.net/manual/en/book.mysql.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 %{?with_mysqlnd:Requires:      %{name}-mysqlnd = %{epoch}:%{version}-%{release}}
 Provides:      php(mysql)
+Obsoletes:     php-mysql < 4:5.3.28-7
 
 %description mysql
 This is a dynamic shared object (DSO) for PHP that will add MySQL
@@ -1134,6 +1157,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %{?with_mysqlnd:Requires:      %{name}-mysqlnd = %{epoch}:%{version}-%{release}}
 Requires:      %{name}-spl = %{epoch}:%{version}-%{release}
 Provides:      php(mysqli)
+Obsoletes:     php-mysqli < 4:5.3.28-7
 
 %description mysqli
 This is a dynamic shared object (DSO) for PHP that will add MySQLi
@@ -1152,6 +1176,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.mysqlnd.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(mysqlnd)
+Obsoletes:     php-mysqlnd < 4:5.3.28-7
 
 %description mysqlnd
 MySQL Native Driver is a replacement for the MySQL Client Library
@@ -1187,9 +1212,9 @@ Summary:  Oracle 8+ database module for PHP
 Summary(pl.UTF-8):     Moduł bazy danych Oracle 8+ dla PHP
 Group:         Libraries
 URL:           http://www.php.net/manual/en/book.oci8.php
-Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+%{?requires_php_extension}
 Provides:      php(oci8)
-AutoReq:       false
+Obsoletes:     php-oci8 < 4:5.3.28-7
 
 %description oci8
 This is a dynamic shared object (DSO) for PHP that will add Oracle 7,
@@ -1208,6 +1233,7 @@ URL:              http://www.php.net/manual/en/book.uodbc.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      unixODBC >= 2.1.1-3
 Provides:      php(odbc)
+Obsoletes:     php-odbc < 4:5.3.28-7
 
 %description odbc
 This is a dynamic shared object (DSO) for PHP that will add ODBC
@@ -1221,6 +1247,7 @@ Um módulo para aplicações PHP que usam ODBC.
 
 %package opcache
 Summary:       Zend Optimizer+ - PHP code optimizer
+Summary(pl.UTF-8):     Zend Optimizer+ - optymalizator kodu PHP
 Group:         Libraries
 URL:           https://wiki.php.net/rfc/optimizerplus
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
@@ -1234,6 +1261,14 @@ reading code from the disk and compiling it on future access. In
 addition, it applies a few bytecode optimization patterns that make
 code execution faster.
 
+%description opcache -l pl.UTF-8
+Zend OPcache zapewnia szybsze wykonywanie kodu PHP dzięki buforowaniu
+i optymalizacji na poziomie opcode'ów. Poprawia wydajność PHP
+przechowując prekompilowany bajtkod skryptu w pamięci współdzielonej.
+Eliminuje etapy odczytu kodu z dysku i kompilacji przy późniejszym
+dostępie. Ponadto wykonuje kilka wzorców optymalizacji bajtkodu,
+czyniąc wykonywanie kodu szybszym.
+
 %package openssl
 Summary:       OpenSSL extension module for PHP
 Summary(pl.UTF-8):     Moduł OpenSSL dla PHP
@@ -1241,6 +1276,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.openssl.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(openssl)
+Obsoletes:     php-openssl < 4:5.3.28-7
 
 %description openssl
 This is a dynamic shared object (DSO) for PHP that will add OpenSSL
@@ -1256,6 +1292,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.pcntl.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(pcntl)
+Obsoletes:     php-pcntl < 4:5.3.28-7
 
 %description pcntl
 This is a dynamic shared object (DSO) for PHP that will add process
@@ -1272,6 +1309,7 @@ Summary(pl.UTF-8):        Moduł PCRE dla PHP
 Group:         Libraries
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(pcre)
+Obsoletes:     php-pcre < 4:5.3.28-7
 
 %description pcre
 This is a dynamic shared object (DSO) for PHP that will add Perl
@@ -1288,7 +1326,9 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.pdo.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-spl = %{epoch}:%{version}-%{release}
+Provides:      %{name}(PDO_API) = %{php_pdo_api_version}
 Provides:      php(pdo)
+Obsoletes:     php-pdo < 4:5.3.28-7
 Obsoletes:     php-pecl-PDO
 
 %description pdo
@@ -1306,6 +1346,7 @@ URL:              http://www.php.net/manual/en/ref.pdo-dblib.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(dblib)
+Obsoletes:     php-pdo-dblib < 4:5.3.28-7
 
 %description pdo-dblib
 This is a dynamic shared object (DSO) for PHP that will add PDO
@@ -1323,6 +1364,7 @@ URL:              http://www.php.net/manual/en/ref.pdo-firebird.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-firebird)
+Obsoletes:     php-pdo-firebird < 4:5.3.28-7
 Obsoletes:     php-pecl-PDO_FIREBIRD
 
 %description pdo-firebird
@@ -1342,6 +1384,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %{?with_mysqlnd:Requires:      %{name}-mysqlnd = %{epoch}:%{version}-%{release}}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-mysql)
+Obsoletes:     php-pdo-mysql < 4:5.3.28-7
 Obsoletes:     php-pecl-PDO_MYSQL
 
 %description pdo-mysql
@@ -1357,9 +1400,10 @@ Summary: PHP Data Objects (PDO) Oracle support
 Summary(pl.UTF-8):     Moduł PHP Data Objects (PDO) z obsługą Oracle'a
 Group:         Libraries
 URL:           http://www.php.net/manual/en/ref.pdo-oci.php
-Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
+%{?requires_php_extension}
+%{?requires_php_pdo_module}
 Provides:      php(pdo-oci)
+Obsoletes:     php-pdo-oci < 4:5.3.28-7
 Obsoletes:     php-pecl-PDO_OCI
 
 %description pdo-oci
@@ -1378,6 +1422,7 @@ URL:              http://www.php.net/manual/en/ref.pdo-odbc.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-odbc)
+Obsoletes:     php-pdo-odbc < 4:5.3.28-7
 Obsoletes:     php-pecl-PDO_ODBC
 
 %description pdo-odbc
@@ -1397,6 +1442,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-pgsql)
 Provides:      php-pecl-PDO_PGSQL
+Obsoletes:     php-pdo-pgsql < 4:5.3.28-7
 Obsoletes:     php-pecl-PDO_PGSQL < 4:5.2.1-2
 
 %description pdo-pgsql
@@ -1415,6 +1461,7 @@ URL:              http://www.php.net/manual/en/ref.pdo-sqlite.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-sqlite)
+Obsoletes:     php-pdo-sqlite < 4:5.3.28-7
 Obsoletes:     php-pecl-PDO_SQLITE
 
 %description pdo-sqlite
@@ -1432,6 +1479,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.pgsql.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(pgsql)
+Obsoletes:     php-pgsql < 4:5.3.28-7
 
 %description pgsql
 This is a dynamic shared object (DSO) for PHP that will add PostgreSQL
@@ -1455,6 +1503,7 @@ Suggests: %{name}-cli
 Suggests:      %{name}-zlib
 Provides:      php(phar) = %{pharver}
 Obsoletes:     php-pecl-phar < %{pharver}
+Obsoletes:     php-phar < 4:5.3.28-7
 Conflicts:     php-ioncube < 4.0.9
 
 %description phar
@@ -1471,6 +1520,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.posix.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(posix)
+Obsoletes:     php-posix < 4:5.3.28-7
 
 %description posix
 This is a dynamic shared object (DSO) for PHP that will add POSIX
@@ -1486,6 +1536,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.pspell.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(pspell)
+Obsoletes:     php-pspell < 4:5.3.28-7
 
 %description pspell
 This is a dynamic shared object (DSO) for PHP that will add pspell
@@ -1503,6 +1554,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.readline.php
 Requires:      %{name}-cli = %{epoch}:%{version}-%{release}
 Provides:      php(readline)
+Obsoletes:     php-readline < 4:5.3.28-7
 
 %description readline
 This PHP module adds support for readline functions (only for cli and
@@ -1519,6 +1571,7 @@ URL:              http://www.php.net/manual/en/book.recode.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      recode >= 3.5d-3
 Provides:      php(recode)
+Obsoletes:     php-recode < 4:5.3.28-7
 
 %description recode
 This is a dynamic shared object (DSO) for PHP that will add recode
@@ -1537,6 +1590,7 @@ Requires: %{name}-spl = %{epoch}:%{version}-%{release}
 Suggests:      %{name}-hash = %{epoch}:%{version}-%{release}
 Suggests:      tmpwatch
 Provides:      php(session)
+Obsoletes:     php-session < 4:5.3.28-7
 
 %description session
 This is a dynamic shared object (DSO) for PHP that will add session
@@ -1552,6 +1606,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.shmop.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(shmop)
+Obsoletes:     php-shmop < 4:5.3.28-7
 
 %description shmop
 This is a dynamic shared object (DSO) for PHP that will add Shared
@@ -1568,6 +1623,7 @@ URL:              http://www.php.net/manual/en/book.simplexml.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-spl = %{epoch}:%{version}-%{release}
 Provides:      php(simplexml)
+Obsoletes:     php-simplexml < 4:5.3.28-7
 
 %description simplexml
 This is a dynamic shared object (DSO) for PHP that will add Simple XML
@@ -1585,6 +1641,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-sockets = %{epoch}:%{version}-%{release}
 Requires:      %{name}-spl = %{epoch}:%{version}-%{release}
 Provides:      php(snmp)
+Obsoletes:     php-snmp < 4:5.3.28-7
 
 %description snmp
 This is a dynamic shared object (DSO) for PHP that will add SNMP
@@ -1600,6 +1657,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.soap.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(soap)
+Obsoletes:     php-soap < 4:5.3.28-7
 
 %description soap
 This is a dynamic shared object (DSO) for PHP that will add SOAP/WSDL
@@ -1615,6 +1673,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.sockets.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(sockets)
+Obsoletes:     php-sockets < 4:5.3.28-7
 
 %description sockets
 This is a dynamic shared object (DSO) for PHP that will add sockets
@@ -1632,6 +1691,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pcre = %{epoch}:%{version}-%{release}
 Requires:      %{name}-simplexml = %{epoch}:%{version}-%{release}
 Provides:      php(spl)
+Obsoletes:     php-spl < 4:5.3.28-7
 
 %description spl
 This is a dynamic shared object (DSO) for PHP that will add Standard
@@ -1647,6 +1707,7 @@ Group:            Libraries
 URL:           http://php.net/manual/en/book.sqlite3.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(sqlite3) = %{sqlite3ver}
+Obsoletes:     php-sqlite3 < 4:5.3.28-7
 
 %description sqlite3
 SQLite is a C library that implements an embeddable SQL database
@@ -1676,6 +1737,7 @@ URL:              http://www.php.net/manual/en/book.sybase.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(sybase-ct)
 Obsoletes:     php-sybase
+Obsoletes:     php-sybase-ct < 4:5.3.28-7
 
 %description sybase-ct
 This is a dynamic shared object (DSO) for PHP that will add Sybase and
@@ -1692,6 +1754,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.sem.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(sysvmsg)
+Obsoletes:     php-sysvmsg < 4:5.3.28-7
 
 %description sysvmsg
 This is a dynamic shared object (DSO) for PHP that will add SysV
@@ -1707,6 +1770,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.sem.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(sysvsem)
+Obsoletes:     php-sysvsem < 4:5.3.28-7
 
 %description sysvsem
 This is a dynamic shared object (DSO) for PHP that will add SysV
@@ -1722,6 +1786,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.shmop.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(sysvshm)
+Obsoletes:     php-sysvshm < 4:5.3.28-7
 
 %description sysvshm
 This is a dynamic shared object (DSO) for PHP that will add SysV
@@ -1751,6 +1816,7 @@ URL:              http://www.php.net/manual/en/book.tidy.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      tidy
 Provides:      php(tidy)
+Obsoletes:     php-tidy < 4:5.3.28-7
 
 %description tidy
 This is a dynamic shared object (DSO) for PHP that will add Tidy
@@ -1766,6 +1832,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.tokenizer.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(tokenizer)
+Obsoletes:     php-tokenizer < 4:5.3.28-7
 
 %description tokenizer
 This is a dynamic shared object (DSO) for PHP that will add tokenizer
@@ -1786,6 +1853,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 #Requires:     %{name}-session = %{epoch}:%{version}-%{release}
 Requires:      %{name}-xml = %{epoch}:%{version}-%{release}
 Provides:      php(wddx)
+Obsoletes:     php-wddx < 4:5.3.28-7
 
 %description wddx
 This is a dynamic shared object (DSO) for PHP that will add wddx
@@ -1801,6 +1869,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.xml.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(xml)
+Obsoletes:     php-xml < 4:5.3.28-7
 
 %description xml
 This is a dynamic shared object (DSO) for PHP that will add XML
@@ -1818,8 +1887,9 @@ Summary(pl.UTF-8):        Moduł XML Reader dla PHP
 Group:         Libraries
 URL:           http://www.php.net/manual/en/book.xmlreader.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-Suggests:      %{name}-dom = %{epoch}:%{version}-%{release}
+Requires:      %{name}-dom = %{epoch}:%{version}-%{release}
 Provides:      php(xmlreader)
+Obsoletes:     php-xmlreader < 4:5.3.28-7
 
 %description xmlreader
 This is a dynamic shared object (DSO) for PHP that will add XML Reader
@@ -1840,6 +1910,7 @@ URL:              http://www.php.net/manual/en/book.xmlrpc.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-xml = %{epoch}:%{version}-%{release}
 Provides:      php(xmlrpc)
+Obsoletes:     php-xmlrpc < 4:5.3.28-7
 
 %description xmlrpc
 This is a dynamic shared object (DSO) for PHP that will add XMLRPC
@@ -1856,6 +1927,7 @@ URL:              http://www.php.net/manual/en/book.xmlwriter.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(xmlwriter)
 Obsoletes:     php-pecl-xmlwriter
+Obsoletes:     php-xmlwriter < 4:5.3.28-7
 
 %description xmlwriter
 This extension wraps the libxml xmlWriter API. Represents a writer
@@ -1875,8 +1947,9 @@ URL:              http://www.php.net/manual/en/book.xsl.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-dom = %{epoch}:%{version}-%{release}
 Requires:      libxslt >= 1.0.18
-# actually not true, functionality is similar, but API differs
 Provides:      php(xsl)
+Obsoletes:     php-xsl < 4:5.3.28-7
+# actually not true, functionality is similar, but API differs
 Obsoletes:     php-xslt <= 3:4.3.8-1
 
 %description xsl
@@ -1895,6 +1968,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %{?with_system_libzip:Requires:        libzip >= 0.10.1-2}
 Provides:      php(zip) = %{zipver}
 Obsoletes:     php-pecl-zip < %{zipver}
+Obsoletes:     php-zip < 4:5.3.28-7
 
 %description zip
 Zip is an extension to create, modify and read zip files.
@@ -1910,6 +1984,7 @@ Group:            Libraries
 URL:           http://www.php.net/manual/en/book.zlib.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(zlib)
+Obsoletes:     php-zlib < 4:5.3.28-7
 
 %description zlib
 This is a dynamic shared object (DSO) for PHP that will add zlib
@@ -1938,9 +2013,6 @@ cp -p php.ini-production php.ini
 %patch14 -p1
 %patch17 -p1
 %patch18 -p1
-%if %{with system_gd}
-%patch19 -p1
-%endif
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
@@ -2081,6 +2153,12 @@ if [ $API != %{zend_extension_api} ]; then
        exit 1
 fi
 
+API=$(awk '/#define PDO_DRIVER_API/{print $3}' ext/pdo/php_pdo_driver.h)
+if [ $API != %{php_pdo_api_version} ]; then
+       echo "Set %%define php_pdo_api_version to $API and re-run."
+       exit 1
+fi
+
 # Check for some extension version
 ver=$(sed -n '/#define PHP_FILEINFO_VERSION /{s/.* "//;s/".*$//;p}' ext/fileinfo/php_fileinfo.h)
 if test "$ver" != "%{fileinfover}"; then
@@ -2121,7 +2199,7 @@ fi
 ver=$(sed -n '/#define PHPDBG_VERSION /{s/.* "//;s/".*$//;p}' sapi/phpdbg/phpdbg.h)
 if test "$ver" != "%{phpdbgver}"; then
        : Error: Upstream phpdbg version is now ${ver}, expecting %{phpdbgver}.
-       : Update the opcachever macro and rebuild.
+       : Update the phpdbgver macro and rebuild.
        exit 1
 fi
 ver=$(sed -rne 's,.*<version>(.+)</version>,\1,p' ext/bz2/package.xml)
@@ -2707,6 +2785,27 @@ fi
 [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
 [ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart
 
+%triggerpostun common -- php-common < 4:5.3.28-7
+# migrate configs /etc/php/conf.d -> /etc/phpXY/conf.d/
+# do config migration in php-common trigger, as the trigger is ran after all packages are upgraded
+# this way we can stick to one trigger, instead of attaching one for each (sub)package!
+for f in /etc/php/*.ini.rpmsave /etc/php/*.d/*.ini.rpmsave; do
+       test -f "$f" || continue
+       bn=${f#/etc/php/}
+       dn=${bn%/*}
+       fn=${bn#*/}
+       test "$dn" = "$fn" && dn=
+       fn=${fn%.rpmsave}
+       nf=%{_sysconfdir}/$dn/$fn
+       test -f "$nf" || continue
+       cp -vf $nf{,.rpmnew}
+       mv -vf $f $nf
+       %{__sed} -i -e '
+               s#%{_libdir}/php#%{_libdir}/%{name}#
+               s#/etc/php#%{_sysconfdir}#
+       ' $nf
+done
+
 # common macros called at extension post/postun scriptlet
 %define        extension_scripts() \
 %post %1 \

diff --git a/suhosin.patch b/suhosin.patch
index e5e3ed4112d17bb53699d9b6c556874f2d07f9ee..378a4e45e429458180c8b8927b02ea7bc2618c78 100644 (file)
--- a/suhosin.patch
+++ b/suhosin.patch
@@ -5616,12 +5616,11 @@ the following modifications have been made:
                                        PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,
  #if ZEND_DEBUG && defined(HAVE_GCOV)
                                        "(DEBUG GCOV)",
---- php-5.5.0alpha1/sapi/litespeed/lsapi_main.c~       2012-11-13 22:00:16.000000000 +0200
-+++ php-5.5.0alpha1/sapi/litespeed/lsapi_main.c        2012-11-17 13:47:51.979828334 +0200
-@@ -546,11 +546,19 @@
-                               break;
-                       case 'v':
-                               if (php_request_startup(TSRMLS_C) != FAILURE) {
+--- php-5.5.15/sapi/litespeed/lsapi_main.c     2014-08-21 11:45:02.000000000 +0300
++++ php-5.5.15/sapi/litespeed/lsapi_main.c     2014-08-25 11:50:36.603155796 +0300
+@@ -734,11 +546,19 @@
+             case 'v':
+                 if (php_request_startup(TSRMLS_C) != FAILURE) {
 +#if SUHOSIN_PATCH
 +#if ZEND_DEBUG
 +                                      php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
@@ -5630,14 +5629,15 @@ the following modifications have been made:
 +#endif
 +#else
  #if ZEND_DEBUG
-                                       php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2014 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-2014 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-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+                     php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
  #endif
 +#endif
  #ifdef PHP_OUTPUT_NEWAPI
                      php_output_end_all(TSRMLS_C);
  #else
+                     php_end_ob_buffers(1 TSRMLS_CC);
 --- a/sapi/milter/php_milter.c
 +++ b/sapi/milter/php_milter.c
 @@ -1109,7 +1109,11 @@ int main(int argc, char *argv[])