summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Harrison2019-12-30 10:47:00 -0500
committerMatt Harrison2019-12-30 10:47:00 -0500
commit658b9a133e76ad6fd5811f378bb66cbbeb05ea38 (patch)
treeacac60e78f4ada845a7d3bf83c96225f082d43fc
parent87c15ee2c5fc57fe43f11f7d7cc9f9bc29565029 (diff)
downloadaur-658b9a133e76ad6fd5811f378bb66cbbeb05ea38.tar.gz
upgpkg: php73 7.3.13-2
Update php73-fpm so the systemd service file points to the correct binary.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rwxr-xr-xgenerate_patches1
-rw-r--r--php-fpm.patch6
4 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6c7dfcf1e7d..96599e140f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = php73
pkgver = 7.3.13
- pkgrel = 1
+ pkgrel = 2
url = https://www.php.net/
arch = x86_64
license = PHP
@@ -43,7 +43,7 @@ pkgbase = php73
sha256sums = SKIP
sha256sums = 62e5ceea3c90a3c6eab1166488f876e766efcfd7d4e973c44060a9e72d51a98a
sha256sums = 25c55dbd006ca1b03472a4a7e438cc512cc5d7c3ae6f3d5cb410c3da77c77f78
- sha256sums = 3af13ba1043104947bda4e400711a6baed4bb8814e92ed54e04f1415d78f2dd2
+ sha256sums = 7e4736dc63746e8b58f0d76ccbcd14cf5f221864b61ba16e2fc736e1ac22f41a
sha256sums = c28997b08d3ea257a2435164e35d0340f42cd3306def6a94b6b8c0a2f5644def
sha256sums = cd3b12c1cd5860f77325ef5405b987eca9cd894cbc99bde6ea4bdbed78ff5d46
sha256sums = 3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32
diff --git a/PKGBUILD b/PKGBUILD
index aa64d286071..41f47984489 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ pkgname=("${pkgbase}"
"${pkgbase}-tidy"
"${pkgbase}-xsl")
pkgver=7.3.13
-pkgrel=1
+pkgrel=2
arch=('x86_64')
license=('PHP')
url='https://www.php.net/'
@@ -37,7 +37,7 @@ sha256sums=('57ac55fe442d2da650abeb9e6fa161bd3a98ba6528c029f076f8bba43dd5c228'
'SKIP'
'62e5ceea3c90a3c6eab1166488f876e766efcfd7d4e973c44060a9e72d51a98a'
'25c55dbd006ca1b03472a4a7e438cc512cc5d7c3ae6f3d5cb410c3da77c77f78'
- '3af13ba1043104947bda4e400711a6baed4bb8814e92ed54e04f1415d78f2dd2'
+ '7e4736dc63746e8b58f0d76ccbcd14cf5f221864b61ba16e2fc736e1ac22f41a'
'c28997b08d3ea257a2435164e35d0340f42cd3306def6a94b6b8c0a2f5644def'
'cd3b12c1cd5860f77325ef5405b987eca9cd894cbc99bde6ea4bdbed78ff5d46'
'3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32'
diff --git a/generate_patches b/generate_patches
index 8ec5a36d963..ac156d5a780 100755
--- a/generate_patches
+++ b/generate_patches
@@ -24,6 +24,7 @@ sed \
sed \
-e 's#^PIDFile=.*#PIDFile=/run/php73-fpm/php-fpm.pid#' \
+ -e 's#^ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize#ExecStart=@EXPANDED_SBINDIR@/php-fpm73 --nodaemonize#' \
-i.orig sapi/fpm/php-fpm.service.in
extensions=";extension=bcmath\n;extension=bz2\n;extension=calendar\nextension=curl\n;extension=dba\n;extension=enchant\n;extension=exif\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\n;extension=sodium\n;extension=ldap\n;extension=mysqli\n;extension=odbc\n;zend_extension=opcache\n;extension=pdo_dblib\n;extension=pdo_mysql\n;extension=pdo_odbc\n;extension=pdo_pgsql\n;extension=pdo_sqlite\n;extension=pgsql\n;extension=pspell\n;extension=shmop\n;extension=snmp\n;extension=soap\n;extension=sockets\n;extension=sqlite3\n;extension=sysvmsg\n;extension=sysvsem\n;extension=sysvshm\n;extension=tidy\n;extension=xmlrpc\n;extension=xsl\nextension=zip\n"
diff --git a/php-fpm.patch b/php-fpm.patch
index 2babe4c1108..e00aeb012b3 100644
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -63,12 +63,14 @@
; stderr will be redirected to /dev/null according to FastCGI specs.
--- sapi/fpm/php-fpm.service.in.orig
+++ sapi/fpm/php-fpm.service.in
-@@ -8,7 +8,7 @@
+@@ -8,8 +8,8 @@
[Service]
Type=@php_fpm_systemd@
-PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
+-ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
+PIDFile=/run/php73-fpm/php-fpm.pid
- ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
++ExecStart=@EXPANDED_SBINDIR@/php-fpm73 --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
ExecReload=/bin/kill -USR2 $MAINPID
PrivateTmp=true
+