Date: Saturday, January 16, 2021 @ 13:02:13
Author: pierre
Revision: 406299
Quote paths
Modified:
php7/trunk/PKGBUILD
php7/trunk/generate_patches
------------------+
PKGBUILD | 96 ++++++++++++++++++++++++++---------------------------
generate_patches | 2 -
2 files changed, 49 insertions(+), 49 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-01-16 12:55:05 UTC (rev 406298)
+++ PKGBUILD 2021-01-16 13:02:13 UTC (rev 406299)
@@ -46,13 +46,13 @@
'42670A7FE4D0441C8E4632349E4FDC074A4EF02D')
prepare() {
- cd ${srcdir}/php-${pkgver}
+ cd "${srcdir}/php-${pkgver}"
- patch -p0 -i ${srcdir}/apache.patch
- patch -p0 -i ${srcdir}/php-fpm.patch
- patch -p0 -i ${srcdir}/php.ini.patch
- patch -p0 -i ${srcdir}/enchant-2.patch
- patch -p0 -i ${srcdir}/php7.patch
+ patch -p0 -i "${srcdir}/apache.patch"
+ patch -p0 -i "${srcdir}/php-fpm.patch"
+ patch -p0 -i "${srcdir}/php.ini.patch"
+ patch -p0 -i "${srcdir}/enchant-2.patch"
+ patch -p0 -i "${srcdir}/php7.patch"
autoconf
rm tests/output/stream_isatty_*.phpt
@@ -139,8 +139,8 @@
EXTENSION_DIR=/usr/lib/php7/modules
export EXTENSION_DIR
- mkdir ${srcdir}/build
- cd ${srcdir}/build
+ mkdir "${srcdir}/build"
+ cd "${srcdir}/build"
ln -s ../php-${pkgver}/configure
./configure ${_phpconfig} \
--enable-cgi \
@@ -155,8 +155,8 @@
# apache
# reuse the previous run; this will save us a lot of time
- cp -a ${srcdir}/build ${srcdir}/build-apache
- cd ${srcdir}/build-apache
+ cp -a "${srcdir}/build" "${srcdir}/build-apache"
+ cd "${srcdir}/build-apache"
./configure ${_phpconfig} \
--with-apxs2 \
${_phpextensions}
@@ -163,8 +163,8 @@
make
# phpdbg
- cp -a ${srcdir}/build ${srcdir}/build-phpdbg
- cd ${srcdir}/build-phpdbg
+ cp -a "${srcdir}/build" "${srcdir}/build-phpdbg"
+ cd "${srcdir}/build-phpdbg"
./configure ${_phpconfig} \
--enable-phpdbg \
${_phpextensions}
@@ -172,7 +172,7 @@
}
check() {
- cd ${srcdir}/build
+ cd "${srcdir}/build"
# Check if sendmail was configured correctly (FS#47600)
sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q
'/usr/bin/sendmail'
@@ -192,17 +192,17 @@
depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma')
backup=('etc/php7/php.ini')
- cd ${srcdir}/build
- make -j1 INSTALL_ROOT=${pkgdir}
install-{modules,cli,build,headers,programs,pharcmd}
- install -D -m644 ${srcdir}/php-${pkgver}/php.ini-production
${pkgdir}/etc/php7/php.ini
- install -d -m755 ${pkgdir}/etc/php7/conf.d/
+ cd "${srcdir}/build"
+ make -j1 INSTALL_ROOT="${pkgdir}"
install-{modules,cli,build,headers,programs,pharcmd}
+ install -D -m644 "${srcdir}/php-${pkgver}/php.ini-production"
"${pkgdir}/etc/php7/php.ini"
+ install -d -m755 "${pkgdir}/etc/php7/conf.d/"
# remove static modules
- rm -f ${pkgdir}/usr/lib/php7/modules/*.a
+ rm -f "${pkgdir}/usr/lib/php7/modules/"*.a
# remove modules provided by sub packages
- rm -f
${pkgdir}/usr/lib/php7/modules/{enchant,gd,imap,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+ rm -f
"${pkgdir}/usr/lib/php7/modules/"{enchant,gd,imap,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
# remove empty directory
- rmdir ${pkgdir}/usr/include/php7/php/include
+ rmdir "${pkgdir}/usr/include/php7/php/include"
}
package_php7-cgi() {
@@ -209,8 +209,8 @@
pkgdesc='CGI and FCGI SAPI for PHP'
depends=('php7')
- cd ${srcdir}/build
- make -j1 INSTALL_ROOT=${pkgdir} install-cgi
+ cd "${srcdir}/build"
+ make -j1 INSTALL_ROOT="${pkgdir}" install-cgi
}
package_php7-apache() {
@@ -218,8 +218,8 @@
depends=('php7' 'apache' 'libnsl')
backup=('etc/httpd/conf/extra/php7_module.conf')
- install -D -m755 ${srcdir}/build-apache/libs/libphp7.so
${pkgdir}/usr/lib/httpd/modules/libphp7.so
- install -D -m644 ${srcdir}/apache.conf
${pkgdir}/etc/httpd/conf/extra/php7_module.conf
+ install -D -m755 "${srcdir}/build-apache/libs/libphp7.so"
"${pkgdir}/usr/lib/httpd/modules/libphp7.so"
+ install -D -m644 "${srcdir}/apache.conf"
"${pkgdir}/etc/httpd/conf/extra/php7_module.conf"
}
package_php7-fpm() {
@@ -228,10 +228,10 @@
backup=('etc/php7/php-fpm.conf' 'etc/php7/php-fpm.d/www.conf')
options=('!emptydirs')
- cd ${srcdir}/build
- make -j1 INSTALL_ROOT=${pkgdir} install-fpm
- install -D -m644 sapi/fpm/php-fpm.service
${pkgdir}/usr/lib/systemd/system/php-fpm7.service
- install -D -m644 ${srcdir}/php-fpm.tmpfiles
${pkgdir}/usr/lib/tmpfiles.d/php-fpm7.conf
+ cd "${srcdir}/build"
+ make -j1 INSTALL_ROOT="${pkgdir}" install-fpm
+ install -D -m644 sapi/fpm/php-fpm.service
"${pkgdir}/usr/lib/systemd/system/php-fpm7.service"
+ install -D -m644 "${srcdir}/php-fpm.tmpfiles"
"${pkgdir}/usr/lib/tmpfiles.d/php-fpm7.conf"
}
package_php7-embed() {
@@ -239,8 +239,8 @@
depends=('php7' 'systemd-libs' 'libnsl' 'libxcrypt')
options=('!emptydirs')
- cd ${srcdir}/build
- make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
+ cd "${srcdir}/build"
+ make -j1 INSTALL_ROOT="${pkgdir}" PHP_SAPI=embed install-sapi
}
package_php7-phpdbg() {
@@ -248,8 +248,8 @@
depends=('php7')
options=('!emptydirs')
- cd ${srcdir}/build-phpdbg
- make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
+ cd "${srcdir}/build-phpdbg"
+ make -j1 INSTALL_ROOT="${pkgdir}" install-phpdbg
}
package_php7-dblib() {
@@ -256,7 +256,7 @@
pkgdesc='dblib module for PHP'
depends=('php7' 'freetds')
- install -D -m755 ${srcdir}/build/modules/pdo_dblib.so
${pkgdir}/usr/lib/php7/modules/pdo_dblib.so
+ install -D -m755 "${srcdir}/build/modules/pdo_dblib.so"
"${pkgdir}/usr/lib/php7/modules/pdo_dblib.so"
}
package_php7-enchant() {
@@ -263,7 +263,7 @@
pkgdesc='enchant module for PHP'
depends=('php7' 'enchant')
- install -D -m755 ${srcdir}/build/modules/enchant.so
${pkgdir}/usr/lib/php7/modules/enchant.so
+ install -D -m755 "${srcdir}/build/modules/enchant.so"
"${pkgdir}/usr/lib/php7/modules/enchant.so"
}
package_php7-gd() {
@@ -270,7 +270,7 @@
pkgdesc='gd module for PHP'
depends=('php7' 'gd')
- install -D -m755 ${srcdir}/build/modules/gd.so
${pkgdir}/usr/lib/php7/modules/gd.so
+ install -D -m755 "${srcdir}/build/modules/gd.so"
"${pkgdir}/usr/lib/php7/modules/gd.so"
}
package_php7-imap() {
@@ -277,7 +277,7 @@
pkgdesc='imap module for PHP'
depends=('php7' 'c-client' 'libxcrypt')
- install -D -m755 ${srcdir}/build/modules/imap.so
${pkgdir}/usr/lib/php7/modules/imap.so
+ install -D -m755 "${srcdir}/build/modules/imap.so"
"${pkgdir}/usr/lib/php7/modules/imap.so"
}
package_php7-intl() {
@@ -284,7 +284,7 @@
pkgdesc='intl module for PHP'
depends=('php7' 'icu')
- install -D -m755 ${srcdir}/build/modules/intl.so
${pkgdir}/usr/lib/php7/modules/intl.so
+ install -D -m755 "${srcdir}/build/modules/intl.so"
"${pkgdir}/usr/lib/php7/modules/intl.so"
}
package_php7-sodium() {
@@ -291,7 +291,7 @@
pkgdesc='sodium module for PHP'
depends=('php7' 'libsodium')
- install -D -m755 ${srcdir}/build/modules/sodium.so
${pkgdir}/usr/lib/php7/modules/sodium.so
+ install -D -m755 "${srcdir}/build/modules/sodium.so"
"${pkgdir}/usr/lib/php7/modules/sodium.so"
}
package_php7-odbc() {
@@ -298,8 +298,8 @@
pkgdesc='ODBC modules for PHP'
depends=('php7' 'unixodbc')
- install -D -m755 ${srcdir}/build/modules/odbc.so
${pkgdir}/usr/lib/php7/modules/odbc.so
- install -D -m755 ${srcdir}/build/modules/pdo_odbc.so
${pkgdir}/usr/lib/php7/modules/pdo_odbc.so
+ install -D -m755 "${srcdir}/build/modules/odbc.so"
"${pkgdir}/usr/lib/php7/modules/odbc.so"
+ install -D -m755 "${srcdir}/build/modules/pdo_odbc.so"
"${pkgdir}/usr/lib/php7/modules/pdo_odbc.so"
}
package_php7-pgsql() {
@@ -306,8 +306,8 @@
pkgdesc='PostgreSQL modules for PHP'
depends=('php7' 'postgresql-libs')
- install -D -m755 ${srcdir}/build/modules/pgsql.so
${pkgdir}/usr/lib/php7/modules/pgsql.so
- install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so
${pkgdir}/usr/lib/php7/modules/pdo_pgsql.so
+ install -D -m755 "${srcdir}/build/modules/pgsql.so"
"${pkgdir}/usr/lib/php7/modules/pgsql.so"
+ install -D -m755 "${srcdir}/build/modules/pdo_pgsql.so"
"${pkgdir}/usr/lib/php7/modules/pdo_pgsql.so"
}
package_php7-pspell() {
@@ -314,7 +314,7 @@
pkgdesc='pspell module for PHP'
depends=('php7' 'aspell')
- install -D -m755 ${srcdir}/build/modules/pspell.so
${pkgdir}/usr/lib/php7/modules/pspell.so
+ install -D -m755 "${srcdir}/build/modules/pspell.so"
"${pkgdir}/usr/lib/php7/modules/pspell.so"
}
package_php7-snmp() {
@@ -321,7 +321,7 @@
pkgdesc='snmp module for PHP'
depends=('php7' 'net-snmp')
- install -D -m755 ${srcdir}/build/modules/snmp.so
${pkgdir}/usr/lib/php7/modules/snmp.so
+ install -D -m755 "${srcdir}/build/modules/snmp.so"
"${pkgdir}/usr/lib/php7/modules/snmp.so"
}
package_php7-sqlite() {
@@ -328,8 +328,8 @@
pkgdesc='sqlite module for PHP'
depends=('php7' 'sqlite')
- install -D -m755 ${srcdir}/build/modules/sqlite3.so
${pkgdir}/usr/lib/php7/modules/sqlite3.so
- install -D -m755 ${srcdir}/build/modules/pdo_sqlite.so
${pkgdir}/usr/lib/php7/modules/pdo_sqlite.so
+ install -D -m755 "${srcdir}/build/modules/sqlite3.so"
"${pkgdir}/usr/lib/php7/modules/sqlite3.so"
+ install -D -m755 "${srcdir}/build/modules/pdo_sqlite.so"
"${pkgdir}/usr/lib/php7/modules/pdo_sqlite.so"
}
package_php7-tidy() {
@@ -336,7 +336,7 @@
pkgdesc='tidy module for PHP'
depends=('php7' 'tidy')
- install -D -m755 ${srcdir}/build/modules/tidy.so
${pkgdir}/usr/lib/php7/modules/tidy.so
+ install -D -m755 "${srcdir}/build/modules/tidy.so"
"${pkgdir}/usr/lib/php7/modules/tidy.so"
}
package_php7-xsl() {
@@ -343,5 +343,5 @@
pkgdesc='xsl module for PHP'
depends=('php7' 'libxslt')
- install -D -m755 ${srcdir}/build/modules/xsl.so
${pkgdir}/usr/lib/php7/modules/xsl.so
+ install -D -m755 "${srcdir}/build/modules/xsl.so"
"${pkgdir}/usr/lib/php7/modules/xsl.so"
}
Modified: generate_patches
===================================================================
--- generate_patches 2021-01-16 12:55:05 UTC (rev 406298)
+++ generate_patches 2021-01-16 13:02:13 UTC (rev 406299)
@@ -4,7 +4,7 @@
makepkg -o --nodeps --noprepare --skipinteg
-pushd src/php-${pkgver}
+pushd "src/php-${pkgver}"
sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4
