commit 05de00f962e486f3110000dc576f6062fbd4f2a8
Author: Jakub Bogusz <[email protected]>
Date: Wed Feb 1 21:50:54 2017 +0100
- updated to 6.1.29
- added jbj13 patch from jbj (rpm locks on db 6.1.26+ without this patch)
db6.1-jbj13.patch | 15 +++++++++++++++
db6.1.spec | 9 ++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/db6.1.spec b/db6.1.spec
index 8cba0ad..5b7b9c3 100644
--- a/db6.1.spec
+++ b/db6.1.spec
@@ -11,7 +11,7 @@
%define major 6
%define libver %{major}.1
-%define ver %{libver}.26
+%define ver %{libver}.29
%define patchlevel 0
Summary: Berkeley DB database library for C
Summary(pl.UTF-8): Biblioteka C do obsługi baz Berkeley DB
@@ -20,10 +20,11 @@ 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: 9525aa57a282d49e5d1bf5e48ffa8a56
+# Source0-md5: 7f4d47302dfec698fe088e5285c9098e
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}
@@ -370,6 +371,7 @@ poleceń.
%prep
%setup -q -n db-%{ver}
%patch0 -p1
+%patch1 -p1
%build
cp -f /usr/share/automake/config.sub dist
@@ -732,6 +734,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
diff --git a/db6.1-jbj13.patch b/db6.1-jbj13.patch
new file mode 100644
index 0000000..b26c87a
--- /dev/null
+++ b/db6.1-jbj13.patch
@@ -0,0 +1,15 @@
+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/05de00f962e486f3110000dc576f6062fbd4f2a8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
