diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..18945d0 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,33 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: unixODBC.spec + +# add or remove files that should be synced +files_to_sync: + - unixODBC.spec + - .packit.yaml + +# name in upstream package repository or registry (e.g. in PyPI) +upstream_package_name: unixODBC +upstream_project_url: https://github.com/lurcher/unixODBC +# downstream (Fedora) RPM package name +downstream_package_name: unixODBC + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + + - job: koji_build + trigger: commit + allowed_pr_authors: ["packit", "@db-sig"] + allowed_committers: ["packit", "@db-sig"] + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-all diff --git a/README.dist b/README.dist deleted file mode 100644 index 6a68032..0000000 --- a/README.dist +++ /dev/null @@ -1,31 +0,0 @@ -About unixODBC in this distribution ------------------------------------ - -In addition to the unixODBC package itself, you will want to install some -or all of these related packages: - -mysql-connector-odbc MySQL driver, needed to connect to MySQL databases -postgresql-odbc PostgreSQL driver, needed to connect to PostgreSQL -unixODBC-gui-qt Optional configuration management and test programs - - -The recommended driver definition for MySQL 8 is: - -[MySQL] -Description = ODBC for MySQL 8 -Driver = /usr/lib/libmyodbc8.so -Driver64 = /usr/lib64/libmyodbc8.so -FileUsage = 1 - -You can adjust the name (in square brackets) and the description, but -the other items should usually be used verbatim. - -The recommended driver definition for PostgreSQL is: - -[PostgreSQL] -Description = ODBC for PostgreSQL -Driver = /usr/lib/psqlodbcw.so -Setup = /usr/lib/libodbcpsqlS.so -Driver64 = /usr/lib64/psqlodbcw.so -Setup64 = /usr/lib64/libodbcpsqlS.so -FileUsage = 1 diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..786c2a0 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.80.0.post8+gf2b5fcbc. diff --git a/changelog b/changelog new file mode 100644 index 0000000..447a222 --- /dev/null +++ b/changelog @@ -0,0 +1,636 @@ +* Fri Aug 07 2026 Adam Williamson +- odbcinst-generate - add Requires(post): coreutils +- Make all scriptlets always exit 0, per policy + +* Wed Jul 29 2026 Michal Schorm - 2.3.14-11 +- [cleanup] Remove dead 'Conflicts: iodbc' from spec +- [bugfix] Use 'mkdir -p' for ODBC plugin directory creation +- [Fedora 45 Change] Add drop-in directory infrastructure for ODBC driver registration + +* Fri Jul 17 2026 Fedora Release Engineering - 2.3.14-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Tue Jun 30 2026 Michal Schorm - 2.3.14-9 +- [performance] Enable '--enable-fastvalidate' to eliminate O(n) handle validation overhead + +* Thu Jun 25 2026 Michal Schorm - 2.3.14-8 +- [bugfix] Fix multilib conflict for 'unixodbc.h' header + +* Thu May 28 2026 Michal Schorm - 2.3.14-7 +- [refactor] Use consistent '%{_libdir}' macro syntax in '%files devel' +- [enhancement] Add 'MDBTools' driver entry to 'odbcinst.ini' +- [enhancement] Add missing 'Suggests' for all ODBC driver packages +- [bugfix] Fix incorrect 'FileUsage' values in 'odbcinst.ini' +- [bugfix] Remove dead 'Port' key from [FreeTDS] driver definition +- [cleanup] Drop obsolete 'keep-typedefs.patch' +- [design change] Enable ODBC driver search path, use bare library names in + 'odbcinst.ini' + +* Fri May 22 2026 Michal Schorm - 2.3.14-6 +- [bugfix] Fix MySQL driver path in odbcinst.ini +- [bugfix] Fix FreeTDS driver path in odbcinst.ini (rhbz#2453060) +- Drop multilib-rpm-config usage on RHEL + +* Wed Apr 15 2026 Michal Schorm - 2.3.14-5 +- [design change] Rename ODBC plugin directory from 'unixODBC/' to 'odbc/' + +* Wed Apr 15 2026 Michal Schorm - 2.3.14-4 +- [cleanup] Drop obsolete MySQL-5 driver config from odbcinst.ini +- [bugfix] Own %{_libdir}/unixODBC/ directory for ODBC connector plugins +- [bugfix] Update MariaDB driver path in odbcinst.ini +- [workaround] Remove broken Setup/Setup64 entries from PostgreSQL driver + config +- [bugfix] Update PostgreSQL driver path in odbcinst.ini + +* Sat Jan 17 2026 Fedora Release Engineering - 2.3.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jan 09 2026 Michal Schorm - 2.3.14-2 +- Bump release to test Packit automation + +* Fri Jan 09 2026 Michal Schorm - 2.3.14-1 +- Rebase to 2.3.14 + +* Fri Jul 25 2025 Fedora Release Engineering - 2.3.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 2.3.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 2.3.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 29 2024 Florian Weimer - 2.3.12-4 +- Fix out-of-bounds stack write (GCC 14 compatibility) + +* Sat Jan 27 2024 Fedora Release Engineering - 2.3.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 05 2024 Honza Horak - 2.3.12-2 +- SPDX migration + +* Thu Sep 14 2023 Packit - 2.3.12-1 +- New Release 2.3.12 (lurcher) +- Don't check state with shared env (lurcher) +- Add --enable-singleenv option (lurcher) +- Allow longer messages via SQLGetDiag (lurcher) +- Add --enable-utf8ini flag and coding (lurcher) +- Fix possible seg faults with SQLAPI and pooling (lurcher) +- Fix possible seg faults with SQLAPI and pooling (lurcher) +- Remove self-reference (Stefan) +- Avoid implicit function declarations, for C99 compatibility (Florian Weimer) +- Fix --enable-stats config error (lurcher) +- Allow diagnostics to be retrieved on SQL_NO_DATA (Kevin Adler) +- isql.1: Add information about passwords containing semicolons (Hugh McMaster) +- isql.1: Various text updates (Hugh McMaster) +- Export __clear_ini_cache from libodbcinst (lurcher) +- Revert "Add call to atexit to clear the ini cache" (lurcher) +- Add call to atexit to clear the ini cache (lurcher) +- Add extra iusql connectionstring syntax (lurcher) +- Allow longer connection strings (part 3) (lurcher) +- Allow longer connection strings (part 2) (lurcher) +- Allow longer connection strings (lurcher) +- Fixed Connection String (Stefan) +- Add extra connection syntax to isql help (lurcher) +- Add extra logging for ODBCINST connect settings (lurcher) +- Allow isql to handle SQLPrepare returning SQL_SUCCESS_WITH_INFO (and report warning) (lurcher) +- Allow isql to handle SQLPrepare returning SQL_SUCCESS_WITH_INFO (lurcher) +- Allow passing complete connection string into iusql (lurcher) +- Remove __get_connection from cursor lib (lurcher) +- Avoid failed build if clock_gettime() is not available (lurcher) +- Update change log (lurcher) +- DriverManager/_info.c: Get locale encoding on Windows. (Markus Mützel) +- DriverManager/drivermanager.h: fix build without threads (Fabrice Fontaine) +- Fix iconv handle leak with pooling (lurcher) +- Fix buffer overrun (lurcher) +- Create SECURITY.md (Nick Gorham) +- Move to 2.3.12pre (lurcher) +- Makefile.am: Do not install config.h (Hugh McMaster) + +* Sat Jul 22 2023 Fedora Release Engineering - 2.3.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Apr 13 2023 Florian Weimer - 2.3.11-3 +- Port to C99 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.3.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Aug 16 2022 Michal Schorm - 2.3.11-1 +- Rebase to 2.3.11 + +* Sat Jul 23 2022 Fedora Release Engineering - 2.3.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.3.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.3.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jul 02 2021 Michal Schorm - 2.3.9-3 +- Bump release after fix of the default configuration for MySQL driver + comming from "mysql-connector-odbc" package + +* Wed Jan 27 2021 Fedora Release Engineering - 2.3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 10 2020 Ondrej Dubaj - 2.3.9-1 +- rebase to version 2.3.9 +- move unversioned *.so files back to *-devel package + +* Wed Jul 29 2020 Fedora Release Engineering - 2.3.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.3.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.3.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 17 2019 Igor Gnatenko - 2.3.7-4 +- Rebuild for readline 8.0 + +* Sun Feb 03 2019 Fedora Release Engineering - 2.3.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Nov 30 2018 Michal Schorm - 2.3.7-2 +- Bump for rebuild to ship updated configuration + +* Sat Aug 11 2018 Pavel Raiskup - 2.3.7-1 +- update to version 2.3.7 + +* Sat Jul 14 2018 Fedora Release Engineering - 2.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Apr 27 2018 Pavel Raiskup - 2.3.6-1 +- update to version 2.3.6 + +* Wed Mar 07 2018 Honza Horak - 2.3.5-3 +- Bump for a rebuild + +* Tue Feb 20 2018 Pavel Raiskup - 2.3.5-2 +- cleanup autotool hacks + +* Mon Feb 19 2018 Jan Staněk - 2.3.5-1 +- Update to version 2.3.5 + +* Fri Feb 09 2018 Fedora Release Engineering - 2.3.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 03 2018 Honza Horak - 2.3.4-9 +- Include mariadb-connector-odbc driver spec in the odbcinst.ini + +* Wed Aug 30 2017 Tomas Repik - 2.3.4-8 +- move libtdsS.so to the main package and add tds config to odbcinst.ini +- rhbz#1448890 + +* Thu Aug 03 2017 Fedora Release Engineering - 2.3.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jan 12 2017 Igor Gnatenko - 2.3.4-4 +- Rebuild for readline 7.x + +* Wed Jun 22 2016 Pavel Raiskup - 2.3.4-3 +- delegate multilib hacks to multilib-rpm-config package + +* Fri Feb 05 2016 Fedora Release Engineering - 2.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Sep 01 2015 Jan Stanek - 2.3.4-1 +- Update to version 2.3.4 + +* Tue Aug 25 2015 Jan Stanek - 2.3.3-1 +- Update to version 2.3.3 +- Removed patches and sources included upstream +- Recreated so-version-bump.patch + +* Wed Aug 12 2015 Jan Stanek - 2.3.2-8 +- Backported changes necessary for building with new autotools version. + +* Fri Jun 19 2015 Fedora Release Engineering - 2.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 2.3.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Feb 18 2014 Jan Stanek - 2.3.2-4 +- Added manual pages for iusql, dltest, odbc_config + +* Fri Dec 06 2013 Jan Stanek - 2.3.2-3 +- Renamed README.fedora to README.dist + +* Thu Oct 24 2013 Jan Stanek - 2.3.2-2 +- Add man page describing enviromental variables (#991018) + +* Thu Oct 10 2013 Jan Stanek - 2.3.2-1 +- Update to 2.3.2 version +- Removed extra man-pages and patch already shipped by upstream + +* Sun Aug 04 2013 Fedora Release Engineering - 2.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jul 4 2013 Honza Horak 2.3.1-6 +- Spec file clean-up +- Provide man pages created by Jan Stanek + +* Thu Jul 4 2013 Honza Horak 2.3.1-5 +- Fix Coverity patch + Resolves: #981060 + +* Tue Mar 19 2013 Tom Lane 2.3.1-4 +- Fix assorted small bugs found by Coverity +Related: #760877 + +* Fri Feb 15 2013 Fedora Release Engineering - 2.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 2.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jan 10 2012 Tom Lane 2.3.1-1 +- Update to version 2.3.1. The main externally-visible change is that the + GUI programs are not part of the unixODBC tarball anymore, so they are no + longer in this package, and the unixODBC-kde sub-RPM has disappeared. + There is a separate package unixODBC-gui-qt that now provides those programs. + +* Mon Feb 07 2011 Fedora Release Engineering - 2.2.14-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Aug 31 2010 Tom Lane 2.2.14-12 +- Fix isql crash at EOF with -b option +Resolves: #628909 + +* Mon May 3 2010 Tom Lane 2.2.14-11 +- Re-add accidentally-removed desktop icon for ODBCConfig +Related: #587933 + +* Sat Mar 13 2010 Kevin Kofler 2.2.14-10 +- BR qt-assistant-adp-devel + +* Sat Dec 19 2009 Tom Lane 2.2.14-9 +- Fix bug preventing drivers from being selected in ODBCConfig +Resolves: #544852 + +* Wed Nov 25 2009 Kevin Kofler 2.2.14-8 +- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI) + +* Thu Oct 15 2009 Tom Lane 2.2.14-7 +- Clean up bogosity in multilib stub header support: ia64 should not be + listed (it's not multilib), sparcv9 isn't a possible uname -i output + +* Fri Aug 21 2009 Tom Lane 2.2.14-6 +- Switch to building against qt4, not qt3. This means the DataManager, + DataManagerII, and odbctest applications are gone. +Resolves: #514064 +- Use Driver64/Setup64 to eliminate need for hand-adjustment of odbcinst.ini +Resolves: #514688 +- Fix misdeclaration of SQLBIGINT and SQLUBIGINT in generated header files +Resolves: #518623 + +* Sun Jul 26 2009 Fedora Release Engineering - 2.2.14-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jun 9 2009 Peter Lemenkov - 2.2.14-4 +- Properly install *.desktop files +- No need to ship INSTALL in docs +- Use macros instead of hardcoded /usr/share and /usr/include +- fixed permissions on some doc- and src-files +- Almost all rpmlint messages are gone now + +* Sat Jun 06 2009 Dennis Gilmore - 2.2.14-3 +- add sparc support to the multilib includes header + +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 20 2009 Tom Lane 2.2.14-1 +- Update to unixODBC 2.2.14. Note this involves an ABI break and a consequent + soname version bump, because upstream fixed some mistakes in the widths of + some API datatypes for 64-bit platforms. Also, the formerly embedded + mysql, postgresql, and text drivers have been removed. (For mysql and + postgresql, use the separate mysql-connector-odbc and postgresql-odbc + packages, which are far more up to date. The text driver is not currently + shipped by upstream at all, but might get revived as a separate SRPM later.) +- Stop shipping .a library files, per distro policy. +- Fixes for libtool 2.2. + +* Mon Jul 28 2008 Tom Lane 2.2.12-9 +- Fix build failure caused by new default patch fuzz = 0 policy in rawhide. + +* Fri Jun 13 2008 Tom Lane 2.2.12-8 +- Install icons in /usr/share/pixmaps, not /usr/share/icons as this package + has historically done; the former is considered correct. + +* Fri Apr 4 2008 Tom Lane 2.2.12-7 +- Must BuildRequire qt3 now that Fedora has renamed qt4 to qt +Resolves: #440798 + +* Mon Feb 11 2008 Tom Lane 2.2.12-6 +- Move libodbcinst.so symlink into main package, since it's often dlopen'd +Related: #204882 +- Clean up specfile's ugly coding for making base-vs-devel decisions + +* Sun Dec 30 2007 Tom Lane 2.2.12-5 +- Add missing BuildRequires for flex. +Resolves: #427063 + +* Thu Aug 2 2007 Tom Lane 2.2.12-4 +- Update License tag to match code. + +* Fri Apr 20 2007 Tom Lane 2.2.12-3 +- Make configure find correct Qt libraries when building on a multilib machine + +* Mon Apr 16 2007 Tom Lane 2.2.12-2 +- Drop BuildRequires for kdelibs-devel +Resolves: #152717 +- Clean up a few rpmlint complaints + +* Wed Dec 6 2006 Tom Lane 2.2.12-1 +- Update to unixODBC 2.2.12. +- Add missing BuildPrereq for bison. +Resolves: #190427 + +* Wed Jul 12 2006 Jesse Keating - 2.2.11-7.1 +- rebuild + +* Mon Mar 27 2006 Tom Lane 2.2.11-7 +- Fix minor problems in desktop files (bug #185764) + +* Fri Feb 10 2006 Jesse Keating - 2.2.11-6.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.2.11-6.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Nov 21 2005 Tom Lane 2.2.11-6 +- Patch NO-vs-no discrepancy between aclocal/acinclude and recent autoconf + versions (not sure if this has been broken for a long time, or was just + exposed by modular X changeover). +- Apparently need to require libXt-devel too for modular X. + +* Mon Nov 7 2005 Tom Lane 2.2.11-5 +- Adjust BuildPrereq for modular X. + +* Sun Oct 16 2005 Florian La Roche 2.2.11-4 +- link against dependent libs +- fix some bugs to resolve unknown symbols ;-( + +* Thu Sep 29 2005 Tom Lane 2.2.11-3 +- Force update of yac.h because the copy in the distributed tarball does not + match bison 2.0's numbering of symbols (bz #162676) +- Include documentation of text-file driver +- Use private libltdl so we can omit RTLD_GLOBAL from dlopen flags (bz #161399) + +* Sat Sep 24 2005 Tom Lane 2.2.11-2 +- Remove Makefiles accidentally included in docs installation (bz #168819) +- Updates to keep newer libtool code from installing itself as part of package + +* Fri Apr 8 2005 Tom Lane 2.2.11-1 +- Update to unixODBC 2.2.11 + +* Mon Mar 7 2005 Tom Lane 2.2.10-3 +- Rebuild with gcc4. + +* Wed Jan 12 2005 Tim Waugh 2.2.10-2 +- Rebuilt for new readline. + +* Thu Oct 28 2004 Tom Lane 2.2.10-1 +- Update to unixODBC 2.2.10 + +* Wed Sep 22 2004 Tom Lane 2.2.9-1 +- Update to unixODBC 2.2.9 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Sat May 8 2004 Tom Lane 2.2.8-5 +- Backpatch fix for double-free error from upstream devel sources. +- rebuilt + +* Wed May 5 2004 Tom Lane 2.2.8-4 +- Add dependency to ensure kde subpackage stays in sync with main + (needed because we moved odbctest from one pkg to the other, + cf bug #122478) +- rebuilt + +* Wed Mar 10 2004 Tom Lane 2.2.8-3 +- Use installed libltdl +- rebuilt for Fedora Core 2 + +* Tue Mar 9 2004 Tom Lane 2.2.8-2 +- Rename lo_xxx() to odbc_lo_xxx() (bug #117211) (temporary until 2.2.9) +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Mon Mar 1 2004 Tom Lane +- Update to 2.2.8 +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Dec 4 2003 Joe Orton 2.2.5-10 +- rebuild to restore sqltypes.h after #111195 + +* Thu Oct 16 2003 Fernando Nasser 2.2.5-9 +- Add XFree86-devel to the list of BuildPrereq. Did not bump + release as there is no need to rebuild. + +* Thu Oct 16 2003 Fernando Nasser 2.2.5-9 +- Add comments to the /etc/odbcinst.ini file regarding the proper + setup for MySQL and the origin of each library needed. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-8 +- Move libodbcmyS.so to the main package as well. It is used the + same way as libodbcpsqlS.so. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-7 +- Bumped the version so it rebuilds. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-4 +- Revert previous change and special case libodbcpsql.so and + libodbcpsqlS.so instead. Here is the explanation (from Elliot + Lee): + ".so files are only used at link time for normal dynamic libraries. + The libraries referred to here are being used as dynamically loaded + modules, so I guess moving those particular .so files back to the + main package would make sense, but the other .so files should stay + in the devel subpackage." + +* Fri Oct 10 2003 Fernando Nasser 2.2.5-3 +- Moved all the shared library symlinks to the main package. + They were deliberatedly being added to the devel package for + unknown reasons but this was forcing users to install the + devel package always. +- No need to special-case libodbc.so anymore + +* Fri Sep 05 2003 Elliot Lee 2.2.5-2 +- Run auto* so it rebuilds. + +* Mon Jul 07 2003 Fernando Nasser 2.2.5-1 +- Moved odbctest to the kde package to remove require on Qt stuff + from the main package. +- Removed stray "\" from doc/Makefile.am +- Applied libtool fix (provided by Alex Oliva) so that it build + with cross-compilers (which are used by 64 bit systems) +- Updated sources to the 2.2.5 community release +- Changed the included libtool to the 1.5-3 one so that + it properly link the libraries with the newly generated ones + and not with the ones installed on the build system (or give + an error if an old version is not installed (# 91110) +- Added new files for executable DataManagerII and icons LinuxODBC.xpm + and odbc.xpm + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Jan 9 2003 Bill Nottingham 2.2.3-5 +- debloat + +* Tue Dec 17 2002 Elliot Lee 2.2.3-4 +- Run libtoolize etc. + +* Thu Dec 12 2002 Elliot Lee 2.2.3-3 +- Rebuild to fix filelist errors...? + +* Fri Nov 29 2002 Tim Powers 2.2.3-2 +- remove unpackaged files from the buildroot + +* Tue Nov 19 2002 Elliot Lee 2.2.3-1 +- Rebuild, update to 2.2.3 + +* Mon Aug 26 2002 Trond Eivind Glomsrd 2.2.2-3 +- Move libodbc.so to the main package, so programs dlopening + it don't break (#72653) + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Trond Eivind Glomsrd 2.2.2-1 +- 2.2.2 +- desktop file changes (# 69371) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Mon May 20 2002 Trond Eivind Glomsrd 2.2.1-1 +- 2.2.1 +- Reenable other archs, as this should now build on 64 bit archs + +* Sun May 19 2002 Florian La Roche +- add at least mainframe; should this really be a i386-only rpm? + +* Wed Apr 17 2002 Bernhard Rosenkraenzer 2.2.0-5 +- rebuild + +* Fri Apr 5 2002 Trond Eivind Glomsrd 2.2.0-4 +- Avoid having files in more than one package (#62755) + +* Tue Mar 26 2002 Trond Eivind Glomsrd 2.2.0-3 +- Don't include kde plugin .so as a devel symlink (#61039) + +* Fri Mar 8 2002 Bernhard Rosenkraenzer 2.2.0-2 +- Rebuild with KDE 3.x + +* Tue Feb 26 2002 Trond Eivind Glomsrd 2.2.0-1 +- Just build on i386 now, there are 64 bit oddities +- 2.2.0 + +* Fri Jan 11 2002 Trond Eivind Glomsrd 2.1.1-2 +- move libodbcinstQ* to the kde subpackage + +* Fri Jan 11 2002 Trond Eivind Glomsrd 2.1.1-1 +- 2.1.1 +- minor cleanups + +* Fri Dec 14 2001 Trond Eivind Glomsrd 2.0.7-5 +- Rebuild + +* Wed Sep 12 2001 Tim Powers +- rebuild with new gcc and binutils + +* Sun Jun 24 2001 Than Ngo +- rebuild against qt-2.3.1, kde-2.1.x + +* Fri Jun 15 2001 Trond Eivind Glomsrd +- Better default odbcinst.ini +- Minor cleanups + +* Wed Jun 6 2001 Trond Eivind Glomsrd +- 2.0.7 + +* Wed Apr 25 2001 Trond Eivind Glomsrd +- Fix for isql segfault on EOF/ctrl-d exit + +* Fri Apr 20 2001 Trond Eivind Glomsrd +- 2.0.6 +- add patch for 64 bit archs (dword shouldn't be "long int") + +* Wed Feb 28 2001 Trond Eivind Glomsrd +- rebuild + +* Tue Nov 28 2000 Trond Eivind Glomsrd +- 1.8.13 + +* Tue Oct 10 2000 Trond Eivind Glomsrd +- enable GUI now that we have KDE compiled with the standard + compiler +- move the applnk entries to the KDE package + +* Thu Aug 24 2000 Nalin Dahyabhai +- add the missing shared libs to the non-devel package + +* Wed Aug 23 2000 Preston Brown +- 1.8.12 fixes problems with the postgresql driver + +* Mon Jul 31 2000 Trond Eivind Glomsrd +- disable KDE subpackage to avoid the mess that is C++ binary + compatibility + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Fri Jun 30 2000 Florian La Roche +- improved QTDIR detection + +* Wed Jun 28 2000 Trond Eivind Glomsrd +- 1.8.10 +- use %%{_tmppath} +- update URL +- including two missing libraries + +* Tue Jun 13 2000 Preston Brown +- 1.8.9 + +* Fri Jun 09 2000 Preston Brown +- adopted for Winston, changed to Red Hat packaging standards + +* Tue Apr 18 2000 Murray Todd Williams +- added a unixODBC-devel RPM to the group, added KDE links and icons to system +- all of which came from recommendations from Fredrick Meunier +- + +* Mon Apr 17 2000 Murray Todd Williams +- unixODBC-1.8.7 +- moved install to $RPM_BUILD_ROOT so it didn't overrun existing files. diff --git a/keep-typedefs.patch b/keep-typedefs.patch deleted file mode 100644 index 7f577f2..0000000 --- a/keep-typedefs.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream has decided to deprecate these typedefs, but experience so far -says that removing them just breaks code to little purpose. - - -diff -Naur unixODBC-2.2.14.orig/include/sqltypes.h unixODBC-2.2.14/include/sqltypes.h ---- unixODBC-2.2.14.orig/include/sqltypes.h 2008-10-31 12:21:53.000000000 -0400 -+++ unixODBC-2.2.14/include/sqltypes.h 2009-02-16 13:28:50.000000000 -0500 -@@ -170,6 +170,10 @@ - typedef SQLUINTEGER SQLROWSETSIZE; - typedef SQLLEN SQLROWOFFSET; - */ -+typedef SQLULEN SQLROWCOUNT; -+typedef SQLULEN SQLROWSETSIZE; -+typedef SQLULEN SQLTRANSID; -+typedef SQLLEN SQLROWOFFSET; - #endif - #else - typedef long SQLINTEGER; diff --git a/odbcinst-generate b/odbcinst-generate new file mode 100644 index 0000000..99f10d7 --- /dev/null +++ b/odbcinst-generate @@ -0,0 +1,123 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2026 Michal Schorm +# +# Regenerate /etc/odbcinst.ini from drop-in snippets. +# +# Merge order: +# 1. /usr/lib/odbc/odbcinst.d/*.ini (vendor, low-numbered prefixes) +# 2. /etc/odbc/odbcinst.d/*.ini (admin, high-numbered prefixes) +# +# Override rules: +# - Files are sorted by full basename (numeric prefix determines order) +# - When two files share the same name after stripping the numeric prefix +# (e.g., 10-mariadb.ini and 60-mariadb.ini), the higher-numbered one wins +# - A symlink to /dev/null disables the corresponding driver entry +# +# This script is called from RPM file triggers and %post. +# It must be safe to run at any time (idempotent). + +set -eo pipefail + +VENDOR_DIR=/usr/lib/odbc/odbcinst.d +ADMIN_DIR=/etc/odbc/odbcinst.d +TARGET=/etc/odbcinst.ini + +tmpfile=$(mktemp "${TARGET}.XXXXXX") +resolved="" +trap 'rm -f "$tmpfile" "$resolved"' EXIT + +cat > "$tmpfile" << 'HEADER' +# Auto-generated from drop-in snippets. Do not edit this file. +# +# Vendor defaults: /usr/lib/odbc/odbcinst.d/*.ini +# Admin overrides: /etc/odbc/odbcinst.d/*.ini +# +# To override a vendor driver, place a file with the same name +# (or higher numeric prefix) in /etc/odbc/odbcinst.d/. +# To disable a vendor driver, symlink its snippet to /dev/null: +# ln -sf /dev/null /etc/odbc/odbcinst.d/10-freetds.ini +# +# To apply changes after editing drop-in files, run: +# odbcinst-generate +HEADER + +# Build an associative array: key → path (last writer wins by sort order) +declare -A snippets + +# Process vendor first (lower priority), then admin (higher priority) +for dir in "$VENDOR_DIR" "$ADMIN_DIR"; do + [ -d "$dir" ] || continue + for f in "$dir"/*.ini; do + [ -e "$f" ] || continue + base=$(basename "$f") + # Strip numeric prefix for override matching: "10-mariadb.ini" → "mariadb.ini" + key="${base#[0-9][0-9]-}" + snippets["$key"]="$f" + done +done + +# Sort keys and emit content +if [ ${#snippets[@]} -gt 0 ]; then + while IFS= read -r key; do + f="${snippets[$key]}" + + # Symlink to /dev/null = disabled + if [ -L "$f" ] && [ "$(readlink -f "$f")" = "/dev/null" ]; then + continue + fi + + [ -f "$f" ] || continue + echo "" >> "$tmpfile" + cat "$f" >> "$tmpfile" + done < <(printf '%s\n' "${!snippets[@]}" | sort) +fi + +# Resolve bare library names (e.g. "libmaodbc.so") to absolute paths. +# unixODBC finds bare names via its compiled-in --with-odbc-driver-path, +# but iODBC requires absolute paths for dlopen(). Absolute paths also +# make the generated config self-documenting. +# +# Multilib: when a driver .so exists in both /usr/lib64/odbc/ and +# /usr/lib/odbc/ (e.g. both x86_64 and i686 RPMs installed), emit +# Driver= for the 32-bit path and Driver64= for the 64-bit path. +# unixODBC selects the matching key based on the calling application's +# word size. When only one architecture is present, only Driver= is +# emitted. Same for Setup/Setup64. +# +# If a bare name is not found in either directory, it is left unchanged +# so unixODBC can still find it via its built-in search path. +resolved=$(mktemp "${TARGET}.XXXXXX") + +while IFS= read -r line; do + if [[ "$line" =~ ^((Driver|Setup)[[:space:]]*=[[:space:]]*)([^/[:space:]][^/[:space:]]*\.so[^/[:space:]]*)[[:space:]]*$ ]]; then + prefix="${BASH_REMATCH[1]}" + key="${BASH_REMATCH[2]}" + bare="${BASH_REMATCH[3]}" + + in_lib64="" + in_lib32="" + [ -f "/usr/lib64/odbc/$bare" ] && in_lib64="/usr/lib64/odbc/$bare" + [ -f "/usr/lib/odbc/$bare" ] && in_lib32="/usr/lib/odbc/$bare" + + if [ -n "$in_lib64" ] && [ -n "$in_lib32" ]; then + printf '%s%s\n' "$prefix" "$in_lib32" + printf '%s64 = %s\n' "$key" "$in_lib64" + elif [ -n "$in_lib64" ]; then + printf '%s%s\n' "$prefix" "$in_lib64" + elif [ -n "$in_lib32" ]; then + printf '%s%s\n' "$prefix" "$in_lib32" + else + printf '%s\n' "$line" + fi + else + printf '%s\n' "$line" + fi +done < "$tmpfile" > "$resolved" + +mv "$resolved" "$tmpfile" + +# Atomic replace +chmod 644 "$tmpfile" +mv "$tmpfile" "$TARGET" +trap - EXIT diff --git a/odbcinst-generate.1 b/odbcinst-generate.1 new file mode 100644 index 0000000..f989383 --- /dev/null +++ b/odbcinst-generate.1 @@ -0,0 +1,357 @@ +.\" SPDX-License-Identifier: GPL-2.0-or-later +.\" Copyright (C) 2026 Michal Schorm +.TH ODBCINST\-GENERATE 1 "July 2026" "unixODBC" "User Commands" +.SH NAME +odbcinst\-generate \- regenerate /etc/odbcinst.ini from drop\-in snippets +.SH SYNOPSIS +.B odbcinst\-generate +.SH DESCRIPTION +.B odbcinst\-generate +assembles +.I /etc/odbcinst.ini +from drop\-in snippet files shipped by ODBC driver packages and +administrator overrides. +It is normally invoked automatically by RPM file triggers when driver +packages are installed or removed. +Administrators may also run it manually after editing drop\-in files. +.PP +The generated file is replaced atomically (write to a temporary file, +then rename). +The command is idempotent and safe to run at any time. +.SH DROP\-IN DIRECTORIES +.TP +.I /usr/lib/odbc/odbcinst.d/ +Vendor defaults. +ODBC driver packages ship static +.B .ini +snippet files here. +These files are never modified by the administrator. +.TP +.I /etc/odbc/odbcinst.d/ +Administrator overrides and additions. +Files placed here take precedence over vendor defaults. +.SH FILE NAMING +Snippet files are named +.IR NN \- name .ini , +where +.I NN +is a two\-digit numeric prefix that controls merge order. +.PP +Recommended ranges: +.RS +.TP +.B 10\(en29 +Distro vendor (Fedora\-shipped driver packages). +.TP +.B 30\(en49 +Third\-party / out\-of\-tree (COPR packages, vendor RPMs such as +SeerODBC, Oracle Instant Client, etc.). +.TP +.B 50\(en99 +Administrator overrides and additions. +.RE +.PP +The numeric prefix controls tie\-breaking within a single directory +(see +.BR "OVERRIDE SEMANTICS" ). +It does not affect output order; output sections are sorted +alphabetically by the stripped name. +.SH OVERRIDE SEMANTICS +Files from both directories are merged using +.B stripped\-name matching: +the numeric prefix is removed from each filename +.RI ( 10\-mariadb.ini +becomes +.IR mariadb.ini ), +and files that share the same stripped name compete. +Only one file per stripped name survives; the rest are discarded. +.PP +Tie\-breaking follows two rules, applied in order: +.IP 1. 4 +.B Directory wins. +A file in the administrator directory +.RI ( /etc/odbc/odbcinst.d/ ) +always takes precedence over a file with the same stripped name in the +vendor directory +.RI ( /usr/lib/odbc/odbcinst.d/ ), +regardless of numeric prefix. +.IP 2. 4 +.B Higher prefix wins. +Within the same directory, the file with the higher numeric prefix wins. +For example, +.I 30\-mariadb.ini +overrides +.I 10\-mariadb.ini +when both reside in the vendor directory. +.PP +After tie\-breaking, the surviving snippets are sorted alphabetically by +their stripped name and concatenated to produce the output file. +.SH DISABLING A DRIVER +To disable a vendor\-shipped driver, create a symlink to +.I /dev/null +in the administrator directory: +.PP +.RS +.nf +ln \-sf /dev/null /etc/odbc/odbcinst.d/10\-freetds.ini +odbcinst\-generate +.fi +.RE +.PP +Symlinks pointing to +.I /dev/null +are detected and skipped during regeneration. +.SH PATH RESOLUTION +Snippet files should use bare library names for the +.B Driver +(and +.BR Setup ) +keys: +.PP +.RS +.nf +Driver = libmaodbc.so +.fi +.RE +.PP +During generation, +.B odbcinst\-generate +resolves each bare name to an absolute, architecture\-correct path +by probing the filesystem per\-driver. +For each bare +.B .so +name, it checks both +.I /usr/lib64/odbc/ +and +.IR /usr/lib/odbc/ . +.PP +.SS Multilib resolution +On a multilib system where both the 64\-bit and 32\-bit packages of +a driver are installed (e.g.\& +.I mariadb\-connector\-odbc.x86_64 +and +.IR mariadb\-connector\-odbc.i686 ), +the generator emits two keys: +.PP +.RS +.nf +Driver = /usr/lib/odbc/libmaodbc.so +Driver64 = /usr/lib64/odbc/libmaodbc.so +.fi +.RE +.PP +unixODBC selects the matching key based on the calling application\(aqs +word size: a 64\-bit application reads +.BR Driver64 , +a 32\-bit application (e.g.\& Wine) reads +.BR Driver . +The same logic applies to +.BR Setup / Setup64 . +.PP +When only one architecture is present, only +.B Driver +is emitted with that architecture\(aqs path. +If the bare name is not found in either directory, it is left unchanged +so that unixODBC can still locate it via its compiled\-in driver search +path. +.PP +.SS Edge cases +.IP \(bu 3 +A 32\-bit\-only driver on a 64\-bit host is correctly resolved to +.I /usr/lib/odbc/ +instead of +.IR /usr/lib64/odbc/ . +.IP \(bu 3 +A third\-party driver whose shared library lives outside +.I /usr/lib*/odbc/ +(e.g.\& in +.IR /usr/lib64/ ) +is not rewritten to a non\-existent path. +.IP \(bu 3 +iODBC does not recognize the +.B Driver64 +key, but ignores unknown keys harmlessly. +On iODBC\-only hosts, the +.B Driver +key provides the correct path. +.PP +Absolute paths ensure the generated +.I odbcinst.ini +works with all ODBC driver managers (both unixODBC and iODBC) without +hard\-coding architecture directories. +Using bare names in snippets keeps them noarch\-portable: the same +.I .ini +file works on x86_64, aarch64, ppc64le, etc., because the generator +handles path differences at generation time. +.SH FILE CONFLICTS +Each snippet filename must be unique within its directory. +If two RPM packages ship the same file (e.g.\& both install +.IR 30\-oracle.ini ), +RPM will raise a file conflict and refuse to install both. +.PP +Third\-party packagers should choose unique names that include the +driver\(aqs identity, for example: +.PP +.RS +.nf +30\-seerodbc.ini +31\-oracle\-instantclient.ini +32\-snowflake.ini +.fi +.RE +.SH OUTPUT FILE +.TP +.I /etc/odbcinst.ini +The generated ODBC driver configuration file. +This file is marked as +.B %ghost +in the RPM package and should not be edited directly. +Changes will be overwritten on the next regeneration. +.SH EXIT STATUS +.TP +.B 0 +Success. +.TP +.B >0 +An error occurred (e.g.\& unable to write the output file). +.SH EXAMPLES +.SS Adding an administrator driver +Create a snippet with a bare library name and regenerate: +.PP +.RS +.nf +cat > /etc/odbc/odbcinst.d/60\-mydriver.ini << 'EOF' +[MyDriver] +Driver = libmydriver.so +EOF +odbcinst\-generate +.fi +.RE +.PP +If +.I libmydriver.so +exists only in +.IR /usr/lib64/odbc/ , +the generated +.I /etc/odbcinst.ini +will contain the resolved absolute path: +.PP +.RS +.nf +[MyDriver] +Driver = /usr/lib64/odbc/libmydriver.so +.fi +.RE +.PP +If both 64\-bit and 32\-bit versions are installed, the output +contains both keys: +.PP +.RS +.nf +[MyDriver] +Driver = /usr/lib/odbc/libmydriver.so +Driver64 = /usr/lib64/odbc/libmydriver.so +.fi +.RE +.PP +If the library is not found in +.I /usr/lib*/odbc/ +(e.g.\& it is installed in +.IR /usr/lib64/ ), +the bare name is kept as\-is. +.PP +.SS Vendor snippet (distro\-shipped) +A Fedora driver package installs a snippet in the vendor directory: +.PP +.RS +.nf +# Shipped as /usr/lib/odbc/odbcinst.d/10\-mariadb.ini +[MariaDB] +Driver = libmaodbc.so +.fi +.RE +.PP +.SS Overriding a vendor snippet +An administrator can override the MariaDB driver configuration +without modifying the vendor file: +.PP +.RS +.nf +cat > /etc/odbc/odbcinst.d/50\-mariadb.ini << 'EOF' +[MariaDB] +Driver = libmaodbc.so +Threading = 2 +EOF +odbcinst\-generate +.fi +.RE +.PP +The administrator file wins because the admin directory always takes +precedence over the vendor directory for the same stripped name. +.SH NOTES +.SS Comparison with other Fedora drop\-in systems +Several Fedora packages use a similar dual\-directory drop\-in pattern: +.BR sysctl.d (5), +.BR tmpfiles.d (5), +.BR modprobe.d (5), +and +.BR systemd.unit (5). +Those systems use +.B exact filename matching +for overrides: +.I /etc/sysctl.d/10\-foo.conf +masks +.I /usr/lib/sysctl.d/10\-foo.conf +(same filename), but +.I /etc/sysctl.d/60\-foo.conf +and +.I /usr/lib/sysctl.d/10\-foo.conf +coexist as two separate files, with conflicting keys resolved +individually by lexicographic sort order. +.PP +That model works for key\-value configurations where individual +settings can be overridden independently. +ODBC driver registration is structurally different: each snippet +declares a complete +.BI [ DriverName ] +INI section, and merging individual keys from two +.B [MariaDB] +sections across files would be ambiguous and error\-prone. +The entire section is the atomic unit. +.PP +.B odbcinst\-generate +therefore uses +.B stripped\-name matching +instead: files that share the same name after removing the numeric +prefix compete, and only one survives (see +.BR "OVERRIDE SEMANTICS" ). +The administrator directory always wins for the same stripped name, +regardless of numeric prefix. +This is a deliberate deviation from the +.BR sysctl.d / tmpfiles.d +model, chosen because INI section overrides must be whole\-section +replacements. +.SS Numeric range convention +.BR sysctl.d (5) +documents ranges 10\(en40 for vendor packages and 60\(en90 for +local administration. +This system adds a third\-party band (30\(en49) because out\-of\-tree +ODBC drivers (COPR packages, vendor RPMs, third\-party connectors) +are a common use case that does not fit the distro vendor or +administrator categories. +See +.B FILE NAMING +for the full range table. +.SH AUTHORS +Michal Schorm +.SH COPYRIGHT +Copyright \(co 2026 Michal Schorm. +.br +Licensed under the GNU General Public License, version 2 or later. +.SH SEE ALSO +.BR odbcinst (1), +.BR odbcinst.ini (5), +.BR odbc.ini (5), +.BR unixODBC (7), +.BR sysctl.d (5), +.BR tmpfiles.d (5) diff --git a/odbcinst.ini b/odbcinst.ini index 471f20e..7823806 100644 --- a/odbcinst.ini +++ b/odbcinst.ini @@ -1,57 +1,35 @@ # Example driver definitions +# +# Drivers are resolved via the ODBC driver search path compiled into libodbc +# (--with-odbc-driver-path), so bare library names work for all architectures. +# For drivers installed outside the search path, use absolute paths instead. # Driver from the postgresql-odbc package -# Setup from the unixODBC package [PostgreSQL] Description = ODBC for PostgreSQL -Driver = /usr/lib/psqlodbcw.so -Setup = /usr/lib/libodbcpsqlS.so -Driver64 = /usr/lib64/psqlodbcw.so -Setup64 = /usr/lib64/libodbcpsqlS.so -FileUsage = 1 +Driver = psqlodbcw.so -# Driver from the mysql-connector-odbc package in Fedora >=29 -# Setup from the unixODBC package +# Driver from the mysql-connector-odbc package [MySQL] -Description = ODBC for MySQL 8 -# mysql-connector-odbc package provides shared libraries with "w" or "a" suffix. -# 'w' stands for 'wide' or 'unicode' character set, 'a' stands for 'ANSI' -# Symlinks used in the configuration below lead to the 'w' variant by default -Driver = /usr/lib/libmyodbc8.so -Driver64 = /usr/lib64/libmyodbc8.so -FileUsage = 1 - - -# Driver from the mysql-connector-odbc package in Fedora <=28 -# Setup from the unixODBC package -[MySQL-5] -Description = ODBC for MySQL 5 -# mysql-connector-odbc package provides shared libraries with "w" or "a" suffix. -# 'w' stands for 'wide' or 'unicode' character set, 'a' stands for 'ANSI' -# Symlinks used in the configuration below lead to the 'w' variant by default -Driver = /usr/lib/libmyodbc5.so -Driver64 = /usr/lib64/libmyodbc5.so -Setup = /usr/lib/libodbcmyS.so -Setup64 = /usr/lib64/libodbcmyS.so -FileUsage = 1 +Description = ODBC for MySQL +Driver = libmyodbc9.so # Driver from the freetds-libs package -# Setup from the unixODBC package [FreeTDS] Description = Free Sybase & MS SQL Driver -Driver = /usr/lib/libtdsodbc.so -Setup = /usr/lib/libtdsS.so -Driver64 = /usr/lib64/libtdsodbc.so -Setup64 = /usr/lib64/libtdsS.so -Port = 1433 +Driver = libtdsodbc.so # Driver from the mariadb-connector-odbc package -# Setup from the unixODBC package [MariaDB] Description = ODBC for MariaDB -Driver = /usr/lib/libmaodbc.so -Driver64 = /usr/lib64/libmaodbc.so -FileUsage = 1 +Driver = libmaodbc.so + + +# Driver from the mdbtools-odbc package +[MDBTools] +Description = MDB Tools ODBC (Microsoft Access) +Driver = libmdbodbcW.so +FileUsage = 2 diff --git a/so-version-bump.patch b/so-version-bump.patch index faa6072..4bf8937 100644 --- a/so-version-bump.patch +++ b/so-version-bump.patch @@ -1,9 +1,154 @@ Set the major .so version to 2 for all unixODBC shared libraries, to reflect the incompatible ABI changes in 2.2.14. -diff -up unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am.soname unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am ---- unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am.soname 2015-08-22 18:39:16.000000000 +0200 -+++ unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am 2015-08-25 12:27:47.005775376 +0200 +Note that we only patch 'Makefile.am' files and not 'Makefile.in' files, +as we use 'autoconf' instead of the 'configure' setup tool + +--- unixODBC-2.3.11/DRVConfig/MiniSQL/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/MiniSQL/Makefile.am.patched 2022-05-19 10:56:27.087060411 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcminiS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcminiS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libodbcminiS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libodbcminiS_la_SOURCES = odbcminiS.c + +--- unixODBC-2.3.11/DRVConfig/PostgreSQL/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/PostgreSQL/Makefile.am.patched 2022-05-19 10:56:27.090060438 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcpsqlS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcpsqlS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libodbcpsqlS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libodbcpsqlS_la_SOURCES = odbcpsqlS.c + +--- unixODBC-2.3.11/DRVConfig/esoob/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/esoob/Makefile.am.patched 2022-05-19 10:56:27.093060465 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libesoobS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libesoobS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libesoobS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libesoobS_la_SOURCES = esoobS.c + +--- unixODBC-2.3.11/DRVConfig/sapdb/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/sapdb/Makefile.am.patched 2022-05-19 10:56:27.096060492 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libsapdbS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libsapdbS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libsapdbS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libsapdbS_la_SOURCES = sapdb.c + +--- unixODBC-2.3.11/DRVConfig/Oracle/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/Oracle/Makefile.am.patched 2022-05-19 10:56:27.098060510 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liboraodbcS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-liboraodbcS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++liboraodbcS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + liboraodbcS_la_SOURCES = oraodbcS.c + +--- unixODBC-2.3.11/DRVConfig/Mimer/Makefile.am 2021-03-02 14:50:37.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/Mimer/Makefile.am.patched 2022-05-19 10:56:27.100060528 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmimerS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libmimerS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libmimerS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libmimerS_la_SOURCES = mimerS.c + +--- unixODBC-2.3.11/DRVConfig/MySQL/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/MySQL/Makefile.am.patched 2022-05-19 10:56:27.102060546 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcmyS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcmyS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libodbcmyS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libodbcmyS_la_SOURCES = odbcmyS.c + +--- unixODBC-2.3.11/DRVConfig/txt/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/txt/Makefile.am.patched 2022-05-19 10:56:27.103060555 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbctxtS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbctxtS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libodbctxtS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libodbctxtS_la_SOURCES = drvcfg.c + +--- unixODBC-2.3.11/DRVConfig/drvcfg1/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/drvcfg1/Makefile.am.patched 2022-05-19 10:56:27.105060573 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcdrvcfg1S.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcdrvcfg1S_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libodbcdrvcfg1S_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libodbcdrvcfg1S_la_SOURCES = drvcfg1.c + +--- unixODBC-2.3.11/DRVConfig/oplodbc/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/oplodbc/Makefile.am.patched 2022-05-19 10:56:27.107060592 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liboplodbcS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-liboplodbcS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++liboplodbcS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + liboplodbcS_la_SOURCES = oplodbc.c + +--- unixODBC-2.3.11/DRVConfig/tds/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/tds/Makefile.am.patched 2022-05-19 10:56:27.108060601 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libtdsS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libtdsS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libtdsS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libtdsS_la_SOURCES = tdsS.c + +--- unixODBC-2.3.11/DRVConfig/drvcfg2/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/drvcfg2/Makefile.am.patched 2022-05-19 10:56:27.110060619 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcdrvcfg2S.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcdrvcfg2S_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libodbcdrvcfg2S_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libodbcdrvcfg2S_la_SOURCES = drvcfg2.c + +--- unixODBC-2.3.11/DRVConfig/nn/Makefile.am 2021-03-02 14:44:29.000000000 +0100 ++++ unixODBC-2.3.11/DRVConfig/nn/Makefile.am.patched 2022-05-19 10:56:27.112060637 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcnnS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcnnS_la_LDFLAGS = -module -no-undefined -version-info 1:0:0 -avoid-version -shared ++libodbcnnS_la_LDFLAGS = -module -no-undefined -version-info $(LIB_VERSION) -avoid-version -shared + + libodbcnnS_la_SOURCES = drvcfg.c + +--- unixODBC-2.3.11/Drivers/MiniSQL/Makefile.am 2018-01-02 11:48:19.000000000 +0100 ++++ unixODBC-2.3.11/Drivers/MiniSQL/Makefile.am.patched 2022-05-19 10:56:27.114060655 +0200 @@ -193,6 +193,6 @@ EXTRA_DIST = \ _sqlFreeEnv.c \ _sqlFreeStmt.c @@ -12,33 +157,8 @@ diff -up unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am.soname unixODBC-2.3.3/Driver +libodbcmini_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) \ -L@msql_libraries@ -lmsql -module -diff -up unixODBC-2.3.3/Drivers/nn/Makefile.am.soname unixODBC-2.3.3/Drivers/nn/Makefile.am ---- unixODBC-2.3.3/Drivers/nn/Makefile.am.soname 2014-05-05 10:27:13.000000000 +0200 -+++ unixODBC-2.3.3/Drivers/nn/Makefile.am 2015-08-25 12:27:47.007775386 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libnn.la - - AM_CPPFLAGS = -I@top_srcdir@/include -I. - --libnn_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libnn_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - EXTRA_DIST = \ - nnconfig.h \ -diff -up unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am.soname unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am ---- unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am.soname 2014-05-05 10:27:13.000000000 +0200 -+++ unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am 2015-08-25 12:27:47.009775396 +0200 -@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libodbcpsql.la - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - - libodbcpsql_la_LDFLAGS = \ -- -version-info 2:0:0 \ -+ -version-info $(LIB_VERSION) \ - -no-undefined \ - $(LIBSOCKET) $(LIBNSL) \ - -export-dynamic \ -diff -up unixODBC-2.3.3/Drivers/template/Makefile.am.soname unixODBC-2.3.3/Drivers/template/Makefile.am ---- unixODBC-2.3.3/Drivers/template/Makefile.am.soname 2014-05-05 10:27:13.000000000 +0200 -+++ unixODBC-2.3.3/Drivers/template/Makefile.am 2015-08-25 12:27:47.012775410 +0200 +--- unixODBC-2.3.11/Drivers/template/Makefile.am 2022-05-02 16:52:53.000000000 +0200 ++++ unixODBC-2.3.11/Drivers/template/Makefile.am.patched 2022-05-19 10:56:27.116060673 +0200 @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libtemplate.la AM_CPPFLAGS = -I@top_srcdir@/include -I. $(LTDLINCL) @@ -48,159 +168,14 @@ diff -up unixODBC-2.3.3/Drivers/template/Makefile.am.soname unixODBC-2.3.3/Drive EXTRA_DIST = \ driver.h \ -diff -up unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am.soname unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am ---- unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am 2015-08-25 12:27:47.014775420 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcdrvcfg1S.la +--- unixODBC-2.3.11/Drivers/nn/Makefile.am 2018-01-02 11:48:19.000000000 +0100 ++++ unixODBC-2.3.11/Drivers/nn/Makefile.am.patched 2022-05-19 10:56:27.118060691 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libnn.la - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + AM_CPPFLAGS = -I@top_srcdir@/include -I. --libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module +-libnn_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libnn_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - libodbcdrvcfg1S_la_SOURCES = drvcfg1.c - -diff -up unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am.soname unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am ---- unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am 2015-08-25 12:27:47.016775430 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcdrvcfg2S.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libodbcdrvcfg2S_la_SOURCES = drvcfg2.c - -diff -up unixODBC-2.3.3/DRVConfig/esoob/Makefile.am.soname unixODBC-2.3.3/DRVConfig/esoob/Makefile.am ---- unixODBC-2.3.3/DRVConfig/esoob/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/esoob/Makefile.am 2015-08-25 12:27:47.017775434 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libesoobS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libesoobS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libesoobS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libesoobS_la_SOURCES = esoobS.c - -diff -up unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am.soname unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am ---- unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am 2015-08-25 12:27:47.019775444 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmimerS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libmimerS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libmimerS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libmimerS_la_SOURCES = mimerS.c - -diff -up unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am.soname unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am ---- unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am 2015-08-25 12:27:47.020775449 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcminiS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libodbcminiS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libodbcminiS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libodbcminiS_la_SOURCES = odbcminiS.c - -diff -up unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am.soname unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am ---- unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am 2015-08-25 12:27:47.023775464 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcmyS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libodbcmyS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libodbcmyS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libodbcmyS_la_SOURCES = odbcmyS.c - -diff -up unixODBC-2.3.3/DRVConfig/nn/Makefile.am.soname unixODBC-2.3.3/DRVConfig/nn/Makefile.am ---- unixODBC-2.3.3/DRVConfig/nn/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/nn/Makefile.am 2015-08-25 12:27:47.024775469 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcnnS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libodbcnnS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libodbcnnS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libodbcnnS_la_SOURCES = drvcfg.c - -diff -up unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am.soname unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am ---- unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am 2015-08-25 12:27:47.026775478 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liboplodbcS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --liboplodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+liboplodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - liboplodbcS_la_SOURCES = oplodbc.c - -diff -up unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am.soname unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am ---- unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am 2015-08-25 12:27:47.027775483 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liboraodbcS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --liboraodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+liboraodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - liboraodbcS_la_SOURCES = oraodbcS.c - -diff -up unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am.soname unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am ---- unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am 2015-08-25 12:27:47.029775493 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcpsqlS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libodbcpsqlS_la_SOURCES = odbcpsqlS.c - -diff -up unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am.soname unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am ---- unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am 2015-08-25 12:27:47.031775503 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libsapdbS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libsapdbS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libsapdbS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libsapdbS_la_SOURCES = sapdb.c - -diff -up unixODBC-2.3.3/DRVConfig/tds/Makefile.am.soname unixODBC-2.3.3/DRVConfig/tds/Makefile.am ---- unixODBC-2.3.3/DRVConfig/tds/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/tds/Makefile.am 2015-08-25 12:27:47.032775507 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libtdsS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libtdsS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libtdsS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libtdsS_la_SOURCES = tdsS.c - -diff -up unixODBC-2.3.3/DRVConfig/txt/Makefile.am.soname unixODBC-2.3.3/DRVConfig/txt/Makefile.am ---- unixODBC-2.3.3/DRVConfig/txt/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 -+++ unixODBC-2.3.3/DRVConfig/txt/Makefile.am 2015-08-25 12:27:47.034775517 +0200 -@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbctxtS.la - - AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) - --libodbctxtS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module -+libodbctxtS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module - - libodbctxtS_la_SOURCES = drvcfg.c - + EXTRA_DIST = \ + nnconfig.h \ diff --git a/sources b/sources index 4ca57a5..39a9cb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unixODBC-2.3.7.tar.gz) = a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70 +SHA512 (unixODBC-2.3.14.tar.gz) = 922caa7ed2ad97a194a2b66c9fb69bdebe62d1b74a729d726c79835b9fc13be60c7650c86031062a25b07021ff2c7a936ef9c366d4a148d290932bab453c864c diff --git a/unixODBC.spec b/unixODBC.spec index 396b2e7..6b49c42 100644 --- a/unixODBC.spec +++ b/unixODBC.spec @@ -1,29 +1,54 @@ +%bcond gui_related_parts 1 + +Name: unixODBC +Version: 2.3.14 +Release: %{autorelease} + +# See README: Programs are GPL, libraries are LGPL +# News Server library (Drivers/nn/yyparse.c) is GPLv3+ +# (but that one is not compiled nor shipped) +License: GPL-2.0-or-later AND LGPL-2.1-or-later + Summary: A complete ODBC driver manager for Linux -Name: unixODBC -Version: 2.3.7 -Release: 6%{?dist} -URL: http://www.unixODBC.org/ -# Programs are GPL, libraries are LGPL, except News Server library is GPL. -License: GPLv2+ and LGPLv2+ +URL: http://www.unixODBC.org/ -Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz -Source1: odbcinst.ini -Source5: README.dist +Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz +Source2: odbcinst-generate +Source3: odbcinst-generate.1 -Patch8: so-version-bump.patch -Patch9: keep-typedefs.patch +Patch8: so-version-bump.patch -Conflicts: iodbc - -BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex +BuildRequires: make automake autoconf libtool libtool-ltdl-devel bison flex BuildRequires: readline-devel -BuildRequires: multilib-rpm-config +%{!?rhel:BuildRequires: multilib-rpm-config} + +# ODBC driver packages +Suggests: freetds +Suggests: mariadb-connector-odbc +Suggests: mdbtools-odbc +Suggests: mysql-connector-odbc +Suggests: postgresql-odbc +Suggests: sqliteodbc + +# GUI management tool +Suggests: unixODBC-gui-qt + +Requires: odbcinst-generate = %{version}-%{release} %description Install unixODBC if you want to access databases through ODBC. You will also need the mariadb-connector-odbc package if you want to access a MySQL or MariaDB database, and/or the postgresql-odbc package for PostgreSQL. +%package -n odbcinst-generate +Summary: Drop-in snippet generator for ODBC driver registration +BuildArch: noarch +Requires(post): coreutils + +%description -n odbcinst-generate +Assembles /etc/odbcinst.ini from per-driver drop-in snippets shipped by +ODBC driver packages. Used by both unixODBC and iODBC driver managers. + %package devel Summary: Development files for programs which will use the unixODBC library Requires: %{name}%{?_isa} = %{version}-%{release} @@ -33,46 +58,52 @@ The unixODBC package can be used to access databases through ODBC drivers. If you want to develop programs that will access data through ODBC, you need to install this package. + %prep %setup -q -%patch8 -p1 -b .soname-bump -%patch9 -p1 - -chmod 0644 Drivers/MiniSQL/*.c -chmod 0644 Drivers/nn/*.c -chmod 0644 Drivers/template/*.c -chmod 0644 doc/ProgrammerManual/Tutorial/*.html -chmod 0644 doc/lst/* -chmod 0644 include/odbcinst.h +%patch -P8 -p1 -b .soname-bump autoreconf -vfi - %build -# unixODBC 2.2.14 is not aliasing-safe -CFLAGS="%{optflags} -fno-strict-aliasing" -CXXFLAGS="$CFLAGS" -export CFLAGS CXXFLAGS - -%configure --with-gnu-ld=yes --enable-threads=yes \ - --enable-drivers=yes --enable-driverc=yes +%configure \ + --with-gnu-ld=yes \ + --enable-threads=yes \ + --enable-fastvalidate \ + --enable-drivers=no \ + --with-odbc-driver-path=%{_libdir}/odbc \ +%if %{with gui_related_parts} + --enable-driver-config=yes +%else + --enable-driver-config=no +%endif # Get rid of the rpaths sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make all +%make_build + %install -make DESTDIR=$RPM_BUILD_ROOT install -install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} -%multilib_fix_c_header --file %{_includedir}/unixodbc_conf.h +%make_install -# add some explanatory documentation -cp %{SOURCE5} README.dist +# Drop-in directory infrastructure for ODBC driver registration +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/odbc/odbcinst.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/odbc/odbcinst.d +install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/odbcinst-generate +install -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/odbcinst-generate.1 -# remove obsolete Postgres drivers from the package (but not the setup code) -rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so* +# Create %ghost file so RPM tracks ownership of the generated config +touch $RPM_BUILD_ROOT%{_sysconfdir}/odbcinst.ini + +%if %{undefined rhel} +%multilib_fix_c_header --file %{_includedir}/unixODBC/unixodbc_conf.h +%multilib_fix_c_header --file %{_includedir}/unixodbc.h +%endif + +# Directory for ODBC connector/driver plugins +mkdir -p $RPM_BUILD_ROOT%{_libdir}/odbc # copy text driver documentation into main doc directory # currently disabled because upstream no longer includes text driver @@ -94,18 +125,16 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/libtool find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > base-so-list find $RPM_BUILD_ROOT%{_libdir} -name "*.so" | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list -# move these to main package, they're often dlopened... -for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so libtdsS.so -do - echo "%{_libdir}/$lib" >> base-so-list - grep -v "/$lib$" devel-so-list > devel-so-list.x - mv -f devel-so-list.x devel-so-list -done %files -f base-so-list -%doc README COPYING AUTHORS ChangeLog NEWS doc -%doc README.dist -%config(noreplace) %{_sysconfdir}/odbc* +%license COPYING +%doc README AUTHORS ChangeLog +%if %{with gui_related_parts} +%doc doc +%endif + +%config(noreplace) %{_sysconfdir}/odbc.ini + %{_bindir}/odbcinst %{_bindir}/isql %{_bindir}/dltest @@ -113,503 +142,107 @@ done %{_bindir}/odbc_config %{_bindir}/slencheck %{_mandir}/man*/* +%exclude %{_mandir}/man1/odbcinst-generate.1* +# ODBC connector/driver plugins are placed here +%dir %{_libdir}/odbc + +# Save user-modified odbcinst.ini before the %ghost transition removes it. +# RPM does not create .rpmsave when a file changes from %config to %ghost. +# Only run on first upgrade: skip if the drop-in directory already exists. +# +# To avoid nagging users who never customized the file, we parse it for +# INI section headers: if every [Section] matches a driver shipped by Fedora, +# the file is stock and needs no backup. Any unknown section means the user +# added a custom driver, so we preserve the file as .rpmsave. +%pretrans -p +local dropin = "/usr/lib/odbc/odbcinst.d" +if posix.stat(dropin) then + return +end +local path = "/etc/odbcinst.ini" +if not posix.stat(path) then + return +end +-- Drivers historically shipped by Fedora / RHEL in odbcinst.ini +local known = { + PostgreSQL = true, + MySQL = true, + ["MySQL-5"] = true, + FreeTDS = true, + MariaDB = true, + MDBTools = true, + SQLITE = true, + SQLITE3 = true, +} +local custom = false +local f = io.open(path, "r") +if f then + for line in f:lines() do + -- Strip leading whitespace without Lua patterns (the "%%" + -- escape needed for Lua character classes conflicts with RPM + -- macro syntax in spec files, so we avoid patterns entirely). + local s = line + while s:sub(1,1) == " " or s:sub(1,1) == "\t" do + s = s:sub(2) + end + if s:sub(1,1) == "[" then + local close = s:find("]", 2, true) + if close and close > 2 then + local sect = s:sub(2, close - 1) + if not known[sect] then + custom = true + break + end + end + end + end + f:close() +end +-- Only save the file when it contains user-added driver sections +if custom then + local save = path .. ".rpmsave" + if not posix.stat(save) then + os.rename(path, save) + end +end + +%post +if [ -f %{_sysconfdir}/odbcinst.ini.rpmsave ]; then + echo "NOTE: Your previous %{_sysconfdir}/odbcinst.ini was saved as" >&2 + echo "%{_sysconfdir}/odbcinst.ini.rpmsave" >&2 + echo "Driver registration is now handled by drop-in snippets." >&2 + echo "To preserve custom drivers, copy their [sections] into files" >&2 + echo "under %{_sysconfdir}/odbc/odbcinst.d/ and run:" >&2 + echo " odbcinst-generate" >&2 +fi + + +%files -n odbcinst-generate +%license exe/COPYING +%{_bindir}/odbcinst-generate +%{_mandir}/man1/odbcinst-generate.1* +%ghost %{_sysconfdir}/odbcinst.ini +%dir %{_prefix}/lib/odbc +%dir %{_prefix}/lib/odbc/odbcinst.d +%dir %{_sysconfdir}/odbc +%dir %{_sysconfdir}/odbc/odbcinst.d + +%post -n odbcinst-generate +odbcinst-generate || : + +# Regenerate odbcinst.ini when driver packages install drop-in snippets +%transfiletriggerin -n odbcinst-generate -- %{_prefix}/lib/odbc/odbcinst.d %{_sysconfdir}/odbc/odbcinst.d +odbcinst-generate || : + +# Regenerate after driver packages are removed +%transfiletriggerpostun -n odbcinst-generate -- %{_prefix}/lib/odbc/odbcinst.d %{_sysconfdir}/odbc/odbcinst.d +odbcinst-generate || : + %files devel -f devel-so-list %{_includedir}/* -%_libdir/pkgconfig/*.pc +%{_libdir}/pkgconfig/*.pc -%ldconfig_scriptlets %changelog -* Fri Jan 31 2020 Fedora Release Engineering - 2.3.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.3.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 17 2019 Igor Gnatenko - 2.3.7-4 -- Rebuild for readline 8.0 - -* Sun Feb 03 2019 Fedora Release Engineering - 2.3.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Nov 30 2018 Michal Schorm - 2.3.7-2 -- Bump for rebuild to ship updated configuration - -* Sat Aug 11 2018 Pavel Raiskup - 2.3.7-1 -- update to version 2.3.7 - -* Sat Jul 14 2018 Fedora Release Engineering - 2.3.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Apr 27 2018 Pavel Raiskup - 2.3.6-1 -- update to version 2.3.6 - -* Wed Mar 07 2018 Honza Horak - 2.3.5-3 -- Bump for a rebuild - -* Tue Feb 20 2018 Pavel Raiskup - 2.3.5-2 -- cleanup autotool hacks - -* Mon Feb 19 2018 Jan Staněk - 2.3.5-1 -- Update to version 2.3.5 - -* Fri Feb 09 2018 Fedora Release Engineering - 2.3.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 03 2018 Honza Horak - 2.3.4-9 -- Include mariadb-connector-odbc driver spec in the odbcinst.ini - -* Wed Aug 30 2017 Tomas Repik - 2.3.4-8 -- move libtdsS.so to the main package and add tds config to odbcinst.ini -- rhbz#1448890 - -* Thu Aug 03 2017 Fedora Release Engineering - 2.3.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.3.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jan 12 2017 Igor Gnatenko - 2.3.4-4 -- Rebuild for readline 7.x - -* Wed Jun 22 2016 Pavel Raiskup - 2.3.4-3 -- delegate multilib hacks to multilib-rpm-config package - -* Fri Feb 05 2016 Fedora Release Engineering - 2.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Sep 01 2015 Jan Stanek - 2.3.4-1 -- Update to version 2.3.4 - -* Tue Aug 25 2015 Jan Stanek - 2.3.3-1 -- Update to version 2.3.3 -- Removed patches and sources included upstream -- Recreated so-version-bump.patch - -* Wed Aug 12 2015 Jan Stanek - 2.3.2-8 -- Backported changes necessary for building with new autotools version. - -* Fri Jun 19 2015 Fedora Release Engineering - 2.3.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 2.3.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.3.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Feb 18 2014 Jan Stanek - 2.3.2-4 -- Added manual pages for iusql, dltest, odbc_config - -* Fri Dec 06 2013 Jan Stanek - 2.3.2-3 -- Renamed README.fedora to README.dist - -* Thu Oct 24 2013 Jan Stanek - 2.3.2-2 -- Add man page describing enviromental variables (#991018) - -* Thu Oct 10 2013 Jan Stanek - 2.3.2-1 -- Update to 2.3.2 version -- Removed extra man-pages and patch already shipped by upstream - -* Sun Aug 04 2013 Fedora Release Engineering - 2.3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jul 4 2013 Honza Horak 2.3.1-6 -- Spec file clean-up -- Provide man pages created by Jan Stanek - -* Thu Jul 4 2013 Honza Horak 2.3.1-5 -- Fix Coverity patch - Resolves: #981060 - -* Tue Mar 19 2013 Tom Lane 2.3.1-4 -- Fix assorted small bugs found by Coverity -Related: #760877 - -* Fri Feb 15 2013 Fedora Release Engineering - 2.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 2.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jan 10 2012 Tom Lane 2.3.1-1 -- Update to version 2.3.1. The main externally-visible change is that the - GUI programs are not part of the unixODBC tarball anymore, so they are no - longer in this package, and the unixODBC-kde sub-RPM has disappeared. - There is a separate package unixODBC-gui-qt that now provides those programs. - -* Mon Feb 07 2011 Fedora Release Engineering - 2.2.14-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Aug 31 2010 Tom Lane 2.2.14-12 -- Fix isql crash at EOF with -b option -Resolves: #628909 - -* Mon May 3 2010 Tom Lane 2.2.14-11 -- Re-add accidentally-removed desktop icon for ODBCConfig -Related: #587933 - -* Sat Mar 13 2010 Kevin Kofler 2.2.14-10 -- BR qt-assistant-adp-devel - -* Sat Dec 19 2009 Tom Lane 2.2.14-9 -- Fix bug preventing drivers from being selected in ODBCConfig -Resolves: #544852 - -* Wed Nov 25 2009 Kevin Kofler 2.2.14-8 -- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI) - -* Thu Oct 15 2009 Tom Lane 2.2.14-7 -- Clean up bogosity in multilib stub header support: ia64 should not be - listed (it's not multilib), sparcv9 isn't a possible uname -i output - -* Fri Aug 21 2009 Tom Lane 2.2.14-6 -- Switch to building against qt4, not qt3. This means the DataManager, - DataManagerII, and odbctest applications are gone. -Resolves: #514064 -- Use Driver64/Setup64 to eliminate need for hand-adjustment of odbcinst.ini -Resolves: #514688 -- Fix misdeclaration of SQLBIGINT and SQLUBIGINT in generated header files -Resolves: #518623 - -* Sun Jul 26 2009 Fedora Release Engineering - 2.2.14-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jun 9 2009 Peter Lemenkov - 2.2.14-4 -- Properly install *.desktop files -- No need to ship INSTALL in docs -- Use macros instead of hardcoded /usr/share and /usr/include -- fixed permissions on some doc- and src-files -- Almost all rpmlint messages are gone now - -* Sat Jun 06 2009 Dennis Gilmore - 2.2.14-3 -- add sparc support to the multilib includes header - -* Wed Feb 25 2009 Fedora Release Engineering - 2.2.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 20 2009 Tom Lane 2.2.14-1 -- Update to unixODBC 2.2.14. Note this involves an ABI break and a consequent - soname version bump, because upstream fixed some mistakes in the widths of - some API datatypes for 64-bit platforms. Also, the formerly embedded - mysql, postgresql, and text drivers have been removed. (For mysql and - postgresql, use the separate mysql-connector-odbc and postgresql-odbc - packages, which are far more up to date. The text driver is not currently - shipped by upstream at all, but might get revived as a separate SRPM later.) -- Stop shipping .a library files, per distro policy. -- Fixes for libtool 2.2. - -* Mon Jul 28 2008 Tom Lane 2.2.12-9 -- Fix build failure caused by new default patch fuzz = 0 policy in rawhide. - -* Fri Jun 13 2008 Tom Lane 2.2.12-8 -- Install icons in /usr/share/pixmaps, not /usr/share/icons as this package - has historically done; the former is considered correct. - -* Fri Apr 4 2008 Tom Lane 2.2.12-7 -- Must BuildRequire qt3 now that Fedora has renamed qt4 to qt -Resolves: #440798 - -* Mon Feb 11 2008 Tom Lane 2.2.12-6 -- Move libodbcinst.so symlink into main package, since it's often dlopen'd -Related: #204882 -- Clean up specfile's ugly coding for making base-vs-devel decisions - -* Sun Dec 30 2007 Tom Lane 2.2.12-5 -- Add missing BuildRequires for flex. -Resolves: #427063 - -* Thu Aug 2 2007 Tom Lane 2.2.12-4 -- Update License tag to match code. - -* Fri Apr 20 2007 Tom Lane 2.2.12-3 -- Make configure find correct Qt libraries when building on a multilib machine - -* Mon Apr 16 2007 Tom Lane 2.2.12-2 -- Drop BuildRequires for kdelibs-devel -Resolves: #152717 -- Clean up a few rpmlint complaints - -* Wed Dec 6 2006 Tom Lane 2.2.12-1 -- Update to unixODBC 2.2.12. -- Add missing BuildPrereq for bison. -Resolves: #190427 - -* Wed Jul 12 2006 Jesse Keating - 2.2.11-7.1 -- rebuild - -* Mon Mar 27 2006 Tom Lane 2.2.11-7 -- Fix minor problems in desktop files (bug #185764) - -* Fri Feb 10 2006 Jesse Keating - 2.2.11-6.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 2.2.11-6.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Mon Nov 21 2005 Tom Lane 2.2.11-6 -- Patch NO-vs-no discrepancy between aclocal/acinclude and recent autoconf - versions (not sure if this has been broken for a long time, or was just - exposed by modular X changeover). -- Apparently need to require libXt-devel too for modular X. - -* Mon Nov 7 2005 Tom Lane 2.2.11-5 -- Adjust BuildPrereq for modular X. - -* Sun Oct 16 2005 Florian La Roche 2.2.11-4 -- link against dependent libs -- fix some bugs to resolve unknown symbols ;-( - -* Thu Sep 29 2005 Tom Lane 2.2.11-3 -- Force update of yac.h because the copy in the distributed tarball does not - match bison 2.0's numbering of symbols (bz #162676) -- Include documentation of text-file driver -- Use private libltdl so we can omit RTLD_GLOBAL from dlopen flags (bz #161399) - -* Sat Sep 24 2005 Tom Lane 2.2.11-2 -- Remove Makefiles accidentally included in docs installation (bz #168819) -- Updates to keep newer libtool code from installing itself as part of package - -* Fri Apr 8 2005 Tom Lane 2.2.11-1 -- Update to unixODBC 2.2.11 - -* Mon Mar 7 2005 Tom Lane 2.2.10-3 -- Rebuild with gcc4. - -* Wed Jan 12 2005 Tim Waugh 2.2.10-2 -- Rebuilt for new readline. - -* Thu Oct 28 2004 Tom Lane 2.2.10-1 -- Update to unixODBC 2.2.10 - -* Wed Sep 22 2004 Tom Lane 2.2.9-1 -- Update to unixODBC 2.2.9 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Sat May 8 2004 Tom Lane 2.2.8-5 -- Backpatch fix for double-free error from upstream devel sources. -- rebuilt - -* Wed May 5 2004 Tom Lane 2.2.8-4 -- Add dependency to ensure kde subpackage stays in sync with main - (needed because we moved odbctest from one pkg to the other, - cf bug #122478) -- rebuilt - -* Wed Mar 10 2004 Tom Lane 2.2.8-3 -- Use installed libltdl -- rebuilt for Fedora Core 2 - -* Tue Mar 9 2004 Tom Lane 2.2.8-2 -- Rename lo_xxx() to odbc_lo_xxx() (bug #117211) (temporary until 2.2.9) -- rebuilt - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Mon Mar 1 2004 Tom Lane -- Update to 2.2.8 -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Thu Dec 4 2003 Joe Orton 2.2.5-10 -- rebuild to restore sqltypes.h after #111195 - -* Thu Oct 16 2003 Fernando Nasser 2.2.5-9 -- Add XFree86-devel to the list of BuildPrereq. Did not bump - release as there is no need to rebuild. - -* Thu Oct 16 2003 Fernando Nasser 2.2.5-9 -- Add comments to the /etc/odbcinst.ini file regarding the proper - setup for MySQL and the origin of each library needed. - -* Tue Oct 14 2003 Fernando Nasser 2.2.5-8 -- Move libodbcmyS.so to the main package as well. It is used the - same way as libodbcpsqlS.so. - -* Tue Oct 14 2003 Fernando Nasser 2.2.5-7 -- Bumped the version so it rebuilds. - -* Tue Oct 14 2003 Fernando Nasser 2.2.5-4 -- Revert previous change and special case libodbcpsql.so and - libodbcpsqlS.so instead. Here is the explanation (from Elliot - Lee): - ".so files are only used at link time for normal dynamic libraries. - The libraries referred to here are being used as dynamically loaded - modules, so I guess moving those particular .so files back to the - main package would make sense, but the other .so files should stay - in the devel subpackage." - -* Fri Oct 10 2003 Fernando Nasser 2.2.5-3 -- Moved all the shared library symlinks to the main package. - They were deliberatedly being added to the devel package for - unknown reasons but this was forcing users to install the - devel package always. -- No need to special-case libodbc.so anymore - -* Fri Sep 05 2003 Elliot Lee 2.2.5-2 -- Run auto* so it rebuilds. - -* Mon Jul 07 2003 Fernando Nasser 2.2.5-1 -- Moved odbctest to the kde package to remove require on Qt stuff - from the main package. -- Removed stray "\" from doc/Makefile.am -- Applied libtool fix (provided by Alex Oliva) so that it build - with cross-compilers (which are used by 64 bit systems) -- Updated sources to the 2.2.5 community release -- Changed the included libtool to the 1.5-3 one so that - it properly link the libraries with the newly generated ones - and not with the ones installed on the build system (or give - an error if an old version is not installed (# 91110) -- Added new files for executable DataManagerII and icons LinuxODBC.xpm - and odbc.xpm - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Thu Jan 9 2003 Bill Nottingham 2.2.3-5 -- debloat - -* Tue Dec 17 2002 Elliot Lee 2.2.3-4 -- Run libtoolize etc. - -* Thu Dec 12 2002 Elliot Lee 2.2.3-3 -- Rebuild to fix filelist errors...? - -* Fri Nov 29 2002 Tim Powers 2.2.3-2 -- remove unpackaged files from the buildroot - -* Tue Nov 19 2002 Elliot Lee 2.2.3-1 -- Rebuild, update to 2.2.3 - -* Mon Aug 26 2002 Trond Eivind Glomsrd 2.2.2-3 -- Move libodbc.so to the main package, so programs dlopening - it don't break (#72653) - -* Sat Aug 10 2002 Elliot Lee -- rebuilt with gcc-3.2 (we hope) - -* Mon Jul 22 2002 Trond Eivind Glomsrd 2.2.2-1 -- 2.2.2 -- desktop file changes (# 69371) - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Sun May 26 2002 Tim Powers -- automated rebuild - -* Mon May 20 2002 Trond Eivind Glomsrd 2.2.1-1 -- 2.2.1 -- Reenable other archs, as this should now build on 64 bit archs - -* Sun May 19 2002 Florian La Roche -- add at least mainframe; should this really be a i386-only rpm? - -* Wed Apr 17 2002 Bernhard Rosenkraenzer 2.2.0-5 -- rebuild - -* Fri Apr 5 2002 Trond Eivind Glomsrd 2.2.0-4 -- Avoid having files in more than one package (#62755) - -* Tue Mar 26 2002 Trond Eivind Glomsrd 2.2.0-3 -- Don't include kde plugin .so as a devel symlink (#61039) - -* Fri Mar 8 2002 Bernhard Rosenkraenzer 2.2.0-2 -- Rebuild with KDE 3.x - -* Tue Feb 26 2002 Trond Eivind Glomsrd 2.2.0-1 -- Just build on i386 now, there are 64 bit oddities -- 2.2.0 - -* Fri Jan 11 2002 Trond Eivind Glomsrd 2.1.1-2 -- move libodbcinstQ* to the kde subpackage - -* Fri Jan 11 2002 Trond Eivind Glomsrd 2.1.1-1 -- 2.1.1 -- minor cleanups - -* Fri Dec 14 2001 Trond Eivind Glomsrd 2.0.7-5 -- Rebuild - -* Wed Sep 12 2001 Tim Powers -- rebuild with new gcc and binutils - -* Sun Jun 24 2001 Than Ngo -- rebuild against qt-2.3.1, kde-2.1.x - -* Fri Jun 15 2001 Trond Eivind Glomsrd -- Better default odbcinst.ini -- Minor cleanups - -* Wed Jun 6 2001 Trond Eivind Glomsrd -- 2.0.7 - -* Wed Apr 25 2001 Trond Eivind Glomsrd -- Fix for isql segfault on EOF/ctrl-d exit - -* Fri Apr 20 2001 Trond Eivind Glomsrd -- 2.0.6 -- add patch for 64 bit archs (dword shouldn't be "long int") - -* Wed Feb 28 2001 Trond Eivind Glomsrd -- rebuild - -* Tue Nov 28 2000 Trond Eivind Glomsrd -- 1.8.13 - -* Tue Oct 10 2000 Trond Eivind Glomsrd -- enable GUI now that we have KDE compiled with the standard - compiler -- move the applnk entries to the KDE package - -* Thu Aug 24 2000 Nalin Dahyabhai -- add the missing shared libs to the non-devel package - -* Wed Aug 23 2000 Preston Brown -- 1.8.12 fixes problems with the postgresql driver - -* Mon Jul 31 2000 Trond Eivind Glomsrd -- disable KDE subpackage to avoid the mess that is C++ binary - compatibility - -* Wed Jul 12 2000 Prospector -- automatic rebuild - -* Fri Jun 30 2000 Florian La Roche -- improved QTDIR detection - -* Wed Jun 28 2000 Trond Eivind Glomsrd -- 1.8.10 -- use %%{_tmppath} -- update URL -- including two missing libraries - -* Tue Jun 13 2000 Preston Brown -- 1.8.9 - -* Fri Jun 09 2000 Preston Brown -- adopted for Winston, changed to Red Hat packaging standards - -* Tue Apr 18 2000 Murray Todd Williams -- added a unixODBC-devel RPM to the group, added KDE links and icons to system -- all of which came from recommendations from Fredrick Meunier -- - -* Mon Apr 17 2000 Murray Todd Williams -- unixODBC-1.8.7 -- moved install to $RPM_BUILD_ROOT so it didn't overrun existing files. +%autochangelog