[packages/db6.1/DEVEL-6.1.36] - up to 6.1.36 - jbj13 patch no longer applicable

[qboosh]

commit c64d7ced5dadad2102fc0278d00f8d34dc25c99f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 2 18:26:32 2018 +0200

    - up to 6.1.36
    - jbj13 patch no longer applicable

 db6.1-jbj13.patch | 15 ---------------
 db6.1.spec        |  9 +++++----
 2 files changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/db6.1.spec b/db6.1.spec
index 5b7b9c3..5f09dbf 100644
--- a/db6.1.spec
+++ b/db6.1.spec
@@ -1,3 +1,6 @@
+# WARNING:
+# - 6.1.29->6.1.36 changes __db_env ABI (adds convert in the middle of public handle list in struct)
+# - contains changes similar to 6.2.32, which is not compatible with rpm 5.4.17
 #
 # Conditional build:
 %bcond_without	java		# don't build Java bindings
@@ -11,7 +14,7 @@
 
 %define		major		6
 %define		libver		%{major}.1
-%define		ver		%{libver}.29
+%define		ver		%{libver}.36
 %define		patchlevel	0
 Summary:	Berkeley DB database library for C
 Summary(pl.UTF-8):	Biblioteka C do obsługi baz Berkeley DB
@@ -22,9 +25,8 @@ License:	AGPL v3
 Group:		Libraries
 #Source0Download: http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index-082944.html
 Source0:	http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
-# Source0-md5:	7f4d47302dfec698fe088e5285c9098e
+# Source0-md5:	7504e31df4e3bef7a984913070733262
 Patch0:		%{name}-sql-features.patch
-Patch1:		%{name}-jbj13.patch
 URL:		http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html
 BuildRequires:	automake
 %if %{with java}
@@ -371,7 +373,6 @@ poleceń.
 %prep
 %setup -q -n db-%{ver}
 %patch0 -p1
-%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.sub dist
diff --git a/db6.1-jbj13.patch b/db6.1-jbj13.patch
deleted file mode 100644
index b26c87a..0000000
--- a/db6.1-jbj13.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up db-6.2.23/src/env/env_failchk.c.jbj db-6.2.23/src/env/env_failchk.c
---- db-6.2.23/src/env/env_failchk.c.jbj	2016-03-28 15:45:54.000000000 -0400
-+++ db-6.2.23/src/env/env_failchk.c	2016-05-08 14:03:58.153742935 -0400
-@@ -528,7 +528,11 @@ __env_set_state(env, ipp, state)
- 		DB_ASSERT(env, ip != NULL && ip->dbth_state != THREAD_OUT);
- 		if (ipp != NULL)
- 			*ipp = ip;
-+#ifdef	NOTYET
- 		if (ip == NULL || ip->dbth_state == THREAD_OUT)
-+#else
-+		if (ip == NULL) /* The control block wasn't found */
-+#endif
- 			return (USR_ERR(env, EINVAL));
- 		else
- 			return (0);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/db6.1.git/commitdiff/c64d7ced5dadad2102fc0278d00f8d34dc25c99f