makowski pushed to firebird (f22). "update to 2.5.4"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 4 16:54:13 UTC 2015
>From eb15e8c61ad37858480bd15ec1a487511c18d646 Mon Sep 17 00:00:00 2001
From: Philippe Makowski <pmakowski at espelida.com>
Date: Sat, 4 Apr 2015 16:53:47 +0000
Subject: update to 2.5.4
diff --git a/firebird-aarch64.patch b/firebird-aarch64.patch
deleted file mode 100644
index f2f928c..0000000
--- a/firebird-aarch64.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in
-+++ configure.in 2014-07-24 11:07:18.304272063 +0200
-@@ -229,17 +229,17 @@
- STD_ICU=true
- ;;
-
--# aarch64*-*-linux*) // port was not tested
--# MAKEFILE_PREFIX=linux_arm64
--# INSTALL_PREFIX=linux
--# PLATFORM=LINUX
--# AC_DEFINE(LINUX, 1, [Define this if OS is Linux])
--# EDITLINE_FLG=Y
--# SHRLIB_EXT=so
--# STD_EDITLINE=true
--# STD_ICU=true
--# ATOMIC_LIBS=-latomic_ops
--# ;;
-+ aarch64*-*-linux*) // port was not tested
-+ MAKEFILE_PREFIX=linux_arm64
-+ INSTALL_PREFIX=linux
-+ PLATFORM=LINUX
-+ AC_DEFINE(LINUX, 1, [Define this if OS is Linux])
-+ EDITLINE_FLG=Y
-+ SHRLIB_EXT=so
-+ STD_EDITLINE=true
-+ STD_ICU=true
-+ ATOMIC_LIBS=-latomic_ops
-+ ;;
-
- sparc*-*-linux* | sparc*-*-gnu* | sparc*-*-k*bsd*-gnu)
- MAKEFILE_PREFIX=linux_sparc32
-Index: src/jrd/common.h
-===================================================================
---- src/jrd/common.h
-+++ src/jrd/common.h 2014-07-24 11:08:37.358268337 +0200
-@@ -192,9 +192,9 @@
- #define RISC_ALIGNMENT
- #endif /* alpha */
-
--//#ifdef ARM64
--//#define IMPLEMENTATION isc_info_db_impl_linux_arm64 /* 84 */
--//#endif /* ARM64 */
-+#ifdef ARM64
-+#define IMPLEMENTATION isc_info_db_impl_linux_arm64 /* 84 */
-+#endif /* ARM64 */
-
- #endif /* LINUX */
-
-Index: src/jrd/pag.cpp
-===================================================================
---- src/jrd/pag.cpp
-+++ src/jrd/pag.cpp 2014-07-24 11:13:12.223201347 +0200
-@@ -330,8 +330,8 @@
- const SSHORT CLASS = CLASS_LINUX_HPPA;
- #elif defined(ALPHA)
- const SSHORT CLASS = CLASS_LINUX_ALPHA;
--//#elif defined(ARM64)
--//const SSHORT CLASS = CLASS_LINUX_ARM64;
-+#elif defined(ARM64)
-+const SSHORT CLASS = CLASS_LINUX_ARM64;
- #else
- #error no support on other hardware for Linux
- #endif
diff --git a/firebird.spec b/firebird.spec
index ce6a18b..c06b4a4 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,12 +1,12 @@
-%global pkgname Firebird-2.5.3.26778-0
+%global pkgname Firebird-2.5.4.26856-0
%global fbroot %{_libdir}/%{name}
-%global major 2.5.3
+%global major 2.5.4
%global _hardened_build 1
Summary: SQL relational database management system
Name: firebird
-Version: 2.5.3.26778.0
-Release: 6%{?dist}
+Version: 2.5.4.26856.0
+Release: 1%{?dist}
Group: Applications/Databases
License: Interbase
@@ -23,9 +23,7 @@ Source6: firebird-superclassic.service
Source7: firebird-superserver.service
# from upstream
-Patch0: firebird_fix_CORE-4630.patch
Patch2: firebird-btyacc-fpie.patch
-Patch3: firebird-aarch64.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -162,9 +160,7 @@ Multi-process, local client libraries for Firebird SQL RDBMS
%prep
%setup -q -n %{pkgname}
-%patch0 -p0
%patch2
-%patch3
# convert intl character to UTF-8
iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl
@@ -530,6 +526,9 @@ fi
%changelog
+* Sat Apr 4 2015 Philippe Makowski <makowski at fedoraproject.org> - 2.5.4.26856.0-1
+- update to 2.5.4
+
* Mon Jan 26 2015 David Tardon <dtardon at redhat.com> - 2.5.3.26778.0-6
- rebuild for ICU 54.1
diff --git a/firebird_fix_CORE-4630.patch b/firebird_fix_CORE-4630.patch
deleted file mode 100644
index 77dbe5c..0000000
--- a/firebird_fix_CORE-4630.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: src/remote/protocol.cpp
-===================================================================
---- src/remote/protocol.cpp (.../R2_5_3) (revision 60338)
-+++ src/remote/protocol.cpp (.../R2_5_3_Upd_1) (revision 60338)
-@@ -398,6 +398,8 @@
- MAP(xdr_short, reinterpret_cast<SSHORT&>(response->p_resp_object));
- MAP(xdr_quad, response->p_resp_blob_id);
- MAP(xdr_cstring, response->p_resp_data);
-+ if (!response->p_resp_status_vector) // incorrectly called - packet not prepared
-+ return P_FALSE(xdrs, p);
- return xdr_status_vector(xdrs, response->p_resp_status_vector) ?
- P_TRUE(xdrs, p) : P_FALSE(xdrs, p);
-
-@@ -1652,9 +1654,12 @@
-
- SLONG vec;
- SCHAR* sp = NULL;
-+ ISC_STATUS* const end = &vector[ISC_STATUS_LENGTH];
-
- while (true)
- {
-+ if (vector >= end)
-+ return FALSE;
- if (xdrs->x_op == XDR_ENCODE)
- vec = (SLONG) * vector++;
- if (!xdr_long(xdrs, &vec))
-@@ -1670,6 +1675,8 @@
- case isc_arg_interpreted:
- case isc_arg_string:
- case isc_arg_sql_state:
-+ if (vector >= end)
-+ return FALSE;
- if (xdrs->x_op == XDR_ENCODE)
- {
- if (!xdr_wrapstring(xdrs, reinterpret_cast<SCHAR**>(vector++)))
-@@ -1700,6 +1707,8 @@
-
- case isc_arg_number:
- default:
-+ if (vector >= end)
-+ return FALSE;
- if (xdrs->x_op == XDR_ENCODE)
- vec = (SLONG) * vector++;
- if (!xdr_long(xdrs, &vec))
diff --git a/sources b/sources
index a44cee1..4099023 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5feff765e11a5fb0ec17c71e155bb974 Firebird-2.5.3.26778-0.tar.bz2
+7a17ec9889424b98baa29e001a054434 Firebird-2.5.4.26856-0.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/firebird.git/commit/?h=f22&id=eb15e8c61ad37858480bd15ec1a487511c18d646
More information about the scm-commits
mailing list