From: Chen Qi <[email protected]> The following two patches are dropped as they have already been in the new version: - 0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch - CVE-2024-1013.patch
Signed-off-by: Chen Qi <[email protected]> --- ...add-CROSS_LAUNCHER-to-run-odbc_confi.patch | 54 ------------------- .../unixodbc/files/CVE-2024-1013.patch | 53 ------------------ ...{unixodbc_2.3.12.bb => unixodbc_2.3.14.bb} | 4 +- 3 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch delete mode 100644 meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch rename meta-oe/recipes-support/unixodbc/{unixodbc_2.3.12.bb => unixodbc_2.3.14.bb} (87%) diff --git a/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch b/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch deleted file mode 100644 index c763a9feb6..0000000000 --- a/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch +++ /dev/null @@ -1,54 +0,0 @@ -From e886222c70d4b251f0785f670477b7aee938e5af Mon Sep 17 00:00:00 2001 -From: Chen Qi <[email protected]> -Date: Wed, 21 Feb 2024 13:55:41 +0800 -Subject: [PATCH] exe/Makefile.am: add CROSS_LAUNCHER to run odbc_config - -In case of cross compilation, the odbc_config cannot run, the error message -would be like below: - - /bin/bash: line 1: ../exe/odbc_config: cannot execute binary file: Exec format error - -Add CROSS_LAUNCHER to allow the possibility of running odbc_config correctly in -case of cross compilation. - -For example, here's a possible value for it (Yocto project environment, aarch64 target). - export CROSS_LAUNCHER="PSEUDO_UNLOAD=1 qemu-aarch64 -r 5.15 \ - -L /PATH/TO/unixodbc/2.3.11/recipe-sysroot \ - -E LD_LIBRARY_PATH=/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib:/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib " - -Other projects can use the launcher they like to allow correct generation of -the odbc.pc file in cross compilation environment. - -Upstream-Status: Submitted [Personal Email, [email protected]] - -As said in the official website, https://www.unixodbc.org/, the way to report bug and send -out patch is via personal email. So there's a public link above. - -Signed-off-by: Chen Qi <[email protected]> ---- - exe/Makefile.am | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/exe/Makefile.am b/exe/Makefile.am -index 03f3d5a..5f33cf2 100644 ---- a/exe/Makefile.am -+++ b/exe/Makefile.am -@@ -59,11 +59,13 @@ slencheck_SOURCES = slencheck.c - dltest_DEPENDENCIES = $(LTDLDEPS) - dltest_LDADD = $(LIBLTDL) - -+CROSS_LAUNCHER ?= "" -+ - all-am: -- @sed "s![@]ODBC_ULEN[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ -+ @sed "s![@]ODBC_ULEN[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ - $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp - @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc -- @sed "s![@]ODBC_CFLAGS[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ -+ @sed "s![@]ODBC_CFLAGS[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ - $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp - @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc - --- -2.34.1 - diff --git a/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch b/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch deleted file mode 100644 index 6884465452..0000000000 --- a/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 76beb0938ef14276123996bfd99df23b0c7f0982 Mon Sep 17 00:00:00 2001 -From: Soumya Sambu <[email protected]> -Date: Fri, 7 Jun 2024 11:10:46 +0000 -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. - -CVE: CVE-2024-1013 - -Upstream-Status: Backport [https://github.com/lurcher/unixODBC/commit/45f501e1be2db6b017cc242c79bfb9de32b332a1] - -Signed-off-by: Soumya Sambu <[email protected]> ---- - 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; - --- -2.40.0 diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.14.bb similarity index 87% rename from meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb rename to meta-oe/recipes-support/unixodbc/unixodbc_2.3.14.bb index 389c3be903..6f26f7b174 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.14.bb @@ -10,10 +10,8 @@ DEPENDS = "libtool readline" SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ file://do-not-use-libltdl-source-directory.patch \ - file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ - file://CVE-2024-1013.patch \ " -SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" +SRC_URI[sha256sum] = "4e2814de3e01fc30b0b9f75e83bb5aba91ab0384ee951286504bb70205524771" UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html"; UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" -- 2.49.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#125182): https://lists.openembedded.org/g/openembedded-devel/message/125182 Mute This Topic: https://lists.openembedded.org/mt/118293653/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
