[Pkg-php-commits] [php/debian-sid] Cherry pick patch to workaround BDB 4.8 bc changes (Closes: #570149)

[Raphael Geissert]

---
 debian/patches/series                           |    1 +
 debian/patches/upstream/db4.8_workarounds.patch |   58 +++++++++++++++++++++++
 2 files changed, 59 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/upstream/db4.8_workarounds.patch

diff --git a/debian/patches/series b/debian/patches/series
index 4401d7a..85ce3c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,3 +63,4 @@ upstream/dba_unaligned_mem_access.patch
 upstream/mysqli_options_mem_issue.patch
 session_save_path.patch
 upstream/multiple_typos.patch
+upstream/db4.8_workarounds.patch
diff --git a/debian/patches/upstream/db4.8_workarounds.patch b/debian/patches/upstream/db4.8_workarounds.patch
new file mode 100644
index 0000000..7b16812
--- /dev/null
+++ b/debian/patches/upstream/db4.8_workarounds.patch
@@ -0,0 +1,58 @@
+Description: Workaround bc changes in BDB 4.8.26
+Origin: http://svn.php.net/viewvc?view=revision&revision=295847
+Last-Update: 2010-05-02
+
+Index: php/ext/dba/dba_db4.c
+===================================================================
+--- php.orig/ext/dba/dba_db4.c
++++ php/ext/dba/dba_db4.c
+@@ -43,7 +43,19 @@ static void php_dba_db4_errcall_fcn(
+ 	const char *errpfx, const char *msg)
+ {
+ 	TSRMLS_FETCH();
+-	
++
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8 && DB_VERSION_PATCH <= 26) 
++/* Bug 51086, Berkeley DB 4.8.26 */
++/* This code suppresses a BDB 4.8 error message that BDB incorrectly emits */
++	{
++		char *function = get_active_function_name(TSRMLS_C);
++		if (function && (!strcmp(function,"dba_popen") || !strcmp(function,"dba_open"))
++			&& !strncmp(msg, "fop_read_meta", sizeof("fop_read_meta")-1)) {
++			return;
++		}
++	}
++#endif
++
+ 	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s%s", errpfx?errpfx:"", msg);
+ }
+ 
+@@ -67,6 +79,7 @@ DBA_OPEN_FUNC(db4)
+ 	struct stat check_stat;
+ 	int s = VCWD_STAT(info->path, &check_stat);
+ 
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 7)  /* Bug 51086 */
+ 	if (!s && !check_stat.st_size) {
+ 		info->mode = DBA_TRUNC; /* force truncate */
+ 	}
+@@ -80,6 +93,20 @@ DBA_OPEN_FUNC(db4)
+ 		(info->mode == DBA_CREAT && !s) ? 0 :
+ 		info->mode == DBA_WRITER ? 0         : 
+ 		info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1;
++#else
++	if (!s && !check_stat.st_size) {
++		info->mode = DBA_CREAT; /* force creation */
++	}
++
++	type = info->mode == DBA_READER ? DB_UNKNOWN :
++		(info->mode == DBA_TRUNC || info->mode == DBA_CREAT) ? DB_BTREE :
++		s ? DB_BTREE : DB_UNKNOWN;
++	  
++	gmode = info->mode == DBA_READER ? DB_RDONLY :
++		info->mode == DBA_CREAT ? DB_CREATE : 
++		info->mode == DBA_WRITER ? 0         : 
++		info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1;
++#endif
+ 
+ 	if (gmode == -1) {
+ 		return FAILURE; /* not possible */
-- 
1.6.5