diff -pruN 1.1.10-1/debian/changelog 1.1.10-1ubuntu4/debian/changelog --- 1.1.10-1/debian/changelog 2024-12-08 00:11:29.000000000 +0000 +++ 1.1.10-1ubuntu4/debian/changelog 2025-11-01 12:37:58.000000000 +0000 @@ -1,15 +1,60 @@ +tdbcmysql (1.1.10-1ubuntu4) resolute; urgency=medium + + * Rebuild against latest tdbc + + -- Jeremy Bícha Sat, 01 Nov 2025 08:37:58 -0400 + +tdbcmysql (1.1.10-1ubuntu3) plucky; urgency=medium + + * d/control: Enforce use of libmysqlclient24 for mysql-8.4 + + -- Lena Voytek Fri, 21 Mar 2025 09:45:53 -0400 + +tdbcmysql (1.1.10-1ubuntu2) plucky; urgency=medium + + * No-change rebuild against mysql-8.4 and libmysqlclient24 (LP: #2089059) + + -- Lena Voytek Tue, 18 Mar 2025 15:29:29 -0400 + +tdbcmysql (1.1.10-1ubuntu1) plucky; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Gianfranco Costamagna Mon, 09 Dec 2024 17:42:35 +0100 + tdbcmysql (1.1.10-1) unstable; urgency=medium * New upstream release -- Massimo Manghi Sun, 08 Dec 2024 00:11:29 +0000 +tdbcmysql (1.1.9-1ubuntu1) plucky; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Gianfranco Costamagna Wed, 13 Nov 2024 07:31:16 +0100 + tdbcmysql (1.1.9-1) unstable; urgency=medium * New upstream release -- Massimo Manghi Sun, 03 Nov 2024 19:54:43 +0100 +tdbcmysql (1.1.8-1ubuntu1) oracular; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/control: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Gianfranco Costamagna Mon, 27 May 2024 08:15:01 +0200 + tdbcmysql (1.1.8-1) unstable; urgency=medium * New upstream release @@ -19,12 +64,36 @@ tdbcmysql (1.1.8-1) unstable; urgency=me -- Massimo Manghi Wed, 22 May 2024 08:43:45 +0000 +tdbcmysql (1.1.7-1ubuntu2) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- William Grant Mon, 01 Apr 2024 19:23:42 +1100 + +tdbcmysql (1.1.7-1ubuntu1) noble; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Gianfranco Costamagna Wed, 28 Feb 2024 00:41:10 +0100 + tdbcmysql (1.1.7-1) unstable; urgency=medium * New upstream release -- Massimo Manghi Mon, 26 Feb 2024 06:55:28 +0000 +tdbcmysql (1.1.6-1ubuntu1) noble; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Gianfranco Costamagna Wed, 14 Feb 2024 19:07:14 +0100 + tdbcmysql (1.1.6-1) unstable; urgency=medium * New upstream release @@ -32,6 +101,15 @@ tdbcmysql (1.1.6-1) unstable; urgency=me -- Massimo Manghi Thu, 08 Feb 2024 18:19:27 +0000 +tdbcmysql (1.1.5-1ubuntu1) lunar; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Gianfranco Costamagna Sun, 27 Nov 2022 19:28:43 +0100 + tdbcmysql (1.1.5-1) unstable; urgency=medium * New upstream release @@ -41,6 +119,15 @@ tdbcmysql (1.1.5-1) unstable; urgency=me -- Massimo Manghi Tue, 15 Nov 2022 16:59:22 +0000 +tdbcmysql (1.1.3-2ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control, d/p/addlibmysqlclient21: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Gianfranco Costamagna Mon, 17 Jan 2022 15:32:47 +0100 + tdbcmysql (1.1.3-2) unstable; urgency=medium * Removed unused licence GPL-2+ from debian/copyright @@ -50,6 +137,15 @@ tdbcmysql (1.1.3-2) unstable; urgency=me -- Massimo Manghi Fri, 07 Jan 2022 11:20:11 +0100 +tdbcmysql (1.1.3-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control, d/p/addlibmysqlclient21: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Gianfranco Costamagna Thu, 09 Dec 2021 14:02:13 +0100 + tdbcmysql (1.1.3-1) unstable; urgency=medium * New upstream release @@ -58,6 +154,15 @@ tdbcmysql (1.1.3-1) unstable; urgency=me -- Massimo Manghi Tue, 30 Nov 2021 17:19:09 +0100 +tdbcmysql (1.1.2-1ubuntu1) impish; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control, d/p/addlibmysqlclient21: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Gianfranco Costamagna Thu, 19 Aug 2021 14:47:06 +0200 + tdbcmysql (1.1.2-1) unstable; urgency=medium * New upstream release @@ -65,6 +170,22 @@ tdbcmysql (1.1.2-1) unstable; urgency=me -- Massimo Manghi Fri, 09 Apr 2021 11:44:12 +0200 +tdbcmysql (1.1.1-1ubuntu2) hirsute; urgency=medium + + * Rebuild against new mariadb-10.5. + + -- Gianfranco Costamagna Thu, 03 Dec 2020 21:58:20 +0100 + +tdbcmysql (1.1.1-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/control, d/p/addlibmysqlclient21: add compatibility for libmysqlclient21 + - d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + - d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + * d/p/addlibmysqlclient21: rebased on Debian + + -- Robie Basak Fri, 28 Feb 2020 13:30:56 +0000 + tdbcmysql (1.1.1-1) unstable; urgency=medium * New upstream release @@ -82,6 +203,20 @@ tdbcmysql (1.1.0-3) unstable; urgency=me -- Massimo Manghi Sat, 31 Aug 2019 22:41:11 +0200 +tdbcmysql (1.1.0-2ubuntu1) eoan; urgency=medium + + * d/control, d/p/addlibmysqlclient21: add compatibility for libmysqlclient21 + * d/p/fix-mysql-8-TX_ISOLATION.patch: adapt renamed system variable + * d/p/fix-mysql-8-no-implicit-combined-index.patch: add missing indexes + + -- Christian Ehrhardt Wed, 14 Aug 2019 10:18:52 +0200 + +tdbcmysql (1.1.0-2build1) eoan; urgency=medium + + * No change rebuild for libmysqlclient21. + + -- Robie Basak Mon, 12 Aug 2019 02:06:30 +0000 + tdbcmysql (1.1.0-2) unstable; urgency=medium * Add libmariadb3 to the dependencies list, and load it during [package diff -pruN 1.1.10-1/debian/control 1.1.10-1ubuntu4/debian/control --- 1.1.10-1/debian/control 2024-05-22 08:43:45.000000000 +0000 +++ 1.1.10-1ubuntu4/debian/control 2025-03-21 13:42:57.000000000 +0000 @@ -1,15 +1,16 @@ Source: tdbcmysql Section: libs Priority: optional -Maintainer: Massimo Manghi -Build-Depends: debhelper-compat (=13), tcl8.6-dev, tcl8.6-tdbc (>=1.0.5~), libmariadb3 | libmysqlclient20 +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Massimo Manghi +Build-Depends: debhelper-compat (=13), tcl8.6-dev, tcl8.6-tdbc (>=1.0.5~), libmariadb3 | libmysqlclient24 Standards-Version: 4.7.0 Rules-Requires-Root: binary-targets Homepage: http://core.tcl.tk/tdbcmysql Package: tcl8.6-tdbc-mysql Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.6, tcl8.6-tdbc (>=1.0.5), libmariadb3 | libmysqlclient20 +Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.6, tcl8.6-tdbc (>=1.0.5), libmariadb3 | libmysqlclient24 Description: Tcl Database Connectivity Tdbc is an interface standard for SQL databases and connectivity that aims to make it easy to write portable and secure Tcl scripts that access SQL diff -pruN 1.1.10-1/debian/patches/fix-mysql-8-TX_ISOLATION.patch 1.1.10-1ubuntu4/debian/patches/fix-mysql-8-TX_ISOLATION.patch --- 1.1.10-1/debian/patches/fix-mysql-8-TX_ISOLATION.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.10-1ubuntu4/debian/patches/fix-mysql-8-TX_ISOLATION.patch 2025-03-18 19:28:16.000000000 +0000 @@ -0,0 +1,137 @@ +Description: fix mysql8 due to variable rename + The mysql8 change from [1] to [2] (from 5.7.20) while at the same time + mariadb [3] didn't change requires a runtime check against the client + version to use the right system variable name. + . + We can't use a compile time switch as the code is meant to be the same + for all of the DBs supported. + . + But also just a check on mysqlClientVersion isn't enough as MariaDB and MySQL + started to differ. Therefore this isolates the selection of a query (stays in + QueryConnectionOption) and the execution of a query (new ExecuteStatement) to + be reused in the new is_mariadb helper. + With that the check can be completed using also [4] which with MariaDB always + contains the subtring MariaDB. + Example on Ubuntu: SELECT '', @@VERSION; + mariadb: 10.3.17-MariaDB-1 + mysql-8: 8.0.16-0ubuntu2 + . + [1]: https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_tx_isolation + [2]: https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_transaction_isolation + [3]: https://mariadb.com/kb/en/library/server-system-variables/#tx_isolation + [4]: https://mariadb.com/kb/en/library/server-system-variables/#version +Forwarded: no +X-Not-Forwarded-Reason: work in progress +Author: Christian Ehrhardt +Last-Update: 2019-08-13 +Index: tdbcmysql-1.1.9-1ubuntu1/generic/tdbcmysql.c +=================================================================== +--- tdbcmysql-1.1.9-1ubuntu1.orig/generic/tdbcmysql.c ++++ tdbcmysql-1.1.9-1ubuntu1/generic/tdbcmysql.c +@@ -1063,9 +1063,9 @@ + /* + *----------------------------------------------------------------------------- + * +- * QueryConnectionOption -- ++ * ExecuteStatement -- + * +- * Determine the current value of a connection option. ++ * Run the SQL statement passed in "query" + * + * Results: + * Returns a Tcl object containing the value if successful, or NULL +@@ -1076,10 +1076,10 @@ + */ + + static Tcl_Obj* +-QueryConnectionOption ( ++ExecuteStatement ( + ConnectionData* cdata, /* Connection data */ + Tcl_Interp* interp, /* Tcl interpreter */ +- int optionNum /* Position of the option in the table */ ++ const char* query /* Position of the option in the table */ + ) { + MYSQL_RES* result; /* Result of the MySQL query for the option */ + MYSQL_ROW row; /* Row of the result set */ +@@ -1087,7 +1087,7 @@ + unsigned long* lengths; /* Character lengths of the fields */ + Tcl_Obj* retval; /* Return value */ + +- if (mysql_query(cdata->mysqlPtr, ConnOptions[optionNum].query)) { ++ if (mysql_query(cdata->mysqlPtr, query)) { + TransferMysqlError(interp, cdata->mysqlPtr); + return NULL; + } +@@ -1120,6 +1120,72 @@ + /* + *----------------------------------------------------------------------------- + * ++ * is_mariadb -- ++ * ++ * Determine if the current connection is against a MariaDB server. ++ * ++ * Results: ++ * Returns 1 if MariaDB and 0 if not. ++ * ++ *----------------------------------------------------------------------------- ++ */ ++ ++static int ++is_mariadb ( ++ ConnectionData* cdata, /* Connection data */ ++ Tcl_Interp* interp /* Tcl interpreter */ ++) { ++ Tcl_Obj* version; ++ char* versionstring; ++ ++ version = ExecuteStatement(cdata, interp, "SELECT '', @@VERSION"); ++ versionstring = Tcl_GetString(version); ++ ++ return (strstr(versionstring, "MariaDB") != NULL); ++} ++ ++/* ++ *----------------------------------------------------------------------------- ++ * ++ * QueryConnectionOption -- ++ * ++ * Determine the current value of a connection option. ++ * ++ * Results: ++ * Returns a Tcl object containing the value if successful, or NULL ++ * if unsuccessful. If unsuccessful, stores error information in the ++ * Tcl interpreter. ++ * ++ *----------------------------------------------------------------------------- ++ */ ++ ++static Tcl_Obj* ++QueryConnectionOption ( ++ ConnectionData* cdata, /* Connection data */ ++ Tcl_Interp* interp, /* Tcl interpreter */ ++ int optionNum /* Position of the option in the table */ ++) { ++ const char* query = NULL; /* query to fetch the option value */ ++ ++ query = ConnOptions[optionNum].query; ++ ++ /* ++ * Special case for @@TX_ISOLATION dropped in mysql-8 ++ */ ++ if (strcmp(ConnOptions[optionNum].name, "-isolation") == 0) { ++ if (! is_mariadb(cdata, interp)) { ++ if (mysqlClientVersion >= 80000) { ++ query = "SELECT '', LCASE(REPLACE(@@TRANSACTION_ISOLATION, '-', ''))"; ++ } ++ } ++ } ++ ++ return ExecuteStatement(cdata, interp, query); ++} ++ ++/* ++ *----------------------------------------------------------------------------- ++ * + * ConfigureConnection -- + * + * Applies configuration settings to a MySQL connection. diff -pruN 1.1.10-1/debian/patches/fix-mysql-8-no-implicit-combined-index.patch 1.1.10-1ubuntu4/debian/patches/fix-mysql-8-no-implicit-combined-index.patch --- 1.1.10-1/debian/patches/fix-mysql-8-no-implicit-combined-index.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.10-1ubuntu4/debian/patches/fix-mysql-8-no-implicit-combined-index.patch 2025-03-18 19:28:16.000000000 +0000 @@ -0,0 +1,24 @@ +Description: fix mysql8 due the drop of implicit indexing + Adding a foreign key constraint requires an index on those. + For combined keys that is no more done implicitly. + . + The solution is to add the index on creation which also makes it + state more completely what it really does. + . + Right now I'm unsure if old Mysql/MariaDB did auto-create that index + or if they didn't require it for the constraint. + But the fix seems to work on all Mysql 5.7 and MariaDB 10 versions. +Forwarded: no +X-Not-Forwarded-Reason: work in progress +Author: Christian Ehrhardt +Last-Update: 2019-08-13 +--- a/tests/tdbcmysql.test ++++ b/tests/tdbcmysql.test +@@ -3050,6 +3050,7 @@ catch {::db allrows {DROP TABLE a}} + CREATE TABLE b ( + k1 INTEGER, + k2 INTEGER, ++ INDEX (k2,k1), + CONSTRAINT pk_b PRIMARY KEY(k1, k2), + CONSTRAINT fk_b1 FOREIGN KEY (k1) REFERENCES a(k1), + CONSTRAINT fk_b2 FOREIGN KEY (k2) REFERENCES a(k1) diff -pruN 1.1.10-1/debian/patches/series 1.1.10-1ubuntu4/debian/patches/series --- 1.1.10-1/debian/patches/series 2022-11-15 16:59:22.000000000 +0000 +++ 1.1.10-1ubuntu4/debian/patches/series 2025-03-18 19:28:16.000000000 +0000 @@ -1 +1,3 @@ numeric-expression-expected +fix-mysql-8-TX_ISOLATION.patch +fix-mysql-8-no-implicit-combined-index.patch