Compare commits
No commits in common. "c8s" and "c9-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/unixODBC-*.tar.gz
|
||||
SOURCES/unixODBC-2.3.9.tar.gz
|
||||
|
||||
1
.unixODBC.metadata
Normal file
1
.unixODBC.metadata
Normal file
@ -0,0 +1 @@
|
||||
8787833ccfa6b7b6b14a391ae9cbefcff13fb753 SOURCES/unixODBC-2.3.9.tar.gz
|
||||
@ -1,9 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=ODBC Data Source Administrator
|
||||
Comment=ODBC Data Source Administration Tool
|
||||
Exec=ODBCConfig
|
||||
Icon=LinuxODBC.xpm
|
||||
Type=Application
|
||||
Encoding=UTF-8
|
||||
Terminal=false
|
||||
Categories=X-Red-Hat-Extra;
|
||||
@ -1,67 +0,0 @@
|
||||
From b4d43c1fc5fb369fb29a5f97868ea12f093375a4 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Beth <markus.beth@web.de>
|
||||
Date: Thu, 22 Apr 2021 23:14:09 +0200
|
||||
Subject: [PATCH] fix __iptr_as_string() overflows buffer
|
||||
|
||||
---
|
||||
DriverManager/SQLError.c | 2 +-
|
||||
DriverManager/SQLErrorW.c | 2 +-
|
||||
DriverManager/SQLGetDiagRec.c | 2 +-
|
||||
DriverManager/SQLGetDiagRecW.c | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/DriverManager/SQLError.c b/DriverManager/SQLError.c
|
||||
index d4a2a0a..0bbb748 100644
|
||||
--- a/DriverManager/SQLError.c
|
||||
+++ b/DriverManager/SQLError.c
|
||||
@@ -311,7 +311,7 @@ SQLRETURN SQLError( SQLHENV environment_handle,
|
||||
SQLSMALLINT *text_length )
|
||||
{
|
||||
SQLRETURN ret;
|
||||
- SQLCHAR s0[ 32 ], s1[ 100 + LOG_MESSAGE_LEN ];
|
||||
+ SQLCHAR s0[ 48 ], s1[ 100 + LOG_MESSAGE_LEN ];
|
||||
SQLCHAR s2[ 100 + LOG_MESSAGE_LEN ];
|
||||
|
||||
DMHENV environment = NULL;
|
||||
diff --git a/DriverManager/SQLErrorW.c b/DriverManager/SQLErrorW.c
|
||||
index 16df262..64ea90e 100644
|
||||
--- a/DriverManager/SQLErrorW.c
|
||||
+++ b/DriverManager/SQLErrorW.c
|
||||
@@ -279,7 +279,7 @@ SQLRETURN SQLErrorW( SQLHENV environment_handle,
|
||||
SQLSMALLINT *text_length )
|
||||
{
|
||||
SQLRETURN ret;
|
||||
- SQLCHAR s0[ 32 ], s1[ 100 + LOG_MESSAGE_LEN ];
|
||||
+ SQLCHAR s0[ 48 ], s1[ 100 + LOG_MESSAGE_LEN ];
|
||||
SQLCHAR s2[ 100 + LOG_MESSAGE_LEN ];
|
||||
SQLCHAR s3[ 100 + LOG_MESSAGE_LEN ];
|
||||
|
||||
diff --git a/DriverManager/SQLGetDiagRec.c b/DriverManager/SQLGetDiagRec.c
|
||||
index 6d93ede..0f424c8 100644
|
||||
--- a/DriverManager/SQLGetDiagRec.c
|
||||
+++ b/DriverManager/SQLGetDiagRec.c
|
||||
@@ -561,7 +561,7 @@ SQLRETURN SQLGetDiagRec( SQLSMALLINT handle_type,
|
||||
SQLSMALLINT *text_length_ptr )
|
||||
{
|
||||
SQLRETURN ret;
|
||||
- SQLCHAR s0[ 32 ], s1[ 100 + LOG_MESSAGE_LEN ];
|
||||
+ SQLCHAR s0[ 48 ], s1[ 100 + LOG_MESSAGE_LEN ];
|
||||
SQLCHAR s2[ 100 + LOG_MESSAGE_LEN ];
|
||||
|
||||
DMHENV environment = ( DMHENV ) handle;
|
||||
diff --git a/DriverManager/SQLGetDiagRecW.c b/DriverManager/SQLGetDiagRecW.c
|
||||
index 1640047..7eecc03 100644
|
||||
--- a/DriverManager/SQLGetDiagRecW.c
|
||||
+++ b/DriverManager/SQLGetDiagRecW.c
|
||||
@@ -424,7 +424,7 @@ SQLRETURN SQLGetDiagRecW( SQLSMALLINT handle_type,
|
||||
SQLSMALLINT *text_length_ptr )
|
||||
{
|
||||
SQLRETURN ret;
|
||||
- SQLCHAR s0[ 32 ], s1[ 100 + LOG_MESSAGE_LEN ];
|
||||
+ SQLCHAR s0[ 48 ], s1[ 100 + LOG_MESSAGE_LEN ];
|
||||
SQLCHAR s2[ 100 + LOG_MESSAGE_LEN ];
|
||||
SQLCHAR s3[ 100 + LOG_MESSAGE_LEN ];
|
||||
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@ -9,14 +9,12 @@ postgresql-odbc PostgreSQL driver, needed to connect to PostgreSQL
|
||||
unixODBC-gui-qt Optional configuration management and test programs
|
||||
|
||||
|
||||
The recommended driver definition for MySQL is:
|
||||
The recommended driver definition for MySQL 8 is:
|
||||
|
||||
[MySQL]
|
||||
Description = ODBC for MySQL
|
||||
Driver = /usr/lib/libmyodbc5.so
|
||||
Setup = /usr/lib/libodbcmyS.so
|
||||
Driver64 = /usr/lib64/libmyodbc5.so
|
||||
Setup64 = /usr/lib64/libodbcmyS.so
|
||||
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
|
||||
57
SOURCES/odbcinst.ini
Normal file
57
SOURCES/odbcinst.ini
Normal file
@ -0,0 +1,57 @@
|
||||
# Example driver definitions
|
||||
|
||||
# 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 from the mysql-connector-odbc package in Fedora >=29
|
||||
# Setup from the unixODBC 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
|
||||
|
||||
|
||||
# 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 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
|
||||
@ -1,8 +1,7 @@
|
||||
Summary: A complete ODBC driver manager for Linux
|
||||
Name: unixODBC
|
||||
Version: 2.3.7
|
||||
Release: 2%{?dist}
|
||||
Group: System Environment/Libraries
|
||||
Version: 2.3.9
|
||||
Release: 4%{?dist}
|
||||
URL: http://www.unixODBC.org/
|
||||
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
|
||||
License: GPLv2+ and LGPLv2+
|
||||
@ -13,10 +12,10 @@ Source5: README.dist
|
||||
|
||||
Patch8: so-version-bump.patch
|
||||
Patch9: keep-typedefs.patch
|
||||
Patch10: RHEL-118425.patch
|
||||
|
||||
Conflicts: iodbc
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: multilib-rpm-config
|
||||
@ -28,7 +27,6 @@ a MySQL or MariaDB database, and/or the postgresql-odbc package for PostgreSQL.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for programs which will use the unixODBC library
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
@ -40,7 +38,6 @@ ODBC, you need to install this package.
|
||||
%setup -q
|
||||
%patch8 -p1 -b .soname-bump
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
|
||||
chmod 0644 Drivers/MiniSQL/*.c
|
||||
chmod 0644 Drivers/nn/*.c
|
||||
@ -78,6 +75,14 @@ cp %{SOURCE5} README.dist
|
||||
# remove obsolete Postgres drivers from the package (but not the setup code)
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so*
|
||||
|
||||
# make directory for unversioned plugins and create appropriate symlinks
|
||||
mkdir $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
cd $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
ln -s ../libodbcpsqlS.so.2.0.0 libodbcpsqlS.so
|
||||
ln -s ../libodbcmyS.so.2.0.0 libodbcmyS.so
|
||||
ln -s ../libtdsS.so.2.0.0 libtdsS.so
|
||||
cd -
|
||||
|
||||
# copy text driver documentation into main doc directory
|
||||
# currently disabled because upstream no longer includes text driver
|
||||
# mkdir -p doc/Drivers/txt
|
||||
@ -99,9 +104,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > bas
|
||||
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
|
||||
for lib in libodbcpsqlS.so libodbcmyS.so libtdsS.so
|
||||
do
|
||||
echo "%{_libdir}/$lib" >> base-so-list
|
||||
echo "%{_libdir}/%{name}/$lib" >> base-so-list
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/$lib
|
||||
grep -v "/$lib$" devel-so-list > devel-so-list.x
|
||||
mv -f devel-so-list.x devel-so-list
|
||||
done
|
||||
@ -122,13 +128,38 @@ done
|
||||
%{_includedir}/*
|
||||
%_libdir/pkgconfig/*.pc
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Fri Oct 03 2025 RHEL Packaging Agent <jotnar@redhat.com> - 2.3.7-2
|
||||
- fix __iptr_as_string() overflows buffer
|
||||
- Resolves: RHEL-118425
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.9-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.9-3
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Sep 10 2020 Ondrej Dubaj <odubaj@redhat.com> - 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 <releng@fedoraproject.org> - 2.3.7-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.3.7-4
|
||||
- Rebuild for readline 8.0
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Nov 30 2018 Michal Schorm <mschorm@redhat.com> - 2.3.7-2
|
||||
- Bump for rebuild to ship updated configuration
|
||||
|
||||
* Sat Aug 11 2018 Pavel Raiskup <praiskup@redhat.com> - 2.3.7-1
|
||||
- update to version 2.3.7
|
||||
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
42
odbcinst.ini
42
odbcinst.ini
@ -1,42 +0,0 @@
|
||||
# Example driver definitions
|
||||
|
||||
# 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 from the mysql-connector-odbc package
|
||||
# Setup from the unixODBC package
|
||||
[MySQL]
|
||||
Description = ODBC for MySQL
|
||||
Driver = /usr/lib/libmyodbc5.so
|
||||
Setup = /usr/lib/libodbcmyS.so
|
||||
Driver64 = /usr/lib64/libmyodbc5.so
|
||||
Setup64 = /usr/lib64/libodbcmyS.so
|
||||
FileUsage = 1
|
||||
|
||||
|
||||
# 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 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
|
||||
Loading…
Reference in New Issue
Block a user