- saving 6.2.32, incompatible with rpm 5.4.17

- dropped jbj13 patch, no longer applicable

diff --git a/db6.2-jbj13.patch b/db6.2-jbj13.patch
deleted file mode 100644 (file)
index b26c87a..0000000
--- a/db6.2-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);

diff --git a/db6.2.spec b/db6.2.spec
index 35984e0086b9105c60a1f6137774d444ae197b7f..c6bfafaaf779f9e01c32fe2696d4975e1544d63c 100644 (file)
--- a/db6.2.spec
+++ b/db6.2.spec
@@ -1,3 +1,6 @@
+# WARNING:
+# - 6.2.23->6.2.32 changes __db_env ABI (adds convert in the middle of public handle list in struct)
+# - 6.2.32 has BDB PANIC issues 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}.2
-%define                ver             %{libver}.23
+%define                ver             %{libver}.32
 %define                patchlevel      0
 Summary:       Berkeley DB database library for C
 Summary(pl.UTF-8):     Biblioteka C do obsługi baz Berkeley DB
@@ -20,11 +23,10 @@ Version:    %{ver}.%{patchlevel}
 Release:       1
 License:       AGPL v3
 Group:         Libraries
-#Source0Download: http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html
+#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: 9da126afb937a48171ff1e569ce67cf1
+# Source0-md5: 33491b4756cb44b91c3318b727e71023
 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
@@ -736,6 +737,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/db%{libver}_archive
 %attr(755,root,root) %{_bindir}/db%{libver}_checkpoint
+%attr(755,root,root) %{_bindir}/db%{libver}_convert
 %attr(755,root,root) %{_bindir}/db%{libver}_deadlock
 %attr(755,root,root) %{_bindir}/db%{libver}_dump
 %attr(755,root,root) %{_bindir}/db%{libver}_hotbackup
@@ -752,6 +754,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with default_db}
 %attr(755,root,root) %{_bindir}/db_archive
 %attr(755,root,root) %{_bindir}/db_checkpoint
+%attr(755,root,root) %{_bindir}/db_convert
 %attr(755,root,root) %{_bindir}/db_deadlock
 %attr(755,root,root) %{_bindir}/db_dump
 %attr(755,root,root) %{_bindir}/db_hotbackup