Date: Sunday, December 11, 2022 @ 16:12:15
Author: freswa
Revision: 464153
db 6 rebuild
Added:
php/trunk/db6_compat.patch
Modified:
php/trunk/PKGBUILD
------------------+
PKGBUILD | 9 ++++++---
db6_compat.patch | 11 +++++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-11 14:44:05 UTC (rev 464152)
+++ PKGBUILD 2022-12-11 16:12:15 UTC (rev 464153)
@@ -21,7 +21,7 @@
'php-tidy'
'php-xsl')
pkgver=8.1.13
-pkgrel=1
+pkgrel=2
arch=('x86_64')
license=('PHP')
url='https://www.php.net/'
@@ -31,7 +31,8 @@
checkdepends=('procps-ng')
options=(debug)
source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
- 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch')
+ 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch'
+ 'db6_compat.patch')
sha256sums=('b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856'
'SKIP'
'702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca'
@@ -38,7 +39,8 @@
'4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e'
'aa55fa4fc5c2b2493065bbd00cfe3c97a1b22b3dc7d34f8fd303de18cafe844f'
'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
- 'b3b3385f1c36e272671c7db238b2a69896e11a82db90dafd74964f2eabbfa2f2')
+ 'b3b3385f1c36e272671c7db238b2a69896e11a82db90dafd74964f2eabbfa2f2'
+ '17b9c55e4c19400b224c000fba11be8d9bcf37ce71812fd863575d2a853aeb75')
validpgpkeys=('F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD'
'39B641343D8C104B2B146DC3F9C39DC0B9698544')
_interpreter=${pkgver%.*}
@@ -49,6 +51,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}/db6_compat.patch"
autoconf
# Disable failing tests
Added: db6_compat.patch
===================================================================
--- db6_compat.patch (rev 0)
+++ db6_compat.patch 2022-12-11 16:12:15 UTC (rev 464153)
@@ -0,0 +1,11 @@
+--- aaa/ext/dba/config.m4 2022-12-11 16:33:02.721079548 +0100
++++ bbb/ext/dba/config.m4 2022-12-11 16:33:59.821200682 +0100
+@@ -308,7 +308,7 @@
+ ]])],[
+ AC_EGREP_CPP(yes,[
+ #include "$THIS_INCLUDE"
+-#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5)
++#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5) || ($1 == 4
&& DB_VERSION_MAJOR == 6)
+ yes
+ #endif
+ ],[
