Fixed issue with db4

3 files changed, 7 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 040f1a79b5dc..2bc3fc874f9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 6.0.2
-# Wed Jan 11 09:29:34 UTC 2023
+# Wed Jan 11 10:01:18 UTC 2023
 pkgbase = php80
 	pkgdesc = PHP 8.0.27 compiled as to not conflict with mainline php
 	pkgver = 8.0.27
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.php.net
 	arch = x86_64
 	license = PHP
@@ -79,7 +79,7 @@ pkgbase = php80
 	sha256sums = ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52
 	sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
 	sha256sums = f942cbfe2f7bacbb8039fb79bbec41c76ea779ac5c8157f21e1e0c1b28a5fc3a
-	sha256sums = 9281736f0cbc60699992f92359a62d861c9c53391fd53e3826e77710ab981718
+	sha256sums = c9ab253399e58e24cf23cda5edd72a331b7b9aa9b2ac217b0ee04706cc67e93e
 	sha256sums = 558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c
 	sha256sums = 40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764
 	sha256sums = de55d2e5ea182c244b51f2e23fca9e6d83623fe269a729fd7bebd1e70e693aac
@@ -265,7 +265,7 @@ pkgname = php80-tokenizer
 pkgname = php80-dba
 	pkgdesc = dba module for php80
 	depends = php80=8.0.27
-	depends = db
+	depends = db5.3
 	depends = lmdb
 
 pkgname = php80-pgsql
diff --git a/PKGBUILD b/PKGBUILD
index 5fdfef260540..f58435e96da1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
 _phpbase="80"
 _suffix=""
 pkgver="8.0.27"
-pkgrel="1"
+pkgrel="2"
 pkgbase="php80"
 pkgdesc="PHP 8.0.27 compiled as to not conflict with mainline php"
 _cppflags=" -DU_USING_ICU_NAMESPACE=1 "
@@ -240,7 +240,7 @@ _ext_depends_mysql=(
 )
 _ext_depends_dba=(
     "php80=8.0.27"
-    "db"
+    "db5.3"
     "lmdb"
 )
 _ext_depends_odbc=(
@@ -1525,7 +1525,7 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             'ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52'
             '6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
             'f942cbfe2f7bacbb8039fb79bbec41c76ea779ac5c8157f21e1e0c1b28a5fc3a'
-            '9281736f0cbc60699992f92359a62d861c9c53391fd53e3826e77710ab981718'
+            'c9ab253399e58e24cf23cda5edd72a331b7b9aa9b2ac217b0ee04706cc67e93e'
             '558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c'
             '40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764'
             'de55d2e5ea182c244b51f2e23fca9e6d83623fe269a729fd7bebd1e70e693aac')
diff --git a/debian-php-8.0.patch b/debian-php-8.0.patch
index 6d616accffcc..1c89d227396c 100644
--- a/debian-php-8.0.patch
+++ b/debian-php-8.0.patch
@@ -16,74 +16,6 @@ index c70b1ed..d8a16e1 100644
  ;open_basedir =
  
  ; This directive allows you to disable certain functions.
-diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
-index 1e80319..51bdd84 100644
---- a/ext/dba/config.m4
-+++ b/ext/dba/config.m4
-@@ -375,61 +375,13 @@
-   dbdp4="/usr/local/BerkeleyDB.4."
-   dbdp5="/usr/local/BerkeleyDB.5."
-   for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
--    if test -f "$i/db5/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/db5/db.h
--      break
--    elif test -f "$i/db4/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/db4/db.h
--      break
--    elif test -f "$i/include/db5.3/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db5.3/db.h
--      break
--    elif test -f "$i/include/db5.1/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db5.1/db.h
--      break
--    elif test -f "$i/include/db5.0/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db5.0/db.h
--      break
--    elif test -f "$i/include/db4.8/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.8/db.h
--      break
--    elif test -f "$i/include/db4.7/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.7/db.h
--      break
--    elif test -f "$i/include/db4.6/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.6/db.h
--      break
--    elif test -f "$i/include/db4.5/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.5/db.h
--      break
--    elif test -f "$i/include/db4/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4/db.h
--      break
--    elif test -f "$i/include/db/db4.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db/db4.h
--      break
--    elif test -f "$i/include/db4.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.h
--      break
--    elif test -f "$i/include/db.h"; then
-+    if test -f "$i/include/db.h"; then
-       THIS_PREFIX=$i
-       THIS_INCLUDE=$i/include/db.h
-       break
-     fi
-   done
--  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+  PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
- fi
- PHP_DBA_STD_RESULT(db4,Berkeley DB4)
- 
 diff --git a/ext/dba/dba.c b/ext/dba/dba.c
 index 7e8ef11..c111687 100644
 --- a/ext/dba/dba.c