Update patches for dba for PHP 8.4

shivammathur · May 19, 2024 · b7a22e4 · b7a22e4
1 parent 4940a41
commit b7a22e4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/config/patches/8.4/0006-php-5.4.7-libdb.patch b/config/patches/8.4/0006-php-5.4.7-libdb.patch
@@ -86,7 +86,7 @@ Subject: php-5.4.7-libdb
  PHP_MINIT_FUNCTION(dba);
  PHP_MSHUTDOWN_FUNCTION(dba);
  PHP_MINFO_FUNCTION(dba);
-@@ -386,6 +390,10 @@ PHP_MINFO_FUNCTION(dba)
+@@ -445,6 +449,10 @@ PHP_MINFO_FUNCTION(dba)
 
  	php_info_print_table_start();
  	php_info_print_table_row(2, "DBA support", "enabled");

diff --git a/config/patches/8.4/0018-php-5.3.3-macropen.patch b/config/patches/8.4/0018-php-5.3.3-macropen.patch
@@ -3,22 +3,22 @@ Date: Sat, 2 May 2015 10:26:55 +0200
 Subject: php-5.3.3-macropen
 
 ---
- ext/dba/dba.c     |    2 +-
- ext/dba/dba_db3.c |    4 ++--
- ext/dba/dba_db4.c |    4 ++--
+ ext/dba/dba.c     | 2 +-
+ ext/dba/dba_db3.c | 4 ++--
+ ext/dba/dba_db4.c | 4 ++--
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 --- a/ext/dba/dba.c
 +++ b/ext/dba/dba.c
-@@ -843,7 +843,7 @@ restart:
+@@ -933,7 +933,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
  		}
  	}
 
--	if (error || hptr->open(info, &error) == FAILURE) {
-+	if (error || (hptr->open)(info, &error) == FAILURE) {
- 		dba_close(info);
- 		php_error_docref(NULL, E_WARNING, "Driver initialization failed for handler: %s%s%s", hptr->name, error?": ":"", error?error:"");
- 		FREE_PERSISTENT_RESOURCE_KEY();
+-	if (error || hptr->open(connection->info, &error) == FAILURE) {
++	if (error || (hptr->open)(connection->info, &error) == FAILURE) {
+ 		if (EXPECTED(!EG(exception))) {
+ 			if (error) {
+ 				php_error_docref(NULL, E_WARNING, "Driver initialization failed for handler: %s: %s", hptr->name, error);
 --- a/ext/dba/dba_db3.c
 +++ b/ext/dba/dba_db3.c
 @@ -81,9 +81,9 @@ DBA_OPEN_FUNC(db3)
@@ -47,3 +47,6 @@ Subject: php-5.3.3-macropen
  #endif
  			dba_db4_data *data;
 
+-- 
+2.44.0
+