- added ac fix (misplaced brackets)

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 625356fb91ffa89bc4c3a574df18acee0a1b5609..54a7a87bb13df649c7e561723cdaf5dbd70cb508 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -155,7 +155,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel     15
+%define                rel     27
 %define                orgname php
 %define                ver_suffix 56
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -198,9 +198,13 @@ Patch9:            libtool-tag.patch
 Patch10:       %{orgname}-ini.patch
 Patch11:       embed.patch
 Patch12:       openssl.patch
+Patch13:       crypt.patch
 Patch14:       %{orgname}-no_pear_install.patch
+Patch15:       charset.patch
+Patch16:       mysql-auth.patch
 Patch17:       %{orgname}-readline.patch
 Patch18:       %{orgname}-nohttpd.patch
+Patch19:       %{orgname}-ac.patch
 Patch21:       %{orgname}-dba-link.patch
 Patch22:       %{orgname}-both-apxs.patch
 Patch23:       %{orgname}-builddir.patch
@@ -242,7 +246,7 @@ Patch73:    php-pdo-ssl.patch
 Patch74:       php-icu64.patch
 Patch75:       icu69.patch
 Patch76:       icu70.patch
-URL:           http://php.net/
+URL:           https://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:  aspell-devel >= 2:0.50.0}
 BuildRequires: autoconf >= 2.59
@@ -527,18 +531,19 @@ Summary(pl.UTF-8):        Dowiązanie symboliczne /usr/bin/php
 Group:         Development/Languages/PHP
 Requires:      %{name}-cli = %{epoch}:%{version}-%{release}
 Obsoletes:     php-program < 4:5.3.28-7
-Obsoletes:     php4-program
-Obsoletes:     php52-program
-Obsoletes:     php53-program
-Obsoletes:     php54-program
-Obsoletes:     php55-program
-Obsoletes:     php70-program
-Obsoletes:     php71-program
-Obsoletes:     php72-program
-Obsoletes:     php73-program
-Obsoletes:     php74-program
-Obsoletes:     php80-program
-Obsoletes:     php81-program
+Obsoletes:     php4-program < 3:5
+Obsoletes:     php52-program < 4:5.3
+Obsoletes:     php53-program < 4:5.4
+Obsoletes:     php54-program < 4:5.5
+Obsoletes:     php55-program < 4:5.6
+Obsoletes:     php70-program < 4:7.1
+Obsoletes:     php71-program < 4:7.2
+Obsoletes:     php72-program < 4:7.3
+Obsoletes:     php73-program < 4:7.4
+Obsoletes:     php74-program < 4:8
+Obsoletes:     php80-program < 4:8.1
+Obsoletes:     php81-program < 4:8.2
+Obsoletes:     php82-program < 4:8.3
 
 %description program
 Package providing /usr/bin/php symlink to PHP CLI.
@@ -677,19 +682,20 @@ Requires: libtool
 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
-Obsoletes:     php55-devel
-Obsoletes:     php70-devel
-Obsoletes:     php71-devel
-Obsoletes:     php72-devel
-Obsoletes:     php73-devel
-Obsoletes:     php74-devel
-Obsoletes:     php80-devel
-Obsoletes:     php81-devel
+Obsoletes:     php-pear-devel < 3:4.3.0-1
+Obsoletes:     php4-devel < 3:5
+Obsoletes:     php52-devel < 4:5.3
+Obsoletes:     php53-devel < 4:5.4
+Obsoletes:     php54-devel < 4:5.5
+Obsoletes:     php55-devel < 4:5.6
+Obsoletes:     php70-devel < 4:7.1
+Obsoletes:     php71-devel < 4:7.2
+Obsoletes:     php72-devel < 4:7.3
+Obsoletes:     php73-devel < 4:7.4
+Obsoletes:     php74-devel < 4:8
+Obsoletes:     php80-devel < 4:8.1
+Obsoletes:     php81-devel < 4:8.2
+Obsoletes:     php82-devel < 4:8.3
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -932,7 +938,7 @@ 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
+Obsoletes:     php-pecl-filter < 0.12
 
 %description filter
 We all know that you should always check input variables, but PHP does
@@ -1416,7 +1422,7 @@ 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
+Obsoletes:     php-pecl-PDO < 1.1
 
 %description pdo
 This is a dynamic shared object (DSO) for PHP that will add PDO
@@ -1453,7 +1459,7 @@ Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-firebird)
 Provides:      php(pdo_firebird)
 Obsoletes:     php-pdo-firebird < 4:5.3.28-7
-Obsoletes:     php-pecl-PDO_FIREBIRD
+Obsoletes:     php-pecl-PDO_FIREBIRD < 0.3
 
 %description pdo-firebird
 This is a dynamic shared object (DSO) for PHP that will add PDO
@@ -1474,7 +1480,7 @@ Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-mysql)
 Provides:      php(pdo_mysql)
 Obsoletes:     php-pdo-mysql < 4:5.3.28-7
-Obsoletes:     php-pecl-PDO_MYSQL
+Obsoletes:     php-pecl-PDO_MYSQL < 1.1
 
 %description pdo-mysql
 This is a dynamic shared object (DSO) for PHP that will add PDO MySQL
@@ -1494,7 +1500,7 @@ URL:              http://php.net/manual/en/ref.pdo-oci.php
 Provides:      php(pdo-oci)
 Provides:      php(pdo_oci)
 Obsoletes:     php-pdo-oci < 4:5.3.28-7
-Obsoletes:     php-pecl-PDO_OCI
+Obsoletes:     php-pecl-PDO_OCI < 1.1
 
 %description pdo-oci
 This is a dynamic shared object (DSO) for PHP that will add PDO Oracle
@@ -1514,7 +1520,7 @@ Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-odbc)
 Provides:      php(pdo_odbc)
 Obsoletes:     php-pdo-odbc < 4:5.3.28-7
-Obsoletes:     php-pecl-PDO_ODBC
+Obsoletes:     php-pecl-PDO_ODBC < 1.1
 
 %description pdo-odbc
 This is a dynamic shared object (DSO) for PHP that will add PDO ODBC
@@ -1554,7 +1560,7 @@ Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-sqlite)
 Provides:      php(pdo_sqlite)
 Obsoletes:     php-pdo-sqlite < 4:5.3.28-7
-Obsoletes:     php-pecl-PDO_SQLITE
+Obsoletes:     php-pecl-PDO_SQLITE < 1.1
 
 %description pdo-sqlite
 This is a dynamic shared object (DSO) for PHP that will add PDO SQLite
@@ -2023,7 +2029,7 @@ Group:            Libraries
 URL:           http://php.net/manual/en/book.xmlwriter.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      php(xmlwriter)
-Obsoletes:     php-pecl-xmlwriter
+Obsoletes:     php-pecl-xmlwriter < 2.1
 Obsoletes:     php-xmlwriter < 4:5.3.28-7
 
 %description xmlwriter
@@ -2106,10 +2112,13 @@ cp -p php.ini-production php.ini
 %patch10 -p1
 
 %patch12 -p1
-
+%patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
@@ -2690,6 +2699,9 @@ chmod +x run-tests.sh
 cp -pf php_config.h.cli main/php_config.h
 cp -pf Makefile.cli Makefile
 
+# check if php is using system crypt()
+[ "$(./sapi/cli/php -r "echo crypt('test', '\$y\$j9T\$0123456789012345678901');")" == '$y$j9T$0123456789012345678901$QL0ChzHK2m7dGOwWHcpmRAp6FaInfsIzIDF4mVQdIFA' ] || exit 1
+
 ./run-tests.sh -w failed.log -s tests.log || {
 rc=$?