diff --git a/php.spec b/php.spec index 6d10aa0..ee202d7 100644 --- a/php.spec +++ b/php.spec @@ -22,7 +22,7 @@ Summary: The PHP7 scripting language Name: php Version: 7.3.0 %if "%{beta}" != "" -Release: 0.%{beta}.1 +Release: 0.%{beta}.2 Source0: https://downloads.php.net/~cmb/php-%{version}%{beta}.tar.xz %else Release: 1 @@ -63,9 +63,9 @@ Patch22: php-dba-link.patch Patch23: php-zlib-for-getimagesize.patch # for kolab2 # P50 was rediffed from PLD (php-5.3.3-8.src.rpm) which merges the annotation and status-current patches -Patch27: php-imap-annotation+status-current.diff +#Patch27: php-imap-annotation+status-current.diff # P51 was taken from http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/php/patches/php-5.3.2/ -Patch28: php-imap-myrights.diff +#Patch28: php-imap-myrights.diff Patch29: php-5.3.x-fpm-0.6.5-shared.diff Patch30: php-5.3.x-fpm-0.6.5-mdv_conf.diff ##################################################################### diff --git a/php5-apache2-filters.diff b/php5-apache2-filters.diff index 97d3346..67c7355 100644 --- a/php5-apache2-filters.diff +++ b/php5-apache2-filters.diff @@ -41,8 +41,8 @@ + zval **filter_name; + ap_filter_rec_t* ap_filter; + -+ if (arg_count != 1 || -+ zend_get_parameters_ex(arg_count, &filter_name) == FAILURE) { ++ if (arg_count != 1 /*|| ++ zend_get_parameters_ex(arg_count, &filter_name) == FAILURE*/) { + WRONG_PARAM_COUNT; + } +