Open Build Service

Changes of Revision 7

php7.changes Changed

php7.spec Changed

@@ -98,10 +98,10 @@
 BuildRequires:  curl-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  db-devel
-%if 0%{sle_version} >= 150200 && 0%{?is_opensuse} 
+%if 0%{sle_version} >= 150200 && 0%{?is_opensuse}
 BuildRequires:  enchant-1-devel
 %endif
-%if 0%{sle_version} <= 150100 && 0%{?is_opensuse} 
+%if 0%{sle_version} <= 150100 && 0%{?is_opensuse}
 BuildRequires:  enchant-devel
 %endif
 BuildRequires:  freetype2-devel
@@ -288,7 +288,7 @@
 %description pear-Archive_Tar
 This class provides handling of tar files in PHP.
 It supports creating, listing, extracting and adding to tar files.
-Gzip support is available if PHP has the zlib extension built-in orloaded. 
+Gzip support is available if PHP has the zlib extension built-in orloaded.
 Bz2 compression is also supported with the bz2 extension loaded.
 
 
@@ -468,7 +468,6 @@
 MSSQL PDO driver
 %endif
 
-
 %package dom
 Summary:        PHP7 Extension Module
 Group:          Development/Libraries/PHP
@@ -1114,7 +1113,7 @@
 # export flags
 CFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing"
 CXXFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing"
-%if 0%{sle_version} >= 150200 && 0%{?is_opensuse} 
+%if 0%{sle_version} >= 150200 && 0%{?is_opensuse}
 CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
 export CPPFLAGS
 %endif
@@ -1398,17 +1397,27 @@
     fi
     ext=${f##*/}
     extern_modules="$extern_modules $ext"
-    echo "; comment out next line to disable $ext extension in php" > %{buildroot}/%{php_sysconf}/conf.d/$ext.ini
     zend_=''
-    if  $ext == "opcache" ; then
-      # https://secure.php.net/manual/en/opcache.installation.php
-      zend_='zend_'
-    fi
-    echo "${zend_}extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/$ext.ini
+    case $ext in
+      # priority 0 (will be loaded first)
+      opcache)
+        ini_name=00-${ext}
+        zend_='zend_';;
+      mysqlnd)
+        ini_name=00-${ext};;
+      # priority 2 (will be loaded after < 2)
+      pdo_*|mysqli|xmlreader)
+        ini_name=20-${ext};;
+      # priority 1 (will be loaded after < 1)
+      *)
+        ini_name=10-${ext};;
+    esac
+    echo "; comment out next line to disable $ext extension in php" > %{buildroot}/%{php_sysconf}/conf.d/${ini_name}.ini
+    echo "${zend_}extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/${ini_name}.ini
 done
 #suhosin configuration
 %if %{with suhosin}
-install -m 644 ext/suhosin/suhosin.ini %{buildroot}/%{php_sysconf}/conf.d/suhosin.ini
+install -m 644 ext/suhosin/suhosin.ini %{buildroot}/%{php_sysconf}/conf.d/00-suhosin.ini
 %endif
 # list of builtin modules
 builtin_modules=`./build-cli/sapi/cli/php -m | grep -E -v '^(\.*)?$' | sort | tr '\n' ' '`
@@ -1433,7 +1442,7 @@
 sed -i -e "s@%{_builddir}/php-%{rversion}/build-cli/sapi/cli/php@php@g" %{buildroot}%{_bindir}/phar.phar
 rm %{buildroot}%{_bindir}/phar
 ln -sf %{_bindir}/phar.phar %{buildroot}%{_bindir}/phar
-# CVE-2014-5459, bnc#893849; couldn't find a way to use PHP_PEAR_CACHE_DIR 
+# CVE-2014-5459, bnc#893849; couldn't find a way to use PHP_PEAR_CACHE_DIR
 # (install-pear is checking if the directory is writable by current user?;
 #  unfortunately ENOTIME to figure out)
 sed -i 's@15:"/tmp/pear/cache"@19:"/var/cache/php-pear"@' %{buildroot}%{php_sysconf}/cli/pear.conf
@@ -1468,8 +1477,8 @@
 ln -s %{_sysconfdir}/init.d/php-fpm %{buildroot}%{_sbindir}/rcphp-fpm
 %endif
 # pear installer installs .depdb{,lock} files into %{buildroot}%{peardir}
-# along with .lock, .registry when metadata_dir is not set but does not 
-# install them if metadata_dir is set; our Horde packages expect them there 
+# along with .lock, .registry when metadata_dir is not set but does not
+# install them if metadata_dir is set; our Horde packages expect them there
 # though, (they rm them without -f) so always install them along
 cd %{buildroot}/%{peardir}
 patch -p0 < %{PATCH9}
@@ -1605,283 +1614,283 @@
 %files bcmath
 %defattr(644,root,root,755)
 %{extension_dir}/bcmath.so
-%config(noreplace) %{php_sysconf}/conf.d/bcmath.ini
+%config(noreplace) %{php_sysconf}/conf.d/*bcmath.ini
 
 %files bz2
 %defattr(644,root,root,755)
 %{extension_dir}/bz2.so
-%config(noreplace) %{php_sysconf}/conf.d/bz2.ini
+%config(noreplace) %{php_sysconf}/conf.d/*bz2.ini
 
 %files calendar
 %defattr(644,root,root,755)
 %{extension_dir}/calendar.so
-%config(noreplace) %{php_sysconf}/conf.d/calendar.ini
+%config(noreplace) %{php_sysconf}/conf.d/*calendar.ini
 
 %files ctype
 %defattr(644,root,root,755)
 %{extension_dir}/ctype.so
-%config(noreplace) %{php_sysconf}/conf.d/ctype.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ctype.ini
 
 %files curl
 %defattr(644,root,root,755)
 %{extension_dir}/curl.so
-%config(noreplace) %{php_sysconf}/conf.d/curl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*curl.ini
 
 %files dba
 %defattr(644,root,root,755)
 %{extension_dir}/dba.so
-%config(noreplace) %{php_sysconf}/conf.d/dba.ini
+%config(noreplace) %{php_sysconf}/conf.d/*dba.ini
 
 %if 0%{suse_version} > 1110
 %files dblib
 %defattr(644,root,root,755)
 %{extension_dir}/pdo_dblib.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_dblib.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_dblib.ini
 %endif
 
 %files dom
 %defattr(644,root,root,755)
 %{extension_dir}/dom.so
-%config(noreplace) %{php_sysconf}/conf.d/dom.ini
+%config(noreplace) %{php_sysconf}/conf.d/*dom.ini
 
 %files enchant
 %defattr(644,root,root,755)
 %{extension_dir}/enchant.so
-%config(noreplace) %{php_sysconf}/conf.d/enchant.ini
+%config(noreplace) %{php_sysconf}/conf.d/*enchant.ini
 
 %files exif
 %defattr(644,root,root,755)
 %{extension_dir}/exif.so
-%config(noreplace) %{php_sysconf}/conf.d/exif.ini
+%config(noreplace) %{php_sysconf}/conf.d/*exif.ini
 
 %files fileinfo
 %defattr(644,root,root,755)
 %{extension_dir}/fileinfo.so
-%config(noreplace) %{php_sysconf}/conf.d/fileinfo.ini
+%config(noreplace) %{php_sysconf}/conf.d/*fileinfo.ini
 
 %files ftp
 %defattr(644,root,root,755)
 %{extension_dir}/ftp.so
-%config(noreplace) %{php_sysconf}/conf.d/ftp.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ftp.ini
 
 %files gd
 %defattr(644,root,root,755)
 %{extension_dir}/gd.so
-%config(noreplace) %{php_sysconf}/conf.d/gd.ini
+%config(noreplace) %{php_sysconf}/conf.d/*gd.ini
 
 %files gettext
 %defattr(644,root,root,755)
 %{extension_dir}/gettext.so
-%config(noreplace) %{php_sysconf}/conf.d/gettext.ini
+%config(noreplace) %{php_sysconf}/conf.d/*gettext.ini
 
 %files gmp
 %defattr(644,root,root,755)
 %{extension_dir}/gmp.so
-%config(noreplace) %{php_sysconf}/conf.d/gmp.ini
+%config(noreplace) %{php_sysconf}/conf.d/*gmp.ini
 
 %files iconv
 %defattr(644,root,root,755)
 %{extension_dir}/iconv.so
-%config(noreplace) %{php_sysconf}/conf.d/iconv.ini
+%config(noreplace) %{php_sysconf}/conf.d/*iconv.ini
 
 %files imap
 %defattr(644,root,root,755)
 %{extension_dir}/imap.so
-%config(noreplace) %{php_sysconf}/conf.d/imap.ini
+%config(noreplace) %{php_sysconf}/conf.d/*imap.ini
 
 %files intl
 %defattr(644,root,root,755)
 %{extension_dir}/intl.so
-%config(noreplace) %{php_sysconf}/conf.d/intl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*intl.ini
 
 %files json
 %defattr(644,root,root,755)
 %{extension_dir}/json.so
-%config(noreplace) %{php_sysconf}/conf.d/json.ini
+%config(noreplace) %{php_sysconf}/conf.d/*json.ini
 
 %files ldap
 %defattr(644,root,root,755)
 %{extension_dir}/ldap.so
-%config(noreplace) %{php_sysconf}/conf.d/ldap.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ldap.ini
 
 %files mbstring
 %defattr(644,root,root,755)
 %{extension_dir}/mbstring.so
-%config(noreplace) %{php_sysconf}/conf.d/mbstring.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mbstring.ini
 
 %if 0%{?suse_version} <= 1320
 %files mcrypt
 %defattr(644,root,root,755)
 %{extension_dir}/mcrypt.so
-%config(noreplace) %{php_sysconf}/conf.d/mcrypt.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mcrypt.ini
 %endif
 
 %files mysql
 %defattr(644,root,root,755)
 %{extension_dir}/mysqli.so
-%config(noreplace) %{php_sysconf}/conf.d/mysqli.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mysqli.ini
 %{extension_dir}/pdo_mysql.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_mysql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_mysql.ini
 
 %if %{build_firebird}
 %files firebird
 %defattr(644,root,root,755)
 %{extension_dir}/interbase.so
-%config(noreplace) %{php_sysconf}/conf.d/interbase.ini
+%config(noreplace) %{php_sysconf}/conf.d/*interbase.ini
 %{extension_dir}/pdo_firebird.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_firebird.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_firebird.ini
 %endif
 
 %files odbc
 %defattr(644,root,root,755)
 %{extension_dir}/odbc.so
-%config(noreplace) %{php_sysconf}/conf.d/odbc.ini
+%config(noreplace) %{php_sysconf}/conf.d/*odbc.ini
 %{extension_dir}/pdo_odbc.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_odbc.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_odbc.ini
 
 %files opcache
 %defattr(644,root,root,755)
 %{extension_dir}/opcache.so
-%config(noreplace) %{php_sysconf}/conf.d/opcache.ini
+%config(noreplace) %{php_sysconf}/conf.d/*opcache.ini
 
 %files openssl
 %defattr(644,root,root,755)
 %{extension_dir}/openssl.so
-%config(noreplace) %{php_sysconf}/conf.d/openssl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*openssl.ini
 
 %files phar
 %defattr(644,root,root,755)
 %{extension_dir}/phar.so
-%config(noreplace) %{php_sysconf}/conf.d/phar.ini
+%config(noreplace) %{php_sysconf}/conf.d/*phar.ini
 %{_bindir}/phar
 %{_bindir}/phar.phar
 
 %files pcntl
 %defattr(644,root,root,755)
 %{extension_dir}/pcntl.so
-%config(noreplace) %{php_sysconf}/conf.d/pcntl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pcntl.ini
 
 %files pdo
 %defattr(644,root,root,755)
 %{extension_dir}/pdo.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo.ini
 
 %files pgsql
 %defattr(644,root,root,755)
 %{extension_dir}/pgsql.so
-%config(noreplace) %{php_sysconf}/conf.d/pgsql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pgsql.ini
 %{extension_dir}/pdo_pgsql.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_pgsql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_pgsql.ini
 
 %files posix
 %defattr(644,root,root,755)
 %{extension_dir}/posix.so
-%config(noreplace) %{php_sysconf}/conf.d/posix.ini
+%config(noreplace) %{php_sysconf}/conf.d/*posix.ini
 
 %if %{with spell}
 %files pspell
 %defattr(644,root,root,755)
 %{extension_dir}/pspell.so
-%config(noreplace) %{php_sysconf}/conf.d/pspell.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pspell.ini
 %endif
 
 %files readline
 %defattr(644,root,root,755)
 %{extension_dir}/readline.so
-%config(noreplace) %{php_sysconf}/conf.d/readline.ini
+%config(noreplace) %{php_sysconf}/conf.d/*readline.ini
 
 %files shmop
 %defattr(644,root,root,755)
 %{extension_dir}/shmop.so
-%config(noreplace) %{php_sysconf}/conf.d/shmop.ini
+%config(noreplace) %{php_sysconf}/conf.d/*shmop.ini
 
 %files snmp
 %defattr(644,root,root,755)
 %{extension_dir}/snmp.so
-%config(noreplace) %{php_sysconf}/conf.d/snmp.ini
+%config(noreplace) %{php_sysconf}/conf.d/*snmp.ini
 
 %files soap
 %defattr(644,root,root,755)
 %{extension_dir}/soap.so
-%config(noreplace) %{php_sysconf}/conf.d/soap.ini
+%config(noreplace) %{php_sysconf}/conf.d/*soap.ini
 
 %files sockets
 %defattr(644,root,root,755)
 %{extension_dir}/sockets.so
-%config(noreplace) %{php_sysconf}/conf.d/sockets.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sockets.ini
 
 %files sqlite
 %defattr(644,root,root,755)
 %{extension_dir}/pdo_sqlite.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_sqlite.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_sqlite.ini
 %{extension_dir}/sqlite3.so
-%config(noreplace) %{php_sysconf}/conf.d/sqlite3.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sqlite3.ini
 
 %if %{with suhosin}
 %files suhosin
 %defattr(644,root,root,755)
 %{extension_dir}/suhosin.so
-%config(noreplace) %{php_sysconf}/conf.d/suhosin.ini
+%config(noreplace) %{php_sysconf}/conf.d/*suhosin.ini
 %endif
 
 %files sysvmsg
 %defattr(644,root,root,755)
 %{extension_dir}/sysvmsg.so
-%config(noreplace) %{php_sysconf}/conf.d/sysvmsg.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sysvmsg.ini
 
 %files sysvsem
 %defattr(644,root,root,755)
 %{extension_dir}/sysvsem.so
-%config(noreplace) %{php_sysconf}/conf.d/sysvsem.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sysvsem.ini
 
 %files sysvshm
 %defattr(644,root,root,755)
 %{extension_dir}/sysvshm.so
-%config(noreplace) %{php_sysconf}/conf.d/sysvshm.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sysvshm.ini
 
 %files tidy
 %defattr(644,root,root,755)
 %{extension_dir}/tidy.so
-%config(noreplace) %{php_sysconf}/conf.d/tidy.ini
+%config(noreplace) %{php_sysconf}/conf.d/*tidy.ini
 
 %files tokenizer
 %defattr(644,root,root,755)
 %{extension_dir}/tokenizer.so
-%config(noreplace) %{php_sysconf}/conf.d/tokenizer.ini
+%config(noreplace) %{php_sysconf}/conf.d/*tokenizer.ini
 
 %files wddx
 %defattr(644,root,root,755)
 %{extension_dir}/wddx.so
-%config(noreplace) %{php_sysconf}/conf.d/wddx.ini
+%config(noreplace) %{php_sysconf}/conf.d/*wddx.ini
 
 %files xmlrpc
 %defattr(644,root,root,755)
 %{extension_dir}/xmlrpc.so
-%config(noreplace) %{php_sysconf}/conf.d/xmlrpc.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xmlrpc.ini
 
 %files xmlreader
 %defattr(644,root,root,755)
 %{extension_dir}/xmlreader.so
-%config(noreplace) %{php_sysconf}/conf.d/xmlreader.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xmlreader.ini
 
 %files xmlwriter
 %defattr(644,root,root,755)
 %{extension_dir}/xmlwriter.so
-%config(noreplace) %{php_sysconf}/conf.d/xmlwriter.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xmlwriter.ini
 
 %files xsl
 %defattr(644,root,root,755)
 %{extension_dir}/xsl.so
-%config(noreplace) %{php_sysconf}/conf.d/xsl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xsl.ini
 
 %files zip
 %defattr(644,root,root,755)
 %{extension_dir}/zip.so
-%config(noreplace) %{php_sysconf}/conf.d/zip.ini
+%config(noreplace) %{php_sysconf}/conf.d/*zip.ini
 
 %files zlib
 %defattr(644,root,root,755)
 %{extension_dir}/zlib.so
-%config(noreplace) %{php_sysconf}/conf.d/zlib.ini
+%config(noreplace) %{php_sysconf}/conf.d/*zlib.ini
 
 %changelog