summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO44
-rw-r--r--PKGBUILD16
2 files changed, 32 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6aa3bb1fb1c..59768170087 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = php70
pkgdesc = PHP scripting language package for stable release of 7.0 series
- pkgver = 7.0.25
+ pkgver = 7.0.26
pkgrel = 1
url = http://www.php.net
arch = i686
@@ -27,8 +27,8 @@ pkgbase = php70
makedepends = freetds
makedepends = pcre
makedepends = c-client
- source = https://php.net/distributions/php-7.0.25.tar.xz
- source = https://php.net/distributions/php-7.0.25.tar.xz.asc
+ source = https://php.net/distributions/php-7.0.26.tar.xz
+ source = https://php.net/distributions/php-7.0.26.tar.xz.asc
source = apache.patch
source = apache.conf
source = php-fpm.patch
@@ -36,7 +36,7 @@ pkgbase = php70
source = php.ini.patch
validpgpkeys = 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
validpgpkeys = 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
- sha256sums = 5cc14bd20fb2226f6d34465662425cd100441bde9042ea1cef2e4506d6ded8cc
+ sha256sums = ed5cbb4bbb0ddef8985f100bba2e94002ad22a230b5da2dccfe148915df5f199
sha256sums = SKIP
sha256sums = 819f05d2fd5a75c96e93c863517ca77dbd021a1224dc2d8096f758fb2937df6a
sha256sums = df075b89484eb3a08402788580de16d23123f95541b2e9aed8d928105de9b874
@@ -50,7 +50,7 @@ pkgname = php70
depends = curl
depends = libzip
depends = pcre
- provides = php=7.0.25
+ provides = php=7.0.26
conflicts = php70-ldap
replaces = php70-ldap
backup = etc/php70/php.ini
@@ -58,13 +58,13 @@ pkgname = php70
pkgname = php70-cgi
pkgdesc = CGI and FCGI SAPI for PHP
depends = php70
- provides = php-cgi=7.0.25
+ provides = php-cgi=7.0.26
pkgname = php70-apache
pkgdesc = Apache SAPI for PHP
depends = php70
depends = apache
- backup = etc/httpd/conf/extra/php_module.conf
+ backup = etc/httpd/conf/extra/php70_module.conf
pkgname = php70-fpm
pkgdesc = FastCGI Process Manager for PHP
@@ -77,90 +77,90 @@ pkgname = php70-fpm
pkgname = php70-embed
pkgdesc = Embedded PHP SAPI library
depends = php70
- provides = php70-embed=7.0.25
+ provides = php70-embed=7.0.26
options = !emptydirs
pkgname = php70-phpdbg
pkgdesc = Interactive PHP debugger
depends = php70
- provides = php70-phpdbg=7.0.25
+ provides = php70-phpdbg=7.0.26
options = !emptydirs
pkgname = php70-dblib
pkgdesc = dblib module for PHP
depends = php70
- provides = php70-dblib=7.0.25
+ provides = php70-dblib=7.0.26
pkgname = php70-enchant
pkgdesc = enchant module for PHP
depends = php70
depends = enchant
- provides = php70-enchant=7.0.25
+ provides = php70-enchant=7.0.26
pkgname = php70-gd
pkgdesc = gd module for PHP
depends = php70
depends = gd
- provides = php70-gd=7.0.25
+ provides = php70-gd=7.0.26
pkgname = php70-imap
pkgdesc = imap module for PHP
depends = php70
depends = c-client
- provides = php70-imap=7.0.25
+ provides = php70-imap=7.0.26
pkgname = php70-intl
pkgdesc = intl module for PHP
depends = php70
depends = icu
- provides = php70-intl=7.0.25
+ provides = php70-intl=7.0.26
pkgname = php70-mcrypt
pkgdesc = mcrypt module for PHP
depends = php70
depends = libmcrypt
depends = libltdl
- provides = php70-mcrypt=7.0.25
+ provides = php70-mcrypt=7.0.26
pkgname = php70-odbc
pkgdesc = ODBC modules for PHP
depends = php70
depends = unixodbc
- provides = php70-odbc=7.0.25
+ provides = php70-odbc=7.0.26
pkgname = php70-pgsql
pkgdesc = PostgreSQL modules for PHP
depends = php70
depends = postgresql-libs
- provides = php70-pgsql=7.0.25
+ provides = php70-pgsql=7.0.26
pkgname = php70-pspell
pkgdesc = pspell module for PHP
depends = php70
depends = aspell
- provides = php70-pspell=7.0.25
+ provides = php70-pspell=7.0.26
pkgname = php70-snmp
pkgdesc = snmp module for PHP
depends = php70
depends = net-snmp
- provides = php70-snmp=7.0.25
+ provides = php70-snmp=7.0.26
pkgname = php70-sqlite
pkgdesc = sqlite module for PHP
depends = php70
depends = sqlite
- provides = php70-sqlite=7.0.25
+ provides = php70-sqlite=7.0.26
pkgname = php70-tidy
pkgdesc = tidy module for PHP
depends = php70
depends = tidyhtml
- provides = php70-tidy=7.0.25
+ provides = php70-tidy=7.0.26
pkgname = php70-xsl
pkgdesc = xsl module for PHP
depends = php70
depends = libxslt
- provides = php70-xsl=7.0.25
+ provides = php70-xsl=7.0.26
diff --git a/PKGBUILD b/PKGBUILD
index eee2a32c414..ee838d20733 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@ pkgname=("${pkgbase}"
"${pkgbase}-sqlite"
"${pkgbase}-tidy"
"${pkgbase}-xsl")
-pkgver=7.0.25
+pkgver=7.0.26
pkgrel=1
pkgdesc="PHP scripting language package for stable release of 7.0 series"
arch=('i686' 'x86_64')
@@ -43,7 +43,7 @@ makedepends=('apache' 'aspell' 'db' 'enchant' 'gd' 'gmp' 'icu'
source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"{,.asc}
'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch'
)
-sha256sums=('5cc14bd20fb2226f6d34465662425cd100441bde9042ea1cef2e4506d6ded8cc'
+sha256sums=('ed5cbb4bbb0ddef8985f100bba2e94002ad22a230b5da2dccfe148915df5f199'
'SKIP'
'819f05d2fd5a75c96e93c863517ca77dbd021a1224dc2d8096f758fb2937df6a'
'df075b89484eb3a08402788580de16d23123f95541b2e9aed8d928105de9b874'
@@ -253,10 +253,14 @@ package_php70-cgi() {
package_php70-apache() {
pkgdesc='Apache SAPI for PHP'
depends=("${pkgbase}" 'apache')
- backup=("etc/httpd/conf/extra/${_pkgbase}_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/php70_module.conf
+ backup=("etc/httpd/conf/extra/${pkgbase}_module.conf")
+ echo "# End of LoadModule in httpd.conf - see ArchWiki Apache HTTP Server"
+ echo "LoadModule php7_module modules/libphp70.so"
+ echo "AddHandler php7-script .php"
+ echo "# End of Include List"
+ echo "Include conf/extra/php70_module.conf"
+ install -D -m755 ${srcdir}/build-apache/libs/libphp7.so ${pkgdir}/usr/lib/httpd/modules/lib${pkgbase}.so
+ install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/${pkgbase}_module.conf
}
package_php70-fpm() {