Hello community, here is the log from the commit of package firebird for openSUSE:Factory checked in at 2018-03-31 15:35:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/firebird (Old) and /work/SRC/openSUSE:Factory/.firebird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "firebird" Sat Mar 31 15:35:25 2018 rev:48 rq:591877 version:3.0.3.32900 Changes: -------- --- /work/SRC/openSUSE:Factory/firebird/firebird.changes 2018-01-09 14:49:00.963552533 +0100 +++ /work/SRC/openSUSE:Factory/.firebird.new/firebird.changes 2018-03-31 15:35:40.680319850 +0200 @@ -1,0 +2,62 @@ +Wed Mar 28 06:54:09 UTC 2018 - mkubecek@suse.cz + +- move firebitd.xinetd back to firebird-server subpackage on SLE15 +- provide /etc/xinetd.d directory on Tumbleweed and Leap 15.0 as + xinetd is no longer guaranteed to be present there; this solution + (suggested by Dimstar) is less painful than either having + firebird-server depend on xinetd or splitting a new subpackage + firebird-server-classic. + +------------------------------------------------------------------- +Fri Mar 23 11:32:28 UTC 2018 - mkubecek@suse.cz + +- patch xinetd config file unconditionally; previous change would + result in unpatched xinetd config file installed on Tumbleweed + so that the service would be enabled by default and firebird + binary run as root + +------------------------------------------------------------------- +Thu Mar 22 09:57:02 UTC 2018 - fcrozat@suse.com + +- Do no ship xinetd file on SLE15 (bsc#1084459). + +------------------------------------------------------------------- +Sat Mar 3 17:51:56 UTC 2018 - mkubecek@suse.cz + +- update to upstream version 3.0.3 + * fix conflicting constants; programs using * fb_info_crypt_state + constant must be recompiled + * provide crypto key name via fb_info_crypt_key item in + Attachment::getInfo() + * improve handling of concurrent ALTER DATABASE statements + * make sure ORDER BY with equivalent expressions are equivalent + and use the same plan + * avoid serialization of isc_attach_database calls issued by + EXECUTE STATEMENT + * show date and time of analysis in gstat output + * show database info in sweep error message + * provide compression details and encryption status of the + connection in Attachment::getInfo() API call + * fix RDB$RELATION_TYPE when restoring ODS < 11.1 database + * the optimizer can now estimate the actual record compression + ratio + * various performance improvements + * various bug fixes, for a list, see release notes at + http://www.firebirdsql.org/file/documentation/release_notes/html/en/3_0/rnfb... +- drop patches included in new upstream version: + Backported-fix-for-CORE-5549-Errors-building-running.patch + Backported-fix-for-CORE-5562-Firebird-crashes-when-U.patch + Fixed-CORE-5567-Direct-system-table-modifications-ar.patch + Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch + Workaround-for-CORE-5566-Server-crashes-while-restor.patch +- unicode-handle-the-ICU-version-hack-from-SuSE.patch: + rework to handle ICU >= 60 (as many versions as upstream) +- drop firebird-icu60.patch + obsoleted by update of the unicode patch +- Make-it-build-with-icu60.patch + upstream post-3.0.3 commit for ICU >= 59 compatibility +- use-C-98-on-SLE11.patch + compatibility patch for SLE11 where gcc 4.3 does not support + -stc=gnu++03 (applied only on SLE11) + +------------------------------------------------------------------- Old: ---- Backported-fix-for-CORE-5549-Errors-building-running.patch Backported-fix-for-CORE-5562-Firebird-crashes-when-U.patch Firebird-3.0.2.32703-0.tar.xz Fixed-CORE-5567-Direct-system-table-modifications-ar.patch Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch Workaround-for-CORE-5566-Server-crashes-while-restor.patch firebird-icu60.patch New: ---- Firebird-3.0.3.32900-0.tar.xz Make-it-build-with-icu60.patch use-C-98-on-SLE11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firebird.spec ++++++ --- /var/tmp/diff_new_pack.Kcoodt/_old 2018-03-31 15:35:41.420293020 +0200 +++ /var/tmp/diff_new_pack.Kcoodt/_new 2018-03-31 15:35:41.424292875 +0200 @@ -19,10 +19,10 @@ %define up_stage 0 Name: firebird -Version: 3.0.2.32703 +Version: 3.0.3.32900 Release: 0 Summary: Database system (common files) -License: SUSE-IDPL-1.0 and SUSE-IBPL-1.0 +License: SUSE-IDPL-1.0 AND SUSE-IBPL-1.0 Group: Productivity/Databases/Servers Url: http://www.firebirdsql.org/ Source: Firebird-%{version}-%{up_stage}.tar.xz @@ -51,15 +51,11 @@ Patch4: disable-xinetd-service-by-default.patch Patch5: add-pkgconfig-files.patch Patch6: unicode-handle-the-ICU-version-hack-from-SuSE.patch -Patch7: Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch Patch8: Provide-sized-global-delete-operators-when-compiled-.patch -Patch9: Backported-fix-for-CORE-5549-Errors-building-running.patch -Patch10: Backported-fix-for-CORE-5562-Firebird-crashes-when-U.patch -Patch11: Workaround-for-CORE-5566-Server-crashes-while-restor.patch -Patch12: Fixed-CORE-5567-Direct-system-table-modifications-ar.patch -Patch13: firebird-icu60.patch -# work around a problem with old g++ +Patch9: Make-it-build-with-icu60.patch +# work around problems with old g++ Patch91: work-around-g-problem-in-SLE11.patch +Patch92: use-C-98-on-SLE11.patch %description This package provides common files needed by both client and server @@ -85,17 +81,13 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 # -- # work around a problem with old g++ %if 0%{?suse_version} < 1140 %patch91 -p1 +%patch92 -p1 %endif %build @@ -152,9 +144,11 @@ chmod -R u+w .%{_docdir}/%{name} rm -vf .%{_datadir}/%{name}/misc/firebird.init.* rm -vf .%{_datadir}/%{name}/misc/rc.config.firebird +%if 0%{?suse_version} < 1500 || 0%{?is_opensuse} mkdir -p .%{_sysconfdir}/xinetd.d mv -v .%{_datadir}/%{name}/misc/firebird.xinetd \ .%{_sysconfdir}/xinetd.d/%{name} +%endif mv -v .%{_sysconfdir}/%{name}/README .%{_sysconfdir}/%{name}/WhatsNew \ .%{_docdir}/%{name}/ mv -v .%{_sysconfdir}/%{name}/IDPLicense.txt .%{_docdir}/%{name}/ @@ -177,6 +171,9 @@ %{_libdir}/%{name}/lib %{_libdir}/%{name}/plugins/libEngine12.so %{_datadir}/%{name}/misc +%if 0%{?suse_version} >= 1500 && !0%{?is_opensuse} +%exclude %{_datadir}/%{name}/misc/firebird.xinetd +%endif %{_docdir}/%{name}/IDPLicense.txt %{_docdir}/%{name}/IPLicense.txt %{_docdir}/%{name}/README.SUSE @@ -226,7 +223,14 @@ %config(noreplace) %{_sysconfdir}/%{name}/fbtrace.conf %config(noreplace) %{_sysconfdir}/%{name}/plugins.conf %config(noreplace) %{_sysconfdir}/%{name}/firebird.conf.d/50-server.conf +%if 0%{?suse_version} < 1500 || 0%{?is_opensuse} +%if 0%{?suse_version} >= 1500 +%dir %{_sysconfdir}/xinetd.d +%endif %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} +%else +%{_datadir}/%{name}/misc/firebird.xinetd +%endif %exclude %{_libdir}/%{name}/plugins/libEngine12.so %{_libdir}/%{name}/plugins %{_libdir}/%{name}/udf ++++++ Firebird-3.0.2.32703-0.tar.xz -> Firebird-3.0.3.32900-0.tar.xz ++++++ /work/SRC/openSUSE:Factory/firebird/Firebird-3.0.2.32703-0.tar.xz /work/SRC/openSUSE:Factory/.firebird.new/Firebird-3.0.3.32900-0.tar.xz differ: char 1, line 1 ++++++ Make-it-build-with-icu60.patch ++++++ From: AlexPeshkoff <alexander.peshkoff@gmail.com> Date: Sat, 10 Feb 2018 19:43:26 +0300 Subject: Make it build with icu60 Patch-mainline: R3_0_4? Git-commit: a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab --- src/common/common.h | 3 +++ src/common/unicode_util.h | 4 ++++ src/intl/cs_icu.cpp | 1 - src/intl/cv_icu.cpp | 1 - 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/common/common.h b/src/common/common.h index 2cf877a804c8..58abaaf69586 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -997,4 +997,7 @@ namespace Firebird { static IMessageMetadata* const DELAYED_OUT_FORMAT = reinterpret_cast<IMessageMetadata*>(1); } +#undef UCHAR_TYPE +#define UCHAR_TYPE uint16_t + #endif /* COMMON_COMMON_H */ diff --git a/src/common/unicode_util.h b/src/common/unicode_util.h index 001d3d828322..03d48f9419b3 100644 --- a/src/common/unicode_util.h +++ b/src/common/unicode_util.h @@ -31,6 +31,10 @@ #include "../common/IntlUtil.h" #include "../common/os/mod_loader.h" #include "../common/classes/fb_string.h" + +#undef U_SHOW_CPLUSPLUS_API +#define U_SHOW_CPLUSPLUS_API 0 + #include <unicode/ucnv.h> struct UCollator; diff --git a/src/intl/cs_icu.cpp b/src/intl/cs_icu.cpp index 76f15a2e683b..bc3b48b44f05 100644 --- a/src/intl/cs_icu.cpp +++ b/src/intl/cs_icu.cpp @@ -28,7 +28,6 @@ #include "../intl/ldcommon.h" #include "cs_icu.h" #include "cv_icu.h" -#include <unicode/ucnv.h> #include "../common/unicode_util.h" diff --git a/src/intl/cv_icu.cpp b/src/intl/cv_icu.cpp index b1ac01fce5af..82262d9b4d2a 100644 --- a/src/intl/cv_icu.cpp +++ b/src/intl/cv_icu.cpp @@ -28,7 +28,6 @@ #include "../intl/ldcommon.h" #include "ld_proto.h" #include "cv_icu.h" -#include <unicode/ucnv.h> #include "../common/unicode_util.h" -- 2.16.2 ++++++ unicode-handle-the-ICU-version-hack-from-SuSE.patch ++++++ --- /var/tmp/diff_new_pack.Kcoodt/_old 2018-03-31 15:35:41.540288669 +0200 +++ /var/tmp/diff_new_pack.Kcoodt/_new 2018-03-31 15:35:41.540288669 +0200 @@ -1,16 +1,16 @@ From: Michal Kubecek <mkubecek@suse.cz> -Date: Mon, 1 Sep 2014 11:49:49 +0200 +Date: Sat, 3 Mar 2018 15:53:21 +0100 Subject: unicode: handle the ICU version hack from SuSE OpenSuSE >= 13.1 adds minor version into ICU soname to cope with repeated upstream ABI breakages. We therefore need to make unicode_util functions adapt to this. --- - src/common/unicode_util.cpp | 23 ++++++++++++++++++----- - 1 file changed, 18 insertions(+), 5 deletions(-) + src/common/unicode_util.cpp | 30 ++++++++++++++++++++++++++---- + 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/common/unicode_util.cpp b/src/common/unicode_util.cpp -index e72ee291973d..b232252b91a3 100644 +index 1850ea2e9600..cd30bce00c8c 100644 --- a/src/common/unicode_util.cpp +++ b/src/common/unicode_util.cpp @@ -52,6 +52,8 @@ @@ -56,16 +56,23 @@ { minorVersion = 0; configVersion.printf("%d", majorVersion); -@@ -1138,7 +1149,7 @@ UnicodeUtil::ConversionICU& UnicodeUtil::getConversionICU() - LocalStatus ls; - CheckStatusWrapper lastError(&ls); - string version; -- const int majorArray[] = {5, 4, 3, 6, 0}; -+ const int majorArray[] = {5, 51, 52, 53, 54, 55, 56, 57, 58, 59, 4, 3, 6, 0}; - - for (const int* major = majorArray; *major; ++major) - { -@@ -1180,7 +1191,9 @@ string UnicodeUtil::getDefaultIcuVersion() +@@ -1153,6 +1164,15 @@ UnicodeUtil::ConversionICU& UnicodeUtil::getConversionICU() + { + if ((convIcu = ImplementConversionICU::create(*major, minor))) + return *convIcu; ++ for (int j = 9; j >= 0; j--) ++ { ++ int suseMajor = 10 * (*major) + j; ++ ++ if (suseMajor < ICU_VERSION_SUSE_HACK) ++ break; ++ if (convIcu = ImplementConversionICU::create(suseMajor, minor)) ++ return *convIcu; ++ } + } + catch (const Exception& ex) + { +@@ -1180,7 +1200,9 @@ string UnicodeUtil::getDefaultIcuVersion() string rc; UnicodeUtil::ConversionICU& icu(UnicodeUtil::getConversionICU()); @@ -77,5 +84,5 @@ else rc.printf("%d.%d", icu.vMajor, icu.vMinor); -- -2.8.1 +2.16.2 ++++++ use-C-98-on-SLE11.patch ++++++ From: Michal Kubecek <mkubecek@suse.cz> Date: Sat, 3 Mar 2018 17:45:37 +0100 Subject: use C++98 on SLE11 Patch-mainline: Never, SLE11 compatibility hack The gcc version in SLE11 (4.3) doesn't recognize -std=gnu++03 yet. Use older gnu++98 (C++98 with GNU extensions) instead. --- builds/posix/prefix.linux | 2 +- builds/posix/prefix.linux_amd64 | 2 +- builds/posix/prefix.linux_generic | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builds/posix/prefix.linux b/builds/posix/prefix.linux index fef782d7c65f..46641f9c1c7c 100644 --- a/builds/posix/prefix.linux +++ b/builds/posix/prefix.linux @@ -18,7 +18,7 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup -COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -std=gnu++03 -fno-delete-null-pointer-checks +COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -std=gnu++98 -fno-delete-null-pointer-checks OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing diff --git a/builds/posix/prefix.linux_amd64 b/builds/posix/prefix.linux_amd64 index ecf60436c892..5ce520bb5fdc 100644 --- a/builds/posix/prefix.linux_amd64 +++ b/builds/posix/prefix.linux_amd64 @@ -18,7 +18,7 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup -COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 -std=gnu++03 -fno-delete-null-pointer-checks +COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 -std=gnu++98 -fno-delete-null-pointer-checks OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof -Wno-narrowing -Wno-unused-local-typedefs diff --git a/builds/posix/prefix.linux_generic b/builds/posix/prefix.linux_generic index d976845795c2..60dc8b3428ca 100644 --- a/builds/posix/prefix.linux_generic +++ b/builds/posix/prefix.linux_generic @@ -18,7 +18,7 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup -COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -std=gnu++03 -fno-delete-null-pointer-checks +COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -std=gnu++98 -fno-delete-null-pointer-checks PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS) DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor -- 2.16.2