From 969c446282cf5590755e3b30647c17931440dba297c28c0a2207a289fe1b658c Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 2 May 2022 15:13:25 +0000 Subject: [PATCH] Accepting request 974443 from home:jubalh:branches:server:database - Update to 2.3.10: * Add connection pooling via wide connection functions * Remove "#define VERSION" from unixodbc_conf.h * Call driver functions through prototypes * Add connection pool limit option * Add fseeko support in cursor lib * Try and prevent logging buffer overflow * Add 'echo' option to isql/iusql * Alter isql/iusql buffering * Alter unicode to ascii conversion in SQLGetDiagField * Fix pooling problem when user name and or password is not provided * Fix a couple of reported buffer overflow conditions * Fix iconv leak with timeout in pooled connection - Remove upstreamed patches: * unixODBC-doc-drivers.patch * unixODBC-doc-website.patch - Remove unixODBC-2.3.1-libodbcinst-exports.patch: Upstream exports more symbols now. In our patch there were still a couple more of them but we decided to drop them. See https://github.com/lurcher/unixODBC/issues/50 and https://github.com/lurcher/unixODBC/issues/8 for the discussion. - For the future be aware of different tarball content/confusing git tag for this release. Resulting in different content from tarball from website vs GitHub. See https://github.com/lurcher/unixODBC/issues/107 OBS-URL: https://build.opensuse.org/request/show/974443 OBS-URL: https://build.opensuse.org/package/show/server:database/unixODBC?expand=0&rev=67 --- unixODBC-2.3.1-libodbcinst-exports.patch | 54 ------------------------ unixODBC-2.3.10.tar.gz | 3 ++ unixODBC-2.3.9.tar.gz | 3 -- unixODBC-doc-drivers.patch | 27 ------------ unixODBC-doc-website.patch | 19 --------- unixODBC.changes | 29 +++++++++++++ unixODBC.spec | 23 +++------- 7 files changed, 39 insertions(+), 119 deletions(-) delete mode 100644 unixODBC-2.3.1-libodbcinst-exports.patch create mode 100644 unixODBC-2.3.10.tar.gz delete mode 100644 unixODBC-2.3.9.tar.gz delete mode 100644 unixODBC-doc-drivers.patch delete mode 100644 unixODBC-doc-website.patch diff --git a/unixODBC-2.3.1-libodbcinst-exports.patch b/unixODBC-2.3.1-libodbcinst-exports.patch deleted file mode 100644 index 1052564..0000000 --- a/unixODBC-2.3.1-libodbcinst-exports.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urEbwB unixODBC-2.3.7/odbcinst/odbcinst.exp unixODBC-2.3.7.new/odbcinst/odbcinst.exp ---- unixODBC-2.3.7/odbcinst/odbcinst.exp 2018-04-03 12:36:21.000000000 +0200 -+++ unixODBC-2.3.7.new/odbcinst/odbcinst.exp 2018-08-13 12:31:10.660686094 +0200 -@@ -65,3 +65,50 @@ - _SQLDriverConnectPrompt - _SQLDriverConnectPromptW - inst_logPushMsg -+iniAllTrim -+iniAppend -+iniClose -+iniCommit -+iniCursor -+iniDelete -+iniElement -+iniElementCount -+iniElementEOL -+iniElementToEnd -+iniGetBookmark -+iniGotoBookmark -+iniObject -+iniObjectDelete -+iniObjectEOL -+iniObjectFirst -+iniObjectInsert -+iniObjectLast -+iniObjectNext -+iniObjectSeek -+iniObjectSeekSure -+iniObjectUpdate -+iniOpen -+iniProperty -+iniPropertyDelete -+iniPropertyEOL -+iniPropertyFirst -+iniPropertyInsert -+iniPropertyLast -+iniPropertyNext -+iniPropertySeek -+iniPropertySeekSure -+iniPropertyUpdate -+iniPropertyValue -+iniToUpper -+iniValue -+_iniObjectRead -+_iniPropertyRead -+__iniDebug -+_iniDump -+_iniScanUntilNextObject -+_iniScanUntilObject -+lt_dlclose -+lt_dlerror -+lt_dlinit -+lt_dlopen -+lt_dlsym diff --git a/unixODBC-2.3.10.tar.gz b/unixODBC-2.3.10.tar.gz new file mode 100644 index 0000000..8214724 --- /dev/null +++ b/unixODBC-2.3.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:783c8fe0a26fa6406ad951236f7bfc6555dec63c82d7d1c6d171db392208a15f +size 1752463 diff --git a/unixODBC-2.3.9.tar.gz b/unixODBC-2.3.9.tar.gz deleted file mode 100644 index 3ce88dd..0000000 --- a/unixODBC-2.3.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207 -size 1676145 diff --git a/unixODBC-doc-drivers.patch b/unixODBC-doc-drivers.patch deleted file mode 100644 index 279ea66..0000000 --- a/unixODBC-doc-drivers.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fe24ac16eadd0cf61d8d868f9475eea059f9056b Mon Sep 17 00:00:00 2001 -From: Michael Vetter -Date: Tue, 16 Nov 2021 15:19:14 +0100 -Subject: [PATCH] Mention state of drivers - ---- - Drivers/README | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/Drivers/README b/Drivers/README -index 9b59fa5..dde0c71 100644 ---- a/Drivers/README -+++ b/Drivers/README -@@ -8,6 +8,13 @@ - | Drivers | - +-------------------------------------------------------------+ - -+The drivers in here are historical ones or example drivers. -+They are not supported anymore. But can be used as a starting -+point to write your own. -+ -+A list of some third party drivers can be found at: -+http://www.unixodbc.org/drivers.html -+ - Some unixODBC drivers have been coded from scratch while others - have been integerated (tweeked to compile and tested) into - unixODBC. diff --git a/unixODBC-doc-website.patch b/unixODBC-doc-website.patch deleted file mode 100644 index c96112b..0000000 --- a/unixODBC-doc-website.patch +++ /dev/null @@ -1,19 +0,0 @@ -From f1712186b932581ca8010713565ecdf6f09a2496 Mon Sep 17 00:00:00 2001 -From: Michael Vetter -Date: Tue, 16 Nov 2021 15:08:15 +0100 -Subject: [PATCH] readme: add github and website links - ---- - README | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/README b/README -index 39a259f..07b8fd6 100644 ---- a/README -+++ b/README -@@ -52,3 +52,5 @@ Config Files: - Resources: - - http://sourceforge.net/projects/unixodbc/ -+ https://github.com/lurcher/unixODBC/ -+ http://www.unixodbc.org/ diff --git a/unixODBC.changes b/unixODBC.changes index 7d0dda4..775f5f3 100644 --- a/unixODBC.changes +++ b/unixODBC.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon May 2 13:43:57 UTC 2022 - Michael Vetter + +- Update to 2.3.10: + * Add connection pooling via wide connection functions + * Remove "#define VERSION" from unixodbc_conf.h + * Call driver functions through prototypes + * Add connection pool limit option + * Add fseeko support in cursor lib + * Try and prevent logging buffer overflow + * Add 'echo' option to isql/iusql + * Alter isql/iusql buffering + * Alter unicode to ascii conversion in SQLGetDiagField + * Fix pooling problem when user name and or password is not provided + * Fix a couple of reported buffer overflow conditions + * Fix iconv leak with timeout in pooled connection +- Remove upstreamed patches: + * unixODBC-doc-drivers.patch + * unixODBC-doc-website.patch +- Remove unixODBC-2.3.1-libodbcinst-exports.patch: + Upstream exports more symbols now. In our patch there were + still a couple more of them but we decided to drop them. + See https://github.com/lurcher/unixODBC/issues/50 and + https://github.com/lurcher/unixODBC/issues/8 for the discussion. +- For the future be aware of different tarball content/confusing + git tag for this release. Resulting in different content from + tarball from website vs GitHub. + See https://github.com/lurcher/unixODBC/issues/107 + ------------------------------------------------------------------- Tue Nov 16 14:55:18 UTC 2021 - Michael Vetter diff --git a/unixODBC.spec b/unixODBC.spec index a73e71f..80fd9b3 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,7 +1,7 @@ # # spec file for package unixODBC # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: unixODBC -Version: 2.3.9 +Version: 2.3.10 Release: 0 Summary: ODBC driver manager with some drivers included License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -26,15 +26,9 @@ URL: http://www.unixodbc.org/ Source0: ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-%{version}.tar.gz Source1: baselibs.conf Source2: unixODBC-rpmlintrc -Patch1: unixODBC-paths.patch -Patch2: unixODBC-gccwarnings.patch -# https://github.com/lurcher/unixODBC/issues/8 -Patch3: unixODBC-2.3.1-libodbcinst-exports.patch -Patch4: unixODBC-2.3.6-declarations.patch -# SLE-20556 - https://github.com/lurcher/unixODBC/pull/85 -Patch5: unixODBC-doc-drivers.patch -# SLE-20556 - https://github.com/lurcher/unixODBC/pull/84 -Patch6: unixODBC-doc-website.patch +Patch0: unixODBC-paths.patch +Patch1: unixODBC-gccwarnings.patch +Patch2: unixODBC-2.3.6-declarations.patch BuildRequires: automake BuildRequires: bison BuildRequires: gcc-c++ @@ -69,12 +63,9 @@ Includes for ODBC development (based on unixODBC). %prep %setup -q +%patch0 %patch1 -%patch2 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch2 -p1 chmod -x NEWS README doc/*.html doc/*.gif Drivers/README