Rel 37; fix openssl 3 build

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 47f259176f3bb16290af69da774922f51b08a2bc..c79453678a68334f67d7dd46ad32925953520c93 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define                magic_mime      /usr/share/misc/magic.mime
 %endif
 
-%define                rel     29
+%define                rel     37
 %define                orgname php
 %define                ver_suffix 52
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -227,6 +227,7 @@ Patch77:    x32.patch
 Patch78:       php-bug-68486.patch
 Patch79:       libevent-2.1.patch
 Patch80:       mysqli-err.patch
+Patch81:       openssl.patch
 # CENTALT patches
 # Backport from 5.3.6
 Patch311:      php-5.3.6-bug-47435.patch
@@ -394,7 +395,6 @@ PHP - це мова написання скриптів, що вбудовуют
 Summary:       PHP DSO module for Apache 1.3.x
 Summary(pl.UTF-8):     Moduł DSO (Dynamic Shared Object) PHP dla Apache 1.3.x
 Group:         Development/Languages/PHP
-Requires(triggerpostun):       sed >= 4.0
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      apache1(EAPI) >= 1.3.33-2
 Requires:      apache1-mod_mime
@@ -485,7 +485,18 @@ Summary:   /usr/bin/php symlink
 Summary(pl.UTF-8):     Dowiązanie symboliczne /usr/bin/php
 Group:         Development/Languages/PHP
 Requires:      %{name}-cli = %{epoch}:%{version}-%{release}
-Obsoletes:     /usr/bin/php
+Obsoletes:     php-program < 4:5.3.28-7
+Obsoletes:     php4-program
+Obsoletes:     php52-program
+Obsoletes:     php54-program
+Obsoletes:     php55-program
+Obsoletes:     php56-program
+Obsoletes:     php70-program
+Obsoletes:     php71-program
+Obsoletes:     php72-program
+Obsoletes:     php73-program
+Obsoletes:     php74-program
+Obsoletes:     php80-program
 
 %description program
 Package providing /usr/bin/php symlink to PHP CLI.
@@ -607,6 +618,7 @@ Obsoletes:  php56-devel
 Obsoletes:     php70-devel
 Obsoletes:     php71-devel
 Obsoletes:     php72-devel
+Obsoletes:     php73-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -1924,7 +1936,7 @@ done
 
 # mysql default charset for mysql/mysql/pdo-mysql extensions
 %patch36 -p1
-%patch37 -p0
+%patch37 -p1
 %patch38 -p0
 
 %patch39 -p1
@@ -1954,10 +1966,10 @@ done
 %patch57 -p1
 %patch58 -p4
 %patch59 -p1
-%patch60 -p4
+%patch60 -p1
 %patch61 -p1
 %{?with_system_libzip:%patch65 -p1}
-%patch66 -p2
+%patch66 -p1
 %patch67 -p1
 %patch69 -p4
 %patch70 -p1
@@ -1971,6 +1983,7 @@ done
 %patch78 -p1
 %patch79 -p1
 %patch80 -p1
+%patch81 -p1
 
 # Bugfix backport from 5.3.6
 %patch311 -p1 -b .bug-47435
@@ -2020,6 +2033,9 @@ mv sapi/cli/tests/022.phpt{,.broken}
 
 sh -xe %{_sourcedir}/skip-tests.sh
 
+# make colliding symbol static
+%{__sed} -i -e 's/^char \*yytext/static &/' Zend/zend_{ini,language}_scanner.c
+
 %build
 API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
 if [ $API != %{php_api_version} ]; then
@@ -2094,6 +2110,7 @@ for sapi in $sapis; do
        esac
 
        %configure \
+       CFLAGS="%{rpmcflags} -DOPENSSL_NO_SSL2=1 -DOPENSSL_NO_SSL3=1" \
        FORCE_APACHE_VERSION="${apache_ver}" \
        EXTRA_LDFLAGS="%{rpmldflags}" \
        $sapi_args \
@@ -2107,7 +2124,6 @@ for sapi in $sapis; do
        --with-system-tzdata \
        --%{!?debug:dis}%{?debug:en}able-debug \
        %{?with_zts:--enable-maintainer-zts} \
-       %{?with_suhosin:--enable-suhosin} \
        %{?with_zend_multibyte:--enable-zend-multibyte} \
        --enable-inline-optimization \
        --enable-bcmath=shared \
@@ -2452,7 +2468,7 @@ for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do
 done
 sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize
 
-# as a result of ext/pcre/pcrelib removal in %%prep, ext/pcre/php_pcre.h
+# as a result of ext/pcre/pcrelib removal in prep, ext/pcre/php_pcre.h
 # isn't installed by install-headers make target, we do it manually here.
 # this header file is required by e.g. filter PECL extension
 install -D ext/pcre/php_pcre.h $RPM_BUILD_ROOT%{_includedir}/php/ext/pcre/php_pcre.h