From 991cb9d36c84ea70d904e03ccd493ea697fda01b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 20 Oct 2025 22:38:19 +0200 Subject: [PATCH] package/unixodbc: bump version to 2.3.14 Release notes: https://github.com/lurcher/unixODBC/releases/tag/v2.3.13 https://github.com/lurcher/unixODBC/releases/tag/v2.3.14 Removed patch which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- ...r-Fix-incompatible-pointer-to-intege.patch | 49 ------------------- package/unixodbc/unixodbc.hash | 2 +- package/unixodbc/unixodbc.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/unixodbc/0001-PostgreSQL-driver-Fix-incompatible-pointer-to-intege.patch diff --git a/package/unixodbc/0001-PostgreSQL-driver-Fix-incompatible-pointer-to-intege.patch b/package/unixodbc/0001-PostgreSQL-driver-Fix-incompatible-pointer-to-intege.patch deleted file mode 100644 index 8efe6dae4e..0000000000 --- a/package/unixodbc/0001-PostgreSQL-driver-Fix-incompatible-pointer-to-intege.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 45f501e1be2db6b017cc242c79bfb9de32b332a1 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Mon, 29 Jan 2024 08:27:29 +0100 -Subject: [PATCH] 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. - -Upstream: https://github.com/lurcher/unixODBC/commit/45f501e1be2db6b017cc242c79bfb9de32b332a1 - -Signed-off-by: Bernd Kuhls ---- - Drivers/Postgre7.1/info.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c -index 63ac91f..2216ecd 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; - diff --git a/package/unixodbc/unixodbc.hash b/package/unixodbc/unixodbc.hash index 6262dab5ae..e81448adbd 100644 --- a/package/unixodbc/unixodbc.hash +++ b/package/unixodbc/unixodbc.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec unixODBC-2.3.12.tar.gz +sha256 4e2814de3e01fc30b0b9f75e83bb5aba91ab0384ee951286504bb70205524771 unixODBC-2.3.14.tar.gz sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk index 302b964a44..47c08a39eb 100644 --- a/package/unixodbc/unixodbc.mk +++ b/package/unixodbc/unixodbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIXODBC_VERSION = 2.3.12 +UNIXODBC_VERSION = 2.3.14 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz UNIXODBC_SITE = http://www.unixodbc.org UNIXODBC_INSTALL_STAGING = YES