summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Rynn2017-07-25 12:13:02 +1000
committerMichael Rynn2017-07-25 12:13:02 +1000
commit60c8d1038e1b64f2a216599ebaa634f261e0cc77 (patch)
tree91edc820419ef00c83e6af935bdc7f2f24efd97a
parent0d37a17622c4223b5a645c030fdf4cf70278e91e (diff)
downloadaur-60c8d1038e1b64f2a216599ebaa634f261e0cc77.tar.gz
release 2 for 7.0.21
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD20
2 files changed, 17 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e29bb3dadf8..75020143aab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = php70
pkgdesc = PHP scripting language package for stable release of 7.0 series
pkgver = 7.0.21
- pkgrel = 1
+ pkgrel = 2
url = http://www.php.net
arch = i686
arch = x86_64
@@ -53,7 +53,7 @@ pkgname = php70
provides = php=7.0.21
conflicts = php70-ldap
replaces = php70-ldap
- backup = etc/${pkgbase}/php.ini
+ backup = etc/php70/php.ini
pkgname = php70-cgi
pkgdesc = CGI and FCGI SAPI for PHP
diff --git a/PKGBUILD b/PKGBUILD
index 3ca38dd3a01..3e934865242 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@ pkgname=("${pkgbase}"
"${pkgbase}-tidy"
"${pkgbase}-xsl")
pkgver=7.0.21
-pkgrel=1
+pkgrel=2
pkgdesc="PHP scripting language package for stable release of 7.0 series"
arch=('i686' 'x86_64')
license=('PHP')
@@ -52,6 +52,14 @@ sha256sums=('6713fe3024365d661593235b525235045ef81f18d0043654658c9de1bcb8b9e3'
'2f678d039313ee613d59c8b4bf9f48068085df0fa8ac7ca4cf807e168061a8c9'
)
# keys from http://php.net/downloads.php#gpg-7.0
+#
+#pub 2048R/9C0D5763 2015-06-09 [expires: 2024-06-06]
+#key fingerprint = 1A4E 8B72 77C4 2E53 DBA9 C7B9 BCAA 30EA 9C0D 5763
+#uid Anatol Belski <ab@php.net>
+
+#pub 2048R/33CFC8B3 2014-01-14 [expires: 2020-01-13]
+#Key fingerprint = 6E4F 6AB3 21FD C07F 2C33 2E3A C2BF 0BC4 33CF C8B3
+#uid Ferenc Kovacs <tyrael@php.net>
validpgpkeys=(
'1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763'
'6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3'
@@ -180,15 +188,17 @@ build() {
cd ../../
}
-
-
+#
+# Its a good idea to have extensions specified by extension.ini files in the conf.d directory,
+# so they are unaffected by upgrades.
+#
package_php70() {
pkgdesc='A general-purpose scripting language that is especially suited to web development'
depends=('libxml2' 'curl' 'libzip' 'pcre')
replaces=('php70-ldap')
conflicts=('php70-ldap')
provides=("${_pkgbase}=$pkgver")
- backup=('etc/${pkgbase}/php.ini')
+ backup=("etc/${pkgbase}/php.ini")
cd ${srcdir}/build
make -j1 INSTALL_ROOT=${pkgdir} install-{modules,cli,build,headers,programs,pharcmd}
@@ -253,7 +263,7 @@ package_php70-fpm() {
cd ${srcdir}/build
make -j1 INSTALL_ROOT=${pkgdir} install-fpm
install -D -m644 sapi/fpm/php-fpm.service ${pkgdir}/usr/lib/systemd/system/${pkgbase}-fpm.service
- install -D -m644 ${srcdir}/../php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}-fpm.conf
+ install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}-fpm.conf
}
package_php70-embed() {