rpm/iodbc
SHA256
1
0
Fork 0
forked from pool/iodbc
Code Pull Requests Activity

Accepting request 896404 from home:susnux:branches:devel:libraries:c_c++

Browse Source 
Update to version 3.52.14

OBS-URL: https://build.opensuse.org/request/show/896404
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/iodbc?expand=0&rev=17
This commit is contained in:
Michael Vetter
2021-06-02 06:47:41 +00:00
committed by Git OBS Bridge
parent b71e85bf24
commit 8163f2bf15
6 changed files with 129 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config-h.diff
View File

@@ -1,12 +0,0 @@
--- iodbcadm/gtk/confirm.c.sav 2009-05-28 20:29:31.000000000 +0200
+++ iodbcadm/gtk/confirm.c 2009-05-28 20:33:31.000000000 +0200
@@ -72,6 +72,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <odbcinst.h>
#include <unicode.h>

65
fix-nonvoid-return.diff
View File

@@ -1,12 +1,55 @@
PR: https://github.com/openlink/iODBC/pull/19
diff --git a/iodbcadm/gtk/confirm.c b/iodbcadm/gtk/confirm.c
index 35b4394..5f26b8f 100644
--- a/iodbcadm/gtk/confirm.c
+++ b/iodbcadm/gtk/confirm.c
@@ -266,4 +266,5 @@ create_confirmw (HWND hwnd, LPCWSTR dsn, LPCWSTR text)
free(_dsn);
if (_text)
free(_text);
+ return TRUE;
diff -Nur libiodbc-3.52.14/iodbcinst/unicode.c new/iodbcinst/unicode.c
--- libiodbc-3.52.14/iodbcinst/unicode.c 2021-02-17 14:39:22.000000000 +0100
+++ new/iodbcinst/unicode.c 2021-05-31 18:26:17.332781996 +0200
@@ -688,9 +688,10 @@
{
switch(charset)
{
- case CP_UTF8: return 1;
case CP_UTF16: return sizeof(ucs2_t);
case CP_UCS4: return sizeof(ucs4_t);
+ case CP_UTF8:
+ default: return 1;
}
}
@@ -700,9 +701,10 @@
{
switch(charset)
{
- case CP_UTF8: return UTF8_MAX_CHAR_LEN;
case CP_UTF16: return sizeof(ucs2_t) * 2;
case CP_UCS4: return sizeof(ucs4_t);
+ case CP_UTF8:
+ default: return UTF8_MAX_CHAR_LEN;
}
}
@@ -2131,13 +2133,16 @@
switch(charset)
{
+ case CP_UTF16: return (SQLWCHAR)u2[pos];
+ case CP_UCS4: return (SQLWCHAR)u4[pos];
case CP_UTF8:
- {
+ default:
+ {
int mask, len, i=0;
SQLWCHAR wc = 0;
SQLCHAR *u8str = (SQLCHAR*)str;
while(i < pos)
- {
+ {
UTF8_COMPUTE(*u8str, mask, len);
if (len == -1)
break;
@@ -2155,8 +2160,6 @@
}
return wc;
}
- case CP_UTF16: return (SQLWCHAR)u2[pos];
- case CP_UCS4: return (SQLWCHAR)u4[pos];
}
}

29
iodbc.changes
View File

@@ -1,3 +1,32 @@
-------------------------------------------------------------------
Mon May 31 16:04:11 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to version 3.52.14
* Fixed: SQLSetEnvAttr doesn't return SQL_SUCCESS for option
SQL_ATTR_APP_UNICODE_TYPE
* Fixed: issue with switching ODBC driver to best supported
Unicode codepage
* Fixed: misprint in SQLBrowseConnect
* Fixed: SQLGetConnectOption returned wrong value for
SQL_CURRENT_QUALIFIER
* Fixed: mixing calls to SQLFetchScroll with SQLFetch
* Fixed: Misc Unicode issues
* Added extra validation for SQLAllocHandle
* Added missing define SQL_CONVERT_GUID
* Fixed issue using heap after free in SQLConnect_internal
* Fixed issue with global mutex
* Fixed SQLSetStmtAttr to cache the correct values for
SQL_ATTR_ROW_ARRAY_SIZE and SQL_ATTR_ROW_BIND_TYPE
* Fixed format specifiers and some casts to fix trace output
* Fixed missing check for section in SQLGetPrivateProfileString
* Fixed non-void function needs to return a value
* Fixed iODBC apps/frameworks CFBundleGetInfoString attribute
* Fixed small memory leaks
- Split library packages, so other packages can require only
needed ones
- Refresh fix-nonvoid-return.diff
- Drop config-h.diff
-------------------------------------------------------------------
Thu Jan 26 11:05:59 UTC 2017 - adam.majer@suse.de

76
iodbc.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package iodbc
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,16 @@
Name: iodbc
Version: 3.52.12
Version: 3.52.14
Release: 0
Summary: ODBC compliant driver manager
License: LGPL-2.0 or BSD-3-Clause
Group: Development/Libraries/C and C++
Url: http://www.iodbc.org/
Source: http://sourceforge.net/projects/iodbc/files/iodbc/%{version}/libiodbc-%{version}.tar.gz
Patch1: fix-nonvoid-return.diff
Patch2: config-h.diff
Requires: libiodbc3 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1110
Source: https://download.sourceforge.net/iodbc/libiodbc-%{version}.tar.gz
# PATCH-FIX-UPSTREAM fix-nonvoid-return.diff -- https://github.com/openlink/iODBC/issues/58
Patch0: fix-nonvoid-return.diff
BuildRequires: pkgconfig(gtk+-2.0)
%else
BuildRequires: gtk2-devel
%endif
%description
The iODBC Driver Manager is a free implementation of the SAG CLI and
@@ -45,11 +39,9 @@ Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: libiodbc3 = %{version}
%if 0%{?suse_version} > 1110
Requires: libdrvproxy2 = %{version}
Requires: libiodbcadm2 = %{version}
Requires: pkgconfig(gtk+-2.0)
%else
Requires: gtk2-devel
%endif
%description -n libiodbc-devel
This package contains all necessary include files and libraries needed
@@ -67,6 +59,20 @@ appropriate backend drivers.
This package provides the shared libraries needed by iODBC
%package -n libdrvproxy2
Summary: Administration library for iODBC
Group: Development/Libraries/C and C++
%description -n libdrvproxy2
This package provides libdrvproxy for administering iODBC
%package -n libiodbcadm2
Summary: Administration library for iODBC
Group: Development/Libraries/C and C++
%description -n libiodbcadm2
This package provides libiodbcadm for administering iODBC
%package admin
Summary: Administration tools for iODBC
Group: Development/Libraries/C and C++
@@ -81,8 +87,7 @@ This package provides tools for configuring and administering iODBC
%prep
%setup -q -n libiodbc-%{version}
%patch1 -p1
%patch2
%patch0 -p1
%build
%configure \
@@ -100,28 +105,27 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
find %{buildroot} -type f -name "*.la" -delete -print
%post -n libiodbc3 -p /sbin/ldconfig
%postun -n libiodbc3 -p /sbin/ldconfig
%post -n iodbc-admin -p /sbin/ldconfig
%postun -n iodbc-admin -p /sbin/ldconfig
%post -n libiodbcadm2 -p /sbin/ldconfig
%postun -n libiodbcadm2 -p /sbin/ldconfig
%post -n libdrvproxy2 -p /sbin/ldconfig
%postun -n libdrvproxy2 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%license LICENSE
%{_bindir}/iodbctest
%{_bindir}/iodbctestw
%{_mandir}/man1/iodbctest.1*
%{_mandir}/man1/iodbctestw.1*
%files -n libiodbc3
%defattr(-,root,root)
%doc AUTHORS LICENSE LICENSE.LGPL LICENSE.BSD ChangeLog NEWS README
%{_libdir}/libiodbc.so.*
%{_libdir}/libiodbcinst.so.*
%files admin
%license LICENSE
%{_bindir}/iodbcadm-gtk
%{_mandir}/man1/iodbcadm-gtk.1*
%files -n libiodbc-devel
%defattr(-,root,root)
%license LICENSE LICENSE.LGPL LICENSE.BSD
%doc AUTHORS ChangeLog NEWS README
%doc etc/odbc.ini.sample
%doc etc/odbcinst.ini.sample
%{_bindir}/iodbc-config
@@ -144,11 +148,17 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/pkgconfig/libiodbc.pc
%{_mandir}/man1/iodbc-config.1*
%files admin
%defattr(-,root,root)
%{_bindir}/iodbcadm-gtk
%files -n libiodbc3
%license LICENSE
%{_libdir}/libiodbc.so.*
%{_libdir}/libiodbcinst.so.*
%files -n libdrvproxy2
%license LICENSE
%{_libdir}/libdrvproxy.so.*
%files -n libiodbcadm2
%license LICENSE
%{_libdir}/libiodbcadm.so.*
%{_mandir}/man1/iodbcadm-gtk.1*
%changelog

3
libiodbc-3.52.12.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:51c5ff3a7d9a54202486cb77a3514e0e379a135beefcd5d12b96d1901f9dfb62
size 1134054

3
libiodbc-3.52.14.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f5b7e5998ce0b6dfa019b07e8f62e87d6abba28fef9d2aeb903037c883a2793b
size 1230369