Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package iodbc for openSUSE:Factory checked in at 2021-06-02 22:12:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iodbc (Old) and /work/SRC/openSUSE:Factory/.iodbc.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iodbc" Wed Jun 2 22:12:14 2021 rev:24 rq:896829 version:3.52.14 Changes: -------- --- /work/SRC/openSUSE:Factory/iodbc/iodbc.changes 2017-02-03 17:42:47.853419954 +0100 +++ /work/SRC/openSUSE:Factory/.iodbc.new.1898/iodbc.changes 2021-06-02 22:12:39.784090365 +0200 @@ -1,0 +2,29 @@ +Mon May 31 16:04:11 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- config-h.diff libiodbc-3.52.12.tar.gz New: ---- libiodbc-3.52.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iodbc.spec ++++++ --- /var/tmp/diff_new_pack.17ccNu/_old 2021-06-02 22:12:40.668088179 +0200 +++ /var/tmp/diff_new_pack.17ccNu/_new 2021-06-02 22:12:40.672088168 +0200 @@ -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 @@ 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 @@ 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 @@ %prep %setup -q -n libiodbc-%{version} -%patch1 -p1 -%patch2 +%patch0 -p1 %build %configure \ @@ -100,28 +105,27 @@ 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 @@ %{_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 ++++++ fix-nonvoid-return.diff ++++++ --- /var/tmp/diff_new_pack.17ccNu/_old 2021-06-02 22:12:40.684088139 +0200 +++ /var/tmp/diff_new_pack.17ccNu/_new 2021-06-02 22:12:40.688088129 +0200 @@ -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]; + } + } + ++++++ libiodbc-3.52.12.tar.gz -> libiodbc-3.52.14.tar.gz ++++++ ++++ 47119 lines of diff (skipped)
