[arch-commits] Commit in php/trunk (7 files)
Date: Friday, November 29, 2019 @ 17:28:24
Author: pierre
Revision: 369923
upgpkg: php 7.4.0-1
Modified:
php/trunk/PKGBUILD
php/trunk/apache.patch
php/trunk/enchant-2.patch
php/trunk/generate_patches
php/trunk/php-fpm.patch
php/trunk/php.ini.patch
Deleted:
php/trunk/freetype.patch
--+
PKGBUILD | 56 +
apache.patch |4 +--
enchant-2.patch | 44 +++--
freetype.patch | 38 ---
generate_patches | 18 -
php-fpm.patch|2 -
php.ini.patch| 13 +---
7 files changed, 69 insertions(+), 106 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-29 15:59:38 UTC (rev 369922)
+++ PKGBUILD2019-11-29 17:28:24 UTC (rev 369923)
@@ -20,28 +20,28 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=7.3.12
+pkgver=7.4.0
pkgrel=1
arch=('x86_64')
license=('PHP')
url='https://secure.php.net/'
makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu'
'libsodium' 'libxslt' 'libzip' 'net-snmp'
- 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl'
'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl')
+ 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl'
'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl'
+ 'oniguruma')
checkdepends=('procps-ng')
source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch'
-'enchant-2.patch' 'freetype.patch')
-sha256sums=('aafe5e9861ad828860c6af8c88cdc1488314785962328eb1783607c1fdd855df'
+'enchant-2.patch')
+sha256sums=('9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42'
'SKIP'
-'62e5ceea3c90a3c6eab1166488f876e766efcfd7d4e973c44060a9e72d51a98a'
+'b4ea038f2863801175d6c4e74c685913feecdd5be3d49aff7d9b3fa92d8c4159'
'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
-'7ae4870d54340ee5be5a4fbb61bf81d3bfa33fa3b8d59bafcfa17509e2775234'
+'41f23ebc2d986473b9a4eb3f233428349367b2baa2bb715c53e720cc34c9378c'
'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
-'07627f57bbc5559a63bfc77e21edd4e2a5d3aa15fed4d9dfe00e877dd31b7c9f'
-'3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32'
-'07c4648669dc05afc3c1ad5a4739768079c423b817eabf5296ca3d1ea5ffd163')
-validpgpkeys=('CBAF69F173A0FEA4B537F470D66C9593118BCCB6'
- 'F38252826ACD957EF380D39F2F7956BC5DA04B5D')
+'03beeb8b62a499805a4b912cb19d048635cb5542478753e58364bf24fb42ff3c'
+'92a048073713c3600713b3dd46e96b33a2dde2aef1fbdf175d83da1dc679a0c5')
+validpgpkeys=('5A52880781F755608BF815FC910DEB46F53EA312'
+ '42670A7FE4D0441C8E4632349E4FDC074A4EF02D')
prepare() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -49,8 +49,7 @@
patch -p0 -i ${srcdir}/apache.patch
patch -p0 -i ${srcdir}/php-fpm.patch
patch -p0 -i ${srcdir}/php.ini.patch
- patch -p1 -i ${srcdir}/enchant-2.patch
- patch -p1 -i ${srcdir}/freetype.patch
+ patch -p0 -i ${srcdir}/enchant-2.patch
autoconf
rm tests/output/stream_isatty_*.phpt
@@ -71,7 +70,6 @@
--with-config-file-scan-dir=/etc/php/conf.d \
--disable-rpath \
--mandir=/usr/share/man \
- --without-pear \
"
local _phpextensions="\
@@ -80,8 +78,10 @@
--enable-dba=shared \
--enable-exif=shared \
--enable-ftp=shared \
+ --enable-gd=shared \
--enable-intl=shared \
--enable-mbstring \
+ --enable-pcntl \
--enable-shmop=shared \
--enable-soap=shared \
--enable-sockets=shared \
@@ -88,13 +88,13 @@
--enable-sysvmsg=shared \
--enable-sysvsem=shared \
--enable-sysvshm=shared \
- --enable-zip=shared \
--with-bz2=shared \
--with-curl=shared \
--with-db4=/usr \
- --with-enchant=shared,/usr \
- --with-freetype-dir=/usr \
- --with-gd=shared,/usr \
+ --with-enchant=shared \
+ --with-external-gd \
+ --with-external-pcre \
+ --with-ffi=shared \
--with-gdbm \
--with-gettext=shared \
--with-gmp=shared \
@@ -101,33 +101,31 @@
--with-iconv=shared \
--with-imap-ssl \
--with-imap=shared \
- --with-kerberos=/usr \
+ --with-kerberos \
[arch-commits] Commit in php/trunk (7 files)
Date: Thursday, May 31, 2012 @ 06:36:35
Author: pierre
Revision: 160224
use /run instead of /var/run; create /run/php-fpm on install if needed
Added:
php/trunk/php-fpm.install
Modified:
php/trunk/PKGBUILD
php/trunk/logrotate.d.php-fpm
php/trunk/php-fpm.conf.in.patch
php/trunk/php-fpm.service
php/trunk/php-fpm.tmpfiles
php/trunk/rc.d.php-fpm
---+
PKGBUILD |3 ++-
logrotate.d.php-fpm |2 +-
php-fpm.conf.in.patch |4 ++--
php-fpm.install |9 +
php-fpm.service |2 +-
php-fpm.tmpfiles |2 +-
rc.d.php-fpm | 18 +-
7 files changed, 25 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-05-31 10:26:47 UTC (rev 160223)
+++ PKGBUILD2012-05-31 10:36:35 UTC (rev 160224)
@@ -22,7 +22,7 @@
'php-tidy'
'php-xsl')
pkgver=5.4.3
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -235,6 +235,7 @@
pkgdesc='FastCGI Process Manager for PHP'
depends=('php')
backup=('etc/php/php-fpm.conf')
+ install='php-fpm.install'
install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm
${pkgdir}/usr/sbin/php-fpm
install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8
${pkgdir}/usr/share/man/man8/php-fpm.8
Modified: logrotate.d.php-fpm
===
--- logrotate.d.php-fpm 2012-05-31 10:26:47 UTC (rev 160223)
+++ logrotate.d.php-fpm 2012-05-31 10:36:35 UTC (rev 160224)
@@ -3,6 +3,6 @@
notifempty
delaycompress
postrotate
- kill -USR1 `cat /var/run/php-fpm/php-fpm.pid 2/dev/null`
2/dev/null || true
+ kill -USR1 `cat /run/php-fpm/php-fpm.pid 2/dev/null`
2/dev/null || true
endscript
}
Modified: php-fpm.conf.in.patch
===
--- php-fpm.conf.in.patch 2012-05-31 10:26:47 UTC (rev 160223)
+++ php-fpm.conf.in.patch 2012-05-31 10:36:35 UTC (rev 160224)
@@ -14,7 +14,7 @@
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Default Value: none
-;pid = run/php-fpm.pid
-+pid = run/php-fpm/php-fpm.pid
++pid = /run/php-fpm/php-fpm.pid
; Error log file
; If it's set to syslog, log is sent to syslogd instead of being written
@@ -24,7 +24,7 @@
; Note: This value is mandatory.
-listen = 127.0.0.1:9000
+;listen = 127.0.0.1:9000
-+listen = /var/run/php-fpm/php-fpm.sock
++listen = /run/php-fpm/php-fpm.sock
; Set listen(2) backlog.
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
Added: php-fpm.install
===
--- php-fpm.install (rev 0)
+++ php-fpm.install 2012-05-31 10:36:35 UTC (rev 160224)
@@ -0,0 +1,9 @@
+post_install() {
+ if [[ ! -d run/php-fpm ]]; then
+ usr/bin/systemd-tmpfiles --create
usr/lib/tmpfiles.d/php-fpm.conf
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
Modified: php-fpm.service
===
--- php-fpm.service 2012-05-31 10:26:47 UTC (rev 160223)
+++ php-fpm.service 2012-05-31 10:36:35 UTC (rev 160224)
@@ -4,7 +4,7 @@
[Service]
Type=forking
-PIDFile=/var/run/php-fpm/php-fpm.pid
+PIDFile=/run/php-fpm/php-fpm.pid
PrivateTmp=true
ExecStart=/usr/sbin/php-fpm
ExecReload=/bin/kill -USR2 $MAINPID
Modified: php-fpm.tmpfiles
===
--- php-fpm.tmpfiles2012-05-31 10:26:47 UTC (rev 160223)
+++ php-fpm.tmpfiles2012-05-31 10:36:35 UTC (rev 160224)
@@ -1 +1 @@
-d /var/run/php-fpm 755 root root
+d /run/php-fpm 755 root root
Modified: rc.d.php-fpm
===
--- rc.d.php-fpm2012-05-31 10:26:47 UTC (rev 160223)
+++ rc.d.php-fpm2012-05-31 10:36:35 UTC (rev 160224)
@@ -64,7 +64,7 @@
exit 1
fi
- wait_for_pid created /var/run/php-fpm/php-fpm.pid
+ wait_for_pid created /run/php-fpm/php-fpm.pid
if [ -n $try ] ; then
stat_fail
@@ -79,14 +79,14 @@
test_config
stat_busy 'Gracefully shutting down php-fpm'
- if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+ if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
stat_fail
exit 1
fi
- kill -QUIT `cat /var/run/php-fpm/php-fpm.pid`
+ kill -QUIT `cat /run/php-fpm/php-fpm.pid`
- wait_for_pid removed /var/run/php-fpm.pid
+ wait_for_pid removed /run/php-fpm.pid
if [ -n $try ] ; then
stat_fail
@@ -100,14 +100,14 @@
force-quit)
