import CS unixODBC-2.3.12-1.el9
This commit is contained in:
parent
879a456fe9
commit
5b9d9451e0
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/unixODBC-2.3.9.tar.gz
|
||||
SOURCES/unixODBC-2.3.12.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
8787833ccfa6b7b6b14a391ae9cbefcff13fb753 SOURCES/unixODBC-2.3.9.tar.gz
|
||||
9f4bf8d4e31438bc56bacf059dc9ba558eeed736 SOURCES/unixODBC-2.3.12.tar.gz
|
||||
|
||||
@ -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 \
|
||||
|
||||
41
SOURCES/unixODBC-c89.patch
Normal file
41
SOURCES/unixODBC-c89.patch
Normal file
@ -0,0 +1,41 @@
|
||||
PostgreSQL driver: Fix incompatible pointer-to-integer types
|
||||
|
||||
These result in out-of-bounds stack writes on 64-bit architectures
|
||||
(caller has 4 bytes, callee writes 8 bytes), and seem to have gone
|
||||
unnoticed on little-endian architectures (although big-endian
|
||||
architectures must be broken).
|
||||
|
||||
This change is required to avoid a build failure with GCC 14.
|
||||
|
||||
Submitted upstream: <https://github.com/lurcher/unixODBC/pull/157>
|
||||
|
||||
diff --git a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c
|
||||
index 63ac91f3f359f6ba..2216ecd4892e4efd 100644
|
||||
--- a/Drivers/Postgre7.1/info.c
|
||||
+++ b/Drivers/Postgre7.1/info.c
|
||||
@@ -1779,14 +1779,14 @@ char *table_name;
|
||||
char index_name[MAX_INFO_STRING];
|
||||
short fields_vector[8];
|
||||
char isunique[10], isclustered[10];
|
||||
-SDWORD index_name_len, fields_vector_len;
|
||||
+SQLLEN index_name_len, fields_vector_len;
|
||||
TupleNode *row;
|
||||
int i;
|
||||
HSTMT hcol_stmt;
|
||||
StatementClass *col_stmt, *indx_stmt;
|
||||
char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING];
|
||||
char **column_names = 0;
|
||||
-Int4 column_name_len;
|
||||
+SQLLEN column_name_len;
|
||||
int total_columns = 0;
|
||||
char error = TRUE;
|
||||
ConnInfo *ci;
|
||||
@@ -2136,7 +2136,7 @@ HSTMT htbl_stmt;
|
||||
StatementClass *tbl_stmt;
|
||||
char tables_query[STD_STATEMENT_LEN];
|
||||
char attname[MAX_INFO_STRING];
|
||||
-SDWORD attname_len;
|
||||
+SQLLEN attname_len;
|
||||
char pktab[MAX_TABLE_LEN + 1];
|
||||
Int2 result_cols;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: A complete ODBC driver manager for Linux
|
||||
Name: unixODBC
|
||||
Version: 2.3.9
|
||||
Release: 4%{?dist}
|
||||
Version: 2.3.12
|
||||
Release: 1%{?dist}
|
||||
URL: http://www.unixODBC.org/
|
||||
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
|
||||
License: GPLv2+ and LGPLv2+
|
||||
@ -12,6 +12,7 @@ Source5: README.dist
|
||||
|
||||
Patch8: so-version-bump.patch
|
||||
Patch9: keep-typedefs.patch
|
||||
Patch10: unixODBC-c89.patch
|
||||
|
||||
Conflicts: iodbc
|
||||
|
||||
@ -38,6 +39,7 @@ 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
|
||||
@ -67,7 +69,7 @@ make all
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
|
||||
%multilib_fix_c_header --file %{_includedir}/unixodbc_conf.h
|
||||
%multilib_fix_c_header --file %{_includedir}/unixODBC/unixodbc_conf.h
|
||||
|
||||
# add some explanatory documentation
|
||||
cp %{SOURCE5} README.dist
|
||||
@ -129,6 +131,13 @@ done
|
||||
%_libdir/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
* Mon Oct 13 2025 RHEL Packaging Agent <jotnar@redhat.com> - 2.3.12-1
|
||||
- Rebase to version 2.3.12
|
||||
- Add unixODBC-c89.patch for GCC 14 compatibility
|
||||
- Update so-version-bump.patch for new version
|
||||
- Fix multilib_fix_c_header path to match actual header location
|
||||
- Resolves: RHEL-94798
|
||||
|
||||
* 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user