[firebird/f16] new upstream (bug fix release) added patch from upstream to fix Firebird CORE-3610
Philippe Makowski
makowski at fedoraproject.org
Thu Sep 29 17:31:10 UTC 2011
commit 29da903164e1b8a4d96709973c8602075836d702
Author: Philippe Makowski <makowski.firebird-fr.eu.org>
Date: Thu Sep 29 19:20:28 2011 +0200
new upstream (bug fix release)
added patch from upstream to fix Firebird CORE-3610
.gitignore | 1 +
firebird-2.5.0-svn-CORE-3447.patch | 205 ------------------------------------
firebird-2.5.0.26074-s390x.patch | 13 ---
firebird-2.5.1-svn-CORE-3610.patch | 32 ++++++
firebird.spec | 19 ++--
sources | 2 +-
6 files changed, 45 insertions(+), 227 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ae9073..e60ca1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
Firebird-2.1.3.18185-0.RC2.tar.bz2
/Firebird-2.5.0.26074-0.tar.bz2
+/Firebird-2.5.1.26349-0.tar.bz2
diff --git a/firebird-2.5.1-svn-CORE-3610.patch b/firebird-2.5.1-svn-CORE-3610.patch
new file mode 100644
index 0000000..075ad94
--- /dev/null
+++ b/firebird-2.5.1-svn-CORE-3610.patch
@@ -0,0 +1,32 @@
+--- src/jrd/vio.cpp 2011/09/29 03:27:33 53487
++++ jrd/vio.cpp 2011/09/29 07:45:12 53488
+@@ -1821,7 +1821,6 @@
+
+
+ bool VIO_get_current(thread_db* tdbb,
+- //record_param* old_rpb,
+ record_param* rpb,
+ jrd_tra* transaction,
+ MemoryPool* pool,
+@@ -2025,12 +2024,14 @@
+ if (rpb->rpb_flags & rpb_deleted)
+ return !foreign_key;
+
+- if (rpb->rpb_flags & rpb_uk_modified)
+- return !foreign_key;
+-
+- // clear lock error from status vector
+- fb_utils::init_status(tdbb->tdbb_status_vector);
+- return true;
++ if (foreign_key)
++ {
++ // clear lock error from status vector
++ fb_utils::init_status(tdbb->tdbb_status_vector);
++ return !(rpb->rpb_flags & rpb_uk_modified);
++ }
++
++ return !foreign_key;
+
+ case tra_dead:
+ if (transaction->tra_attachment->att_flags & ATT_no_cleanup) {
+
diff --git a/firebird.spec b/firebird.spec
index 10d9746..f4527cc 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,12 +1,12 @@
-%global pkgname Firebird-2.5.0.26074-0
+%global pkgname Firebird-2.5.1.26349-0
%global fbroot %{_libdir}/%{name}
-%global major 2.5.0
+%global major 2.5.1
Summary: SQL relational database management system
Name: firebird
-Version: 2.5.0.26074.0
-Release: 10%{?dist}
+Version: 2.5.1.26349.O
+Release: 1%{?dist}
Group: Applications/Databases
License: Interbase
@@ -23,10 +23,10 @@ Source6: firebird-superclassic.service
Source7: firebird-superserver.service
# sync the utilities list with other arches (will be sent upstream)
-Patch0: firebird-2.5.0.26074-s390x.patch
+#Patch0: firebird-2.5.0.26074-s390x.patch
# from upstream
-Patch1: firebird-2.5.0-svn-CORE-3447.patch
+Patch0: firebird-2.5.1-svn-CORE-3610.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -161,8 +161,7 @@ Multi-process, local client libraries for Firebird SQL RDBMS
%prep
%setup -q -n %{pkgname}
-%patch0 -p1 -b .s390x
-%patch1
+%patch0
# convert intl character to UTF-8
iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl
@@ -557,6 +556,10 @@ fi
%changelog
+* Thu Sep 29 2011 Philippe Makowski <makowski at fedoraproject.org> 2.5.1.26349.0-1
+- new upstream (bug fix release)
+- added patch from upstream to fix Firebird CORE-3610
+
* Thu Sep 22 2011 Philippe Makowski <makowski at fedoraproject.org> 2.5.0.26074.0-10
- Add support for systemd (rh #737281)
diff --git a/sources b/sources
index 58deb9b..894c7e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-780f162ee71f087fc277adf09f966529 Firebird-2.5.0.26074-0.tar.bz2
+540713df9b0160699ed52138e1194e07 Firebird-2.5.1.26349-0.tar.bz2
More information about the scm-commits
mailing list