|
@@ -1,11 +1,6 @@
|
|
|
%bcond_with systemd
|
|
|
-%bcond_with debug
|
|
|
%bcond_without apache2
|
|
|
|
|
|
-%if %{with debug}
|
|
|
-%define __spec_install_post /usr/lib/rpm/brp-compress
|
|
|
-%endif
|
|
|
-
|
|
|
%global majorver 80
|
|
|
%global ap_suffix 8
|
|
|
%global _name php%{majorver}
|
|
@@ -23,13 +18,6 @@
|
|
|
|
|
|
%define gd_name gd
|
|
|
|
|
|
-%{!?_without_pear:%global _with_pear 1}
|
|
|
-%global with_pear %{?_with_pear:1}%{!?_with_pear:0}
|
|
|
-%if %{with_pear}
|
|
|
-%global pear_rootdir %{_datadir}/%{_name}-pear
|
|
|
-%global pear_cachedir %{_localstatedir}/cache/%{_name}-pear
|
|
|
-%endif
|
|
|
-
|
|
|
%global apache2_confdir %{_sysconfdir}/apache2/conf.d
|
|
|
%global apache2_moduledir %{_libdir}/apache2/modules
|
|
|
%global apache2_contentdir /var/www
|
|
@@ -45,7 +33,7 @@ Name: php%{majorver}
|
|
|
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
|
|
|
Summary(ja): HTML 埋め込み型スクリプト言語 PHP
|
|
|
Version: 8.0.3
|
|
|
-Release: 1%{_dist_release}%{?with_systemd:.systemd}
|
|
|
+Release: 2%{_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: programming
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
@@ -53,12 +41,8 @@ Packager: tomop
|
|
|
|
|
|
License: The PHP License
|
|
|
URL: https://www.php.net/
|
|
|
-
|
|
|
Source0: http://www.php.net/distributions/%{srcname}.tar.xz
|
|
|
|
|
|
-# borrowed from Fedora's php-pear 1:1.9.4-5
|
|
|
-Source13: macros.pear
|
|
|
-
|
|
|
Source20: README.vine
|
|
|
Source21: php.ini-vine
|
|
|
Source24: php.conf-apache2
|
|
@@ -67,7 +51,7 @@ Source26: php-fpm.conf
|
|
|
Source27: default-pool.conf.in
|
|
|
Source28: php-fpm.logrotate
|
|
|
Source29: php_params
|
|
|
-Source31: macros.pear.ver
|
|
|
+Source31: macros.php.ver
|
|
|
Source32: php-fpm.service
|
|
|
|
|
|
Patch33: php-5.2.4-phpincludedir.patch
|
|
@@ -134,13 +118,13 @@ BuildRequires: www-common
|
|
|
Requires: www-common
|
|
|
|
|
|
Requires(post,preun): alternatives
|
|
|
-%{?_with_pear:Requires: %{name}-pear = %{version}-%{release}}
|
|
|
Conflicts: php5 < 5.6.11
|
|
|
Conflicts: php <= 4.4.2-0vl1.2
|
|
|
Provides: php = %{version}-%{release}
|
|
|
Provides: php_extension_api(%{php_extension_api})
|
|
|
Provides: php_zend_extension_api(%{zend_extension_api})
|
|
|
Obsoletes: php5-sqlite < 5.5.0
|
|
|
+Obsoletes: php80-pear < 8.0.3-2
|
|
|
|
|
|
%description
|
|
|
PHP is an HTML-embedded scripting language. PHP attempts to make it
|
|
@@ -176,24 +160,6 @@ The php-devel package contains the files needed for building PHP
|
|
|
extensions. If you need to compile your own PHP extensions, you will
|
|
|
need to install this package.
|
|
|
|
|
|
-#----------------------------------------------------------------------
|
|
|
-%if %{with_pear}
|
|
|
-%package pear
|
|
|
-Group: programming
|
|
|
-Summary: PHP Extension and Application Repository Components
|
|
|
-Requires(post): alternatives
|
|
|
-Requires: %{name} = %{version}-%{release}
|
|
|
-Conflicts: php-pear <= 4.4.2-0vl2
|
|
|
-Provides: php-pear = %{version}-%{release}
|
|
|
-# pear's version itself is 1.9.4
|
|
|
-Provides: php-pear(PEAR) = 1.9.4
|
|
|
-Conflicts: php5-pear < 5.6.11
|
|
|
-
|
|
|
-%description pear
|
|
|
-PEAR is a framework and distribution system for reusable PHP
|
|
|
-components. This package contains the basic PEAR components.
|
|
|
-%endif
|
|
|
-
|
|
|
#----------------------------------------------------------------------
|
|
|
%if %{with apache2}
|
|
|
%package apache2
|
|
@@ -205,7 +171,6 @@ Requires: %{name} = %{version}-%{release}
|
|
|
Requires: apache2 >= 2.0.50-0vl2
|
|
|
Requires(post): sed, file
|
|
|
Provides: php-apache2 = %{version}-%{release}
|
|
|
-Conflicts: php5-pache2 < 5.6.11
|
|
|
|
|
|
%description apache2
|
|
|
This package contains the php5 module for Apache version 2.
|
|
@@ -245,7 +210,6 @@ Summary: A database abstraction layer module for PHP applications
|
|
|
Group: programming
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Provides: php-dba = %{version}-%{release}
|
|
|
-Conflicts: php5-dba < 5.6.11
|
|
|
|
|
|
%description dba
|
|
|
The php-dba package contains a dynamic shared object that will add
|
|
@@ -270,7 +234,6 @@ BuildRequires: uw-imap-devel >= 2000c-1.6.0
|
|
|
BuildRequires: openssl-devel
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Provides: php-imap = %{version}-%{release}
|
|
|
-Conflicts: php5-imap < 5.6.11
|
|
|
|
|
|
%description imap
|
|
|
The php-imap package contains a dynamic shared object (DSO) for the
|
|
@@ -290,7 +253,6 @@ BuildRequires: openldap-devel
|
|
|
BuildRequires: openssl-devel
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Provides: php-ldap = %{version}-%{release}
|
|
|
-Conflicts: php5-ldap < 5.6.11
|
|
|
|
|
|
%description ldap
|
|
|
The php-ldap package is a dynamic shared object (DSO) for the Apache
|
|
@@ -310,7 +272,6 @@ Requires: %{name} = %{version}-%{release}
|
|
|
Requires: %{name}-pdo
|
|
|
Provides: %{name}_database
|
|
|
Provides: php-mysql = %{version}-%{release}
|
|
|
-Conflicts: php5-mysql < 5.6.11
|
|
|
|
|
|
%description mysql
|
|
|
The php-mysql package contains a dynamic shared object that will add
|
|
@@ -328,7 +289,6 @@ Requires: %{name} = %{version}-%{release}
|
|
|
Requires: %{name}-pdo
|
|
|
Provides: %{name}_database
|
|
|
Provides: php-odbc = %{version}-%{release}
|
|
|
-Conflicts: php5-odbc < 5.6.11
|
|
|
|
|
|
%description odbc
|
|
|
The php-odbc package contains a dynamic shared object that will add
|
|
@@ -345,7 +305,6 @@ Summary: A database access abstraction module for PHP applications
|
|
|
Group: programming
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Provides: php-pdo = %{version}-%{release}
|
|
|
-Conflicts: php5-pdo < 5.6.11
|
|
|
|
|
|
%description pdo
|
|
|
The php-pdo package contains a dynamic shared object that will add
|
|
@@ -363,7 +322,6 @@ Requires: %{name} = %{version}-%{release}
|
|
|
Requires: %{name}-pdo
|
|
|
Provides: %{name}_database
|
|
|
Provides: php-pgsql = %{version}-%{release}
|
|
|
-Conflicts: php5-pgsql < 5.6.11
|
|
|
|
|
|
%description pgsql
|
|
|
The php-pgsql package includes a dynamic shared object (DSO) that can
|
|
@@ -387,7 +345,6 @@ BuildRequires: rpm-devel
|
|
|
BuildRequires: zlib-devel
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Provides: php-snmp = %{version}-%{release}
|
|
|
-Conflicts: php5-snmp < 5.6.11
|
|
|
|
|
|
%description snmp
|
|
|
The php-snmp package contains a dynamic shared object that will add
|
|
@@ -401,7 +358,6 @@ Summary: A module for PHP applications to use the ICU APIs
|
|
|
Group: programming
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Provides: php-intl = %{version}-%{release}
|
|
|
-Conflicts: php5-intl < 5.6.11
|
|
|
|
|
|
%description intl
|
|
|
The php-intl package is a wrapper for ICU library, enabling PHP programmers
|
|
@@ -416,7 +372,6 @@ Requires: %{name} = %{version}-%{release}
|
|
|
Provides: php-zip = %{version}-%{release}
|
|
|
Provides: php-ext-zip
|
|
|
Obsoletes: php-ext-zip < 1.12.4
|
|
|
-Conflicts: php5-zip < 5.6.11
|
|
|
|
|
|
%description zip
|
|
|
The php-zip package is an extension to create, modify and read zip files.
|
|
@@ -427,7 +382,6 @@ Summary: A module for PHP-CLI applications to use Process Control (pcntl)
|
|
|
Group: programming
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Provides: php-pcntl = %{version}-%{release}
|
|
|
-Conflicts: php5-pcntl < 5.6.11
|
|
|
|
|
|
%description pcntl
|
|
|
Process Control support in PHP implements the Unix style of process
|
|
@@ -442,7 +396,6 @@ Summary: A zend extension to cache script bytecode
|
|
|
Group: programming
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Provides: php-opcache = %{version}-%{release}
|
|
|
-Conflicts: php5-opcache < 5.6.11
|
|
|
|
|
|
%description opcache
|
|
|
OPcache improves PHP performance by storing precompiled script bytecode
|
|
@@ -486,14 +439,7 @@ export EXTENSION_DIR=%{_libdir}/%{_name}
|
|
|
build() {
|
|
|
ln -sf ../configure
|
|
|
|
|
|
-%if %{with debug}
|
|
|
-export CFLAGS="%{optflags} -fPIC -g"
|
|
|
-export CXXFLAGS="%{optflags} -fPIC --std=c++0x -g"
|
|
|
-%else
|
|
|
-export CFLAGS="%{optflags} -fPIC"
|
|
|
-export CXXFLAGS="%{optflags} -fPIC --std=c++0x"
|
|
|
-%endif
|
|
|
-
|
|
|
+export CFLAGS=$(echo $RPM_OPT_FLAGS -mshstk -fno-strict-aliasing -Wno-pointer-sign | sed 's/-mstackrealign//')
|
|
|
|
|
|
%configure \
|
|
|
--cache-file=../config.cache \
|
|
@@ -542,7 +488,7 @@ export CXXFLAGS="%{optflags} -fPIC --std=c++0x"
|
|
|
--with-xsl \
|
|
|
--with-zip=shared \
|
|
|
--with-zlib \
|
|
|
- %{?_with_pear:--with-pear=%{pear_rootdir}}%{!?_with_pear:--without-pear} \
|
|
|
+ --without-pear \
|
|
|
$*
|
|
|
if test $? != 0; then
|
|
|
tail -500 config.log
|
|
@@ -588,20 +534,6 @@ popd
|
|
|
#======================================================================
|
|
|
%install
|
|
|
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
|
|
|
-
|
|
|
-#export PHP_PEAR_SYSCONF_DIR=%{php_confdir}
|
|
|
-#export PHP_PEAR_TEMP_DIR=%{pear_cachedir}
|
|
|
-#export PHP_PEAR_CACHE_DIR=%{buildroot}%{pear_cachedir}
|
|
|
-#export PHP_PEAR_DOWNLOAD_DIR=%{pear_cachedir}
|
|
|
-#export PHP_PEAR_PHP_BIN=%{_bindir}/%{_name}
|
|
|
-
|
|
|
-export PHP_PEAR_SYSCONF_DIR=%{php_confdir}
|
|
|
-export PHP_PEAR_TEMP_DIR=%{buildroot}%{pear_cachedir}
|
|
|
-export PHP_PEAR_CACHE_DIR=%{buildroot}%{pear_cachedir}
|
|
|
-export PHP_PEAR_DOWNLOAD_DIR=%{buildroot}%{pear_cachedir}
|
|
|
-export PHP_PEAR_PHP_BIN=%{buildroot}%{_bindir}/%{_name}
|
|
|
-unset http_proxy
|
|
|
-
|
|
|
#----------------------------------------------------------------------
|
|
|
pushd build-cgi
|
|
|
# Install everything from the CGI SAPI build
|
|
@@ -623,34 +555,11 @@ sed -i \
|
|
|
-e 's/@majorver@/%{majorver}/g' \
|
|
|
%{buildroot}%{php_confdir}/php.ini
|
|
|
|
|
|
-# fix path in phar
|
|
|
-#perl -pi -e 's|^#!/.+/build-cgi/sapi/cli/php$|#!/usr/bin/%{_name}|' %{buildroot}%{_bindir}/phar.phar
|
|
|
-#mv %{buildroot}%{_bindir}/phar.phar %{buildroot}%{_bindir}/phar%{majorver}.phar
|
|
|
-#mv %{buildroot}%{_mandir}/man1/phar.1 %{buildroot}%{_mandir}/man1/phar%{majorver}.1
|
|
|
-#rm %{buildroot}%{_mandir}/man1/phar.phar.1
|
|
|
-
|
|
|
-%if %{with_pear}
|
|
|
-# http://pear.php.net/bugs/bug.php?id=6154
|
|
|
-perl -pi -e 's#s:([0-9]+):(.)(%{buildroot})+#"s:".($1-length($3)).":$2"#eg;' %{buildroot}%{php_confdir}/pear.conf
|
|
|
-
|
|
|
-for cmd in pear peardev pecl; do
|
|
|
- cp %{buildroot}%{_bindir}/${cmd}{,%{majorver}}
|
|
|
-done
|
|
|
-%{__install} -m 755 -d %{buildroot}%{pear_cachedir}
|
|
|
-
|
|
|
-# install rpmmacro file for pear
|
|
|
-mkdir -p %{buildroot}%{_datadir}/php%{majorver}
|
|
|
-install -m 644 -c %{SOURCE13} \
|
|
|
- %{buildroot}%{_datadir}/php%{majorver}/macros.pear
|
|
|
-sed -i -e 's/@majorver@/%{majorver}/g' \
|
|
|
- %{buildroot}%{_datadir}/php%{majorver}/macros.pear
|
|
|
-
|
|
|
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
|
|
+mkdir -p %{buildroot}%{_rpmmacrodir}
|
|
|
install -m 644 -c %{SOURCE31} \
|
|
|
- %{buildroot}%{_sysconfdir}/rpm/macros.pear%{majorver}
|
|
|
+ %{buildroot}%{_rpmmacrodir}/macros.php%{majorver}
|
|
|
sed -i -e 's/@majorver@/%{majorver}/g' \
|
|
|
- %{buildroot}%{_sysconfdir}/rpm/macros.pear%{majorver}
|
|
|
-%endif
|
|
|
+ %{buildroot}%{_rpmmacrodir}/macros.php%{majorver}
|
|
|
|
|
|
# Install cgi/fcgi binaries
|
|
|
mv %{buildroot}%{_bindir}/php-cgi%{majorver} %{buildroot}%{_bindir}/%{_name}-cgi
|
|
@@ -772,14 +681,6 @@ rm -f %{buildroot}%{_libdir}/%{_name}/*.a
|
|
|
# Remove irrelevant docs
|
|
|
rm -f README.{Zeus,QNX,CVS-RULES}
|
|
|
|
|
|
-# ad-hoc fix for incorrect paths to php5
|
|
|
-for X in pear%{majorver} peardev%{majorver} pecl%{majorver} ; do
|
|
|
- sed -i -e 's|%{buildroot}||g' %{buildroot}%{_bindir}/$X
|
|
|
-done
|
|
|
-
|
|
|
-rm -rf %{buildroot}/{.channels,.depdb*,.filemap,.lock}
|
|
|
-rm -f %{buildroot}%{_bindir}/{pear,peardev,pecl,phar}
|
|
|
-
|
|
|
#----------------------------------------------------------------------
|
|
|
%post
|
|
|
/sbin/update-alternatives \
|
|
@@ -860,27 +761,6 @@ if [ "$1" = 0 ]; then
|
|
|
/sbin/update-alternatives --remove php-nginx %{_sysconfdir}/nginx/%{_name}_params
|
|
|
fi
|
|
|
|
|
|
-%post pear
|
|
|
-/sbin/update-alternatives \
|
|
|
- --install %{_bindir}/pear pear %{_bindir}/pear%{majorver} %{majorver} \
|
|
|
- --slave %{_bindir}/peardev peardev %{_bindir}/peardev%{majorver} \
|
|
|
- --slave %{_bindir}/pecl pecl %{_bindir}/pecl%{majorver} \
|
|
|
- --slave %{_sysconfdir}/rpm/macros.pear macros.pear %{_datadir}/php%{majorver}/macros.pear
|
|
|
-
|
|
|
-
|
|
|
-# fix broken symlink if it's there
|
|
|
-if [ ! -f %{_bindir}/pear ] ; then
|
|
|
- /sbin/update-alternatives --auto pear
|
|
|
-fi
|
|
|
-
|
|
|
-%triggerpostun pear -- php5-pear < 5.1.4-0vl1
|
|
|
-/sbin/update-alternatives --auto pear
|
|
|
-
|
|
|
-%preun pear
|
|
|
-if [ "$1" = 0 ]; then
|
|
|
- /sbin/update-alternatives --remove pear %{_bindir}/pear%{majorver}
|
|
|
-fi
|
|
|
-
|
|
|
%post devel
|
|
|
/sbin/update-alternatives \
|
|
|
--install %{_bindir}/php-config php-devel %{_bindir}/php-config%{majorver} %{majorver} \
|
|
@@ -946,6 +826,7 @@ rm -f files.*
|
|
|
# gd extension (should be separated package?)
|
|
|
%config(noreplace) %{php_confdir}/php.d/gd.ini
|
|
|
%{_libdir}/%{_name}/gd.so
|
|
|
+%config %{_rpmmacrodir}/macros.php%{majorver}
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root)
|
|
@@ -956,19 +837,6 @@ rm -f files.*
|
|
|
%{_includedir}/%{_name}
|
|
|
%{_libdir}/%{_name}/build
|
|
|
|
|
|
-%if %{with_pear}
|
|
|
-%files pear
|
|
|
-%defattr(-,root,root)
|
|
|
-%config %{php_confdir}/pear.conf
|
|
|
-%config %{_datadir}/%{_name}/macros.pear
|
|
|
-%config %{_sysconfdir}/rpm/macros.pear%{majorver}
|
|
|
-%{_bindir}/pear%{majorver}
|
|
|
-%{_bindir}/peardev%{majorver}
|
|
|
-%{_bindir}/pecl%{majorver}
|
|
|
-%{pear_rootdir}
|
|
|
-%dir %{pear_cachedir}
|
|
|
-%endif
|
|
|
-
|
|
|
%if %{with apache2}
|
|
|
%files apache2
|
|
|
%defattr(-,root,root)
|
|
@@ -1013,6 +881,10 @@ rm -f files.*
|
|
|
|
|
|
#======================================================================
|
|
|
%changelog
|
|
|
+* Thu Apr 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.0.3-2
|
|
|
+- rebuilt with icu69.
|
|
|
+- dropped php-pear (no longer maintained in upstream).
|
|
|
+
|
|
|
* Fri Mar 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.0.3-1
|
|
|
- new upstream release.
|
|
|
|