Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2017-12-29 18:49:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Fri Dec 29 18:49:03 2017 rev:29 rq:559313 version:7.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2017-12-13 11:57:51.822140362 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes 2017-12-29 18:49:16.561046505 +0100 @@ -1,0 +2,5 @@ +Fri Dec 15 10:45:08 UTC 2017 - [email protected] + +- build with SLE12* + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.bU8QKZ/_old 2017-12-29 18:49:17.560759382 +0100 +++ /var/tmp/diff_new_pack.bU8QKZ/_new 2017-12-29 18:49:17.564758233 +0100 @@ -23,14 +23,11 @@ %define extension_dir %{_libdir}/%{pkg_name}/extensions %define peardir %{_datadir}/%{pkg_name}/PEAR %define php_sysconf %{_sysconfdir}/%{pkg_name} -%define build_firebird 0 %bcond_with make_test -# as soon as suhosin is ported to php7, this with_suhosin and +# as soon as suhosin is ported to php7, these build_suhosin and # related conditions can be removed entirely -%bcond_with suhosin -# firebird disabled due to build errors: https://bugs.php.net/bug.php?id=70071 -%bcond_without firebird -%if %{with firebird} +%define build_suhosin 0 +%define build_firebird 0 %if 0%{?suse_version} > 1210 %define build_firebird 1 # firebird-devel was merged into libfbclient2-devel for firebird 3 @@ -41,6 +38,9 @@ BuildRequires: libfbclient-devel %endif %endif +%define build_sodium 0 +%if %{?suse_version} > 1320 +%define build_sodium 1 %endif Name: php7 Version: 7.2.0 @@ -108,7 +108,9 @@ BuildRequires: libjpeg-devel BuildRequires: libopenssl-devel BuildRequires: libpng-devel +%if %{build_sodium} BuildRequires: libsodium-devel +%endif BuildRequires: libtidy-devel BuildRequires: libtiff-devel BuildRequires: libtool @@ -175,7 +177,7 @@ %if 0%{?suse_version} >= 1320 BuildRequires: libzip-devel %endif -%if %{with suhosin} +%if %{build_suhosin} Suggests: php7-suhosin %endif @@ -783,6 +785,7 @@ communication functions based on the BSD sockets API, providing the possibility to act as a socket server as well as a client. +%if %{build_sodium} %package sodium Summary: Cryptographic Extension Based on Libsodium Group: Development/Libraries/PHP @@ -792,6 +795,7 @@ %description sodium PHP binding to libsodium software library for encryption, decryption, signatures, password hashing and more. +%endif %package sqlite Summary: SQLite database client for PHP @@ -816,7 +820,7 @@ This package includes sqlite and pdo_sqlite modules for sqlite version 2 and 3 respectively. -%if %{with suhosin} +%if %{build_suhosin} %package suhosin Summary: Protection system for PHP Group: Development/Libraries/PHP @@ -978,7 +982,7 @@ echo %{apache_mmn} %setup -q -n php-%{version} -a 1 tar -xf %{SOURCE2} -C ext -%if %{with suhosin} +%if %{build_suhosin} mv ext/suhosin-%{suhosin_version} ext/suhosin %endif cp %{SOURCE3} pear @@ -1092,7 +1096,9 @@ --enable-hash \ --with-mhash \ --enable-phpdbg=no \ +%if %{build_sodium} --with-sodium=shared \ +%endif %if 0%{?suse_version} >= 1320 --with-libzip \ %endif @@ -1215,7 +1221,7 @@ --with-pdo-pgsql=shared,%{_usr} \ --with-pdo-odbc=shared,unixODBC,%{_usr} \ --enable-zip=shared \ -%if %{with suhosin} +%if %{build_suhosin} --enable-suhosin=shared \ %endif --enable-intl=shared,%{_usr} \ @@ -1311,7 +1317,7 @@ echo "${zend_}extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/$ext.ini done #suhosin configuration -%if %{with suhosin} +%if %{build_suhosin} install -m 644 ext/suhosin/suhosin.ini %{buildroot}/%{php_sysconf}/conf.d/suhosin.ini %endif # list of builtin modules @@ -1668,10 +1674,12 @@ %{extension_dir}/soap.so %config(noreplace) %{php_sysconf}/conf.d/soap.ini +%if %{build_sodium} %files sodium %defattr(644,root,root,755) %{extension_dir}/sodium.so %config(noreplace) %{php_sysconf}/conf.d/sodium.ini +%endif %files sockets %defattr(644,root,root,755) @@ -1685,7 +1693,7 @@ %{extension_dir}/sqlite3.so %config(noreplace) %{php_sysconf}/conf.d/sqlite3.ini -%if %{with suhosin} +%if %{build_suhosin} %files suhosin %defattr(644,root,root,755) %{extension_dir}/suhosin.so
