Date: Tuesday, February 2, 2016 @ 18:29:29
Author: pierre
Revision: 258793
Implement FS#47983
Modified:
php/trunk/PKGBUILD
php/trunk/generate_patches
php/trunk/php.ini.patch
------------------+
PKGBUILD | 21 +++++++++++++++------
generate_patches | 2 +-
php.ini.patch | 5 +++--
3 files changed, 19 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-02 16:39:45 UTC (rev 258792)
+++ PKGBUILD 2016-02-02 17:29:29 UTC (rev 258793)
@@ -8,6 +8,7 @@
'php-fpm'
'php-embed'
'php-phpdbg'
+ 'php-dblib'
'php-enchant'
'php-gd'
'php-imap'
@@ -20,23 +21,23 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=7.0.2
-pkgrel=2
+pkgver=7.0.3
+pkgrel=1
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu'
'libmcrypt' 'libxslt' 'libzip' 'net-snmp'
- 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl'
'libtool' 'postfix')
+ 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl'
'libtool' 'postfix' 'freetds')
checkdepends=('procps-ng')
source=("https://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch')
-sha256sums=('556121271a34c442b48e3d7fa3d3bbb4413d91897abbb92aaeced4a7df5f2ab2'
+sha256sums=('3af2b62617a0e46214500fc3e7f4a421067224913070844d3665d6cc925a1cca'
'SKIP'
'd7b8d14a6ecf956acbf70c11446800c4d0b36fcc578faa58a9c31cae7f6a36cd'
'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
'136e197384255420c73678aef812e70aa86320f6dbefcc5a952df1a65fdd53fa'
'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
- 'e285f6fac11719d3f73bd9b3d4f557a4ae45015e789252eada2582eac22a73fc')
+ '3ee1d4696ccbc8850db19dbf3ac1275ce40debea3b2402c7316d86f7028407da')
validpgpkeys=('1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763'
'6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3')
@@ -102,6 +103,7 @@
--with-mysqli=shared,mysqlnd \
--with-openssl \
--with-pcre-regex=/usr \
+ --with-pdo-dblib=shared,/usr \
--with-pdo-mysql=shared,mysqlnd \
--with-pdo-odbc=shared,unixODBC,/usr \
--with-pdo-pgsql=shared \
@@ -184,7 +186,7 @@
# remove static modules
rm -f ${pkgdir}/usr/lib/php/modules/*.a
# remove modules provided by sub packages
- rm -f
${pkgdir}/usr/lib/php/modules/{enchant,gd,imap,intl,mcrypt,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+ rm -f
${pkgdir}/usr/lib/php/modules/{enchant,gd,imap,intl,mcrypt,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
# remove empty directory
rmdir ${pkgdir}/usr/include/php/include
}
@@ -237,6 +239,13 @@
make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
}
+package_php-dblib() {
+ pkgdesc='dblib module for PHP'
+ depends=('php' 'freetds')
+
+ install -D -m755 ${srcdir}/build/modules/pdo_dblib.so
${pkgdir}/usr/lib/php/modules/pdo_dblib.so
+}
+
package_php-enchant() {
pkgdesc='enchant module for PHP'
depends=('php' 'enchant')
Modified: generate_patches
===================================================================
--- generate_patches 2016-02-02 16:39:45 UTC (rev 258792)
+++ generate_patches 2016-02-02 17:29:29 UTC (rev 258793)
@@ -26,7 +26,7 @@
-e 's#^PIDFile=.*#PIDFile=/run/php-fpm/php-fpm.pid#' \
-i.orig sapi/fpm/php-fpm.service.in
-extensions=";extension=bcmath.so\n;extension=bz2.so\n;extension=calendar.so\nextension=curl.so\n;extension=dba.so\n;extension=enchant.so\n;extension=exif.so\n;extension=ftp.so\n;extension=gd.so\n;extension=gettext.so\n;extension=gmp.so\n;extension=iconv.so\n;extension=imap.so\n;extension=intl.so\n;extension=ldap.so\n;extension=mcrypt.so\n;extension=mysqli.so\n;extension=odbc.so\n;zend_extension=opcache.so\n;extension=pdo_mysql.so\n;extension=pdo_odbc.so\n;extension=pdo_pgsql.so\n;extension=pdo_sqlite.so\n;extension=pgsql.so\n;extension=pspell.so\n;extension=shmop.so\n;extension=snmp.so\n;extension=soap.so\n;extension=sockets.so\n;extension=sqlite3.so\n;extension=sysvmsg.so\n;extension=sysvsem.so\n;extension=sysvshm.so\n;extension=tidy.so\n;extension=xmlrpc.so\n;extension=xsl.so\nextension=zip.so\n"
+extensions=";extension=bcmath.so\n;extension=bz2.so\n;extension=calendar.so\nextension=curl.so\n;extension=dba.so\n;extension=enchant.so\n;extension=exif.so\n;extension=ftp.so\n;extension=gd.so\n;extension=gettext.so\n;extension=gmp.so\n;extension=iconv.so\n;extension=imap.so\n;extension=intl.so\n;extension=ldap.so\n;extension=mcrypt.so\n;extension=mysqli.so\n;extension=odbc.so\n;zend_extension=opcache.so\n;extension=pdo_dblib.so\n;extension=pdo_mysql.so\n;extension=pdo_odbc.so\n;extension=pdo_pgsql.so\n;extension=pdo_sqlite.so\n;extension=pgsql.so\n;extension=pspell.so\n;extension=shmop.so\n;extension=snmp.so\n;extension=soap.so\n;extension=sockets.so\n;extension=sqlite3.so\n;extension=sysvmsg.so\n;extension=sysvsem.so\n;extension=sysvshm.so\n;extension=tidy.so\n;extension=xmlrpc.so\n;extension=xsl.so\nextension=zip.so\n"
sed \
-r ":a;N;\$!ba;s/; Windows
Extensions\n.+;?extension=php_[a-z]+\.dll\n/${extensions}/g" \
Modified: php.ini.patch
===================================================================
--- php.ini.patch 2016-02-02 16:39:45 UTC (rev 258792)
+++ php.ini.patch 2016-02-02 17:29:29 UTC (rev 258793)
@@ -1,6 +1,6 @@
--- php.ini-production.orig
+++ php.ini-production
-@@ -720,7 +720,7 @@
+@@ -719,7 +719,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
@@ -9,7 +9,7 @@
; On windows:
; extension_dir = "ext"
-@@ -858,46 +858,43 @@
+@@ -857,46 +857,44 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
@@ -72,6 +72,7 @@
+;extension=mysqli.so
+;extension=odbc.so
+;zend_extension=opcache.so
++;extension=pdo_dblib.so
+;extension=pdo_mysql.so
+;extension=pdo_odbc.so
+;extension=pdo_pgsql.so
