Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

php5.changes Changed

php5.spec Changed

@@ -26,19 +26,19 @@
 %define with_spell 1
 
 BuildRequires:  libopenssl-1_0_0-devel
-BuildRequires:  libcurl-openssl_1_0_0-devel   
-BuildRequires:  imap-openssl_1_0_0-devel        
- 
+BuildRequires:  libcurl-openssl_1_0_0-devel
+BuildRequires:  imap-openssl_1_0_0-devel
+
 BuildRequires:  apache2-devel
 BuildRequires:  autoconf
 BuildRequires:  bison
 BuildRequires:  curl-openssl_1_0_0-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
@@ -47,10 +47,10 @@
 BuildRequires:  krb5-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libevent-devel
-%if 0%{sle_version} >= 150200 && 0%{?is_opensuse} 
+%if 0%{sle_version} >= 150200 && 0%{?is_opensuse}
 BuildRequires:  libicu60-devel
 %endif
-%if 0%{sle_version} <= 150100 && 0%{?is_opensuse} 
+%if 0%{sle_version} <= 150100 && 0%{?is_opensuse}
 BuildRequires:  libicu-devel
 %endif
 BuildRequires:  libmcrypt-devel
@@ -65,7 +65,7 @@
 BuildRequires:  pkgconfig
 BuildRequires:  postfix
 BuildRequires:  postgresql10-openssl_1_0_0-devel
-%if 0%{sle_version} >= 150200 && 0%{?is_opensuse} 
+%if 0%{sle_version} >= 150200 && 0%{?is_opensuse}
 BuildRequires:  postgresql-openssl_1_0_0-devel
 BuildRequires:  postgresql-openssl_1_0_0
 %endif
@@ -797,7 +797,7 @@
 --------
     The PHP Group
     See http://www.php.net/credits.php for more details
-    
+
 %package firebird
 Provides:       php5-interbase = %{version}
 Provides:       php5-pdo_firebird = %{version}
@@ -1664,11 +1664,22 @@
     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
-    echo "extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/$ext.ini
+    case $ext in
+      # priority 0 (will be loaded first)
+      opcache|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 "extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/${ini_name}.ini
 done
 #suhosin configuration
-%{__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/*suhosin.ini
 # list of builtin modules
 builtin_modules=`./build-cli/sapi/cli/php -m | egrep -v '^(\.*)?$' | sort | tr '\n' ' '`
 # update readme
@@ -1796,281 +1807,281 @@
 %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
 
 %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