makowski pushed to firebird (el6). "update to 2.5.4"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 14:19:43 UTC 2015
>From e1ef4e67c6b44ec485da1f6a5119b456d110edba Mon Sep 17 00:00:00 2001
From: Philippe Makowski <makowski at fedoraproject.org>
Date: Thu, 2 Apr 2015 15:42:52 +0200
Subject: update to 2.5.4
diff --git a/firebird-2.5.2-svn-CORE-3946.patch b/firebird-2.5.2-svn-CORE-3946.patch
deleted file mode 100644
index 5fb9f30..0000000
--- a/firebird-2.5.2-svn-CORE-3946.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- src/jrd/unicode_util.cpp 2012/10/12 09:56:14 57235
-+++ src/jrd/unicode_util.cpp 2012/10/12 21:20:30 57236
-@@ -42,6 +42,9 @@
- #include "unicode/ucnv.h"
- #include "unicode/ucol.h"
-
-+// The next major ICU version after 4.8 is 49.
-+#define ICU_NEW_VERSION_MEANING 49
-+
-
- using namespace Firebird;
-
-@@ -49,8 +52,16 @@
- namespace Jrd {
-
-
-+#if U_ICU_VERSION_MAJOR_NUM >= ICU_NEW_VERSION_MEANING
-+const char* const UnicodeUtil::DEFAULT_ICU_VERSION = STRINGIZE(U_ICU_VERSION_MAJOR_NUM);
-+#else
- const char* const UnicodeUtil::DEFAULT_ICU_VERSION =
- STRINGIZE(U_ICU_VERSION_MAJOR_NUM)"."STRINGIZE(U_ICU_VERSION_MINOR_NUM);
-+#endif
-+
-+
-+static void formatFilename(PathName& filename, const char* templateName,
-+ int majorVersion, int minorVersion);
-
-
- // encapsulate ICU collations libraries
-@@ -79,6 +90,11 @@
- {
- string symbol;
-
-+ symbol.printf("%s_%d", name, majorVersion);
-+ module->findSymbol(symbol, ptr);
-+ if (ptr)
-+ return;
-+
- symbol.printf("%s_%d_%d", name, majorVersion, minorVersion);
- module->findSymbol(symbol, ptr);
- if (ptr)
-@@ -157,14 +173,25 @@
- RWLock lock;
- };
-
--namespace {
-- GlobalPtr<UnicodeUtil::ICUModules> icuModules;
--}
-+static GlobalPtr<UnicodeUtil::ICUModules> icuModules;
-
-
- static const char* const COLL_30_VERSION = "41.128.4.4"; // ICU 3.0 collator version
-
-
-+static void formatFilename(PathName& filename, const char* templateName,
-+ int majorVersion, int minorVersion)
-+{
-+ string s;
-+ if (majorVersion >= ICU_NEW_VERSION_MEANING)
-+ s.printf("%d", majorVersion);
-+ else
-+ s.printf("%d%d", majorVersion, minorVersion);
-+
-+ filename.printf(templateName, s.c_str());
-+}
-+
-+
- static void getVersions(const string& configInfo, ObjectsArray<string>& versions)
- {
- charset cs;
-@@ -758,17 +785,17 @@
- const Firebird::string& configInfo)
- {
- #if defined(WIN_NT)
-- const char* const inTemplate = "icuin%d%d.dll";
-- const char* const ucTemplate = "icuuc%d%d.dll";
-+ const char* const inTemplate = "icuin%s.dll";
-+ const char* const ucTemplate = "icuuc%s.dll";
- #elif defined(DARWIN)
- const char* const inTemplate = "/Library/Frameworks/Firebird.framework/Versions/A/Libraries/libicui18n.dylib";
- const char* const ucTemplate = "/Library/Frameworks/Firebird.framework/versions/A/Libraries/libicuuc.dylib";
- #elif defined(HPUX)
-- const char* const inTemplate = "libicui18n.sl.%d%d";
-- const char* const ucTemplate = "libicuuc.sl.%d%d";
-+ const char* const inTemplate = "libicui18n.sl.%s";
-+ const char* const ucTemplate = "libicuuc.sl.%s";
- #else
-- const char* const inTemplate = "libicui18n.so.%d%d";
-- const char* const ucTemplate = "libicuuc.so.%d%d";
-+ const char* const inTemplate = "libicui18n.so.%s";
-+ const char* const ucTemplate = "libicuuc.so.%s";
- #endif
-
- ObjectsArray<string> versions;
-@@ -776,24 +803,28 @@
-
- string version = icuVersion.isEmpty() ? versions[0] : icuVersion;
- if (version == "default")
-- {
-- version.printf("%d.%d", U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM);
-- }
-+ version = DEFAULT_ICU_VERSION;
-
- for (ObjectsArray<string>::const_iterator i(versions.begin()); i != versions.end(); ++i)
- {
- int majorVersion, minorVersion;
-+ int n = sscanf((*i == "default" ? version : *i).c_str(), "%d.%d",
-+ &majorVersion, &minorVersion);
-
-- if (*i == "default")
-- {
-- majorVersion = U_ICU_VERSION_MAJOR_NUM;
-- minorVersion = U_ICU_VERSION_MINOR_NUM;
-- }
-- else if (sscanf(i->c_str(), "%d.%d", &majorVersion, &minorVersion) != 2)
-+ if (n == 1)
-+ minorVersion = 0;
-+ else if (n != 2)
- continue;
-
- string configVersion;
-- configVersion.printf("%d.%d", majorVersion, minorVersion);
-+
-+ if (majorVersion >= ICU_NEW_VERSION_MEANING)
-+ {
-+ minorVersion = 0;
-+ configVersion.printf("%d", majorVersion);
-+ }
-+ else
-+ configVersion.printf("%d.%d", majorVersion, minorVersion);
-
- if (version != configVersion)
- continue;
-@@ -805,7 +836,7 @@
- return icu;
-
- PathName filename;
-- filename.printf(ucTemplate, majorVersion, minorVersion);
-+ formatFilename(filename, ucTemplate, majorVersion, minorVersion);
-
- icu = FB_NEW(*getDefaultMemoryPool()) ICU(majorVersion, minorVersion);
-
-@@ -822,7 +853,7 @@
- continue;
- }
-
-- filename.printf(inTemplate, majorVersion, minorVersion);
-+ formatFilename(filename, inTemplate, majorVersion, minorVersion);
-
- icu->inModule = ModuleLoader::loadModule(filename);
- if (!icu->inModule)
diff --git a/firebird-2.5.2-svn-CORE-4011.patch b/firebird-2.5.2-svn-CORE-4011.patch
deleted file mode 100644
index 70dcdec..0000000
--- a/firebird-2.5.2-svn-CORE-4011.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2012/12/14 10:01:27 57484
-+++ builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in 2012/12/14 10:08:41 57485
-@@ -99,6 +99,7 @@
- [ $RETVAL -eq 0 ] && echo "$FULLNAME is running (pid $pid)" || echo "$FULLNAME is dead but pid file exists"
- else
- echo "$FULLNAME is stopped"
-+ RETVAL=3
- fi
- ;;
- restart|reload)
diff --git a/firebird-2.5.2-svn-CORE-4058.patch b/firebird-2.5.2-svn-CORE-4058.patch
deleted file mode 100644
index 52ac6bd..0000000
--- a/firebird-2.5.2-svn-CORE-4058.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/remote/inet.cpp (révision 57727)
-+++ src/remote/inet.cpp (révision 57728)
-@@ -1252,7 +1252,7 @@
- case CNCT_group:
- {
- const size_t length = id.getClumpLength();
-- if (length != 0)
-+ if (length <= sizeof(eff_gid) && length > 0)
- {
- eff_gid = 0;
- memcpy(&eff_gid, id.getBytes(), length);
diff --git a/firebird.spec b/firebird.spec
index 13071e4..bcac5fa 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
Summary: SQL relational database management system
Name: firebird
-Version: 2.5.3.26778.0
-Release: 2%{?dist}
+Version: 2.5.4.26856.0
+Release: 1%{?dist}
Group: Applications/Databases
License: Interbase
@@ -18,7 +18,6 @@ Source1: firebird-logrotate
Source2: README.Fedora
# from upstream
-Patch0: firebird_fix_CORE-4630.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -145,7 +144,6 @@ Multi-process, local client libraries for Firebird SQL RDBMS
%prep
%setup -q -n %{pkgname}
-%patch0 -p0
# convert intl character to UTF-8
iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl
@@ -504,6 +502,9 @@ fi
%changelog
+* Thu Apr 2 2015 Philippe Makowski <makowski at fedoraproject.org> 2.5.4.26856.0-1
+- update to 2.5.4
+
* Sun Dec 7 2014 Philippe Makowski <makowski at fedoraproject.org> 2.5.3.26778.0-2
- security fix firebird CORE-4630
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=el6&id=e1ef4e67c6b44ec485da1f6a5119b456d110edba
More information about the scm-commits
mailing list