diff -pruN 0.7.2-4/debian/changelog 0.7.2-4ubuntu4/debian/changelog --- 0.7.2-4/debian/changelog 2022-12-10 12:03:37.000000000 +0000 +++ 0.7.2-4ubuntu4/debian/changelog 2025-03-13 18:59:46.000000000 +0000 @@ -1,3 +1,29 @@ +lua-dbi (0.7.2-4ubuntu4) plucky; urgency=medium + + * d/p/mysql-8.4: Fix armhf build by matching length type to mysql 8.4 + + -- Lena Voytek Thu, 13 Mar 2025 14:59:46 -0400 + +lua-dbi (0.7.2-4ubuntu3) plucky; urgency=medium + + * No-change rebuild against mysql-8.4 and libmysqlclient24 (LP: #2089059) + + -- Lena Voytek Wed, 05 Feb 2025 15:47:53 -0500 + +lua-dbi (0.7.2-4ubuntu2) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- Steve Langasek Sun, 31 Mar 2024 20:00:22 +0000 + +lua-dbi (0.7.2-4ubuntu1) noble; urgency=medium + + * Merge with Debian unstable (LP: #2055062). Remaining changes: + - debian/patches/mysql-8.0: + Adjustments to allow build against MySQL 8.0 to fix FTBFS. + + -- Athos Ribeiro Mon, 26 Feb 2024 15:17:21 -0300 + lua-dbi (0.7.2-4) unstable; urgency=medium [ Debian Janitor ] @@ -7,6 +33,20 @@ lua-dbi (0.7.2-4) unstable; urgency=medi -- Jelmer Vernooij Sat, 10 Dec 2022 12:03:37 +0000 +lua-dbi (0.7.2-3ubuntu2) lunar; urgency=medium + + * No change rebuild for PostgreSQL 15 + + -- Athos Ribeiro Wed, 18 Jan 2023 12:14:09 -0300 + +lua-dbi (0.7.2-3ubuntu1) kinetic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/patches/mysql-8.0: + Adjustments to allow build against MySQL 8.0 to fix FTBFS. + + -- Lukas Märdian Tue, 17 May 2022 17:56:30 +0200 + lua-dbi (0.7.2-3) unstable; urgency=medium * Lua team as maintainer, me as uploader (Closes: #995542) @@ -15,12 +55,26 @@ lua-dbi (0.7.2-3) unstable; urgency=medi -- Victor Seva Mon, 27 Dec 2021 12:48:58 +0100 +lua-dbi (0.7.2-2ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/mysql-8.0: + Adjustments to allow build against MySQL 8.0 to fix FTBFS. + + -- Lukas Märdian Thu, 18 Feb 2021 14:41:26 +0100 + lua-dbi (0.7.2-2) unstable; urgency=medium * update standards-version to 4.4.1, no changes needed -- Victor Seva Tue, 19 Nov 2019 09:24:45 +0100 +lua-dbi (0.7.2-1ubuntu1) eoan; urgency=medium + + * Adjustments to allow build against MySQL 8.0 to fix FTBFS. + + -- Robie Basak Tue, 16 Jul 2019 10:19:30 +0000 + lua-dbi (0.7.2-1) unstable; urgency=medium * New upstream version 0.7.2 diff -pruN 0.7.2-4/debian/control 0.7.2-4ubuntu4/debian/control --- 0.7.2-4/debian/control 2022-12-10 12:03:37.000000000 +0000 +++ 0.7.2-4ubuntu4/debian/control 2025-02-05 20:47:53.000000000 +0000 @@ -1,7 +1,8 @@ Source: lua-dbi Section: interpreters Priority: optional -Maintainer: Debian Lua Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Lua Team Uploaders: Victor Seva , Build-Depends: diff -pruN 0.7.2-4/debian/patches/mysql-8.0 0.7.2-4ubuntu4/debian/patches/mysql-8.0 --- 0.7.2-4/debian/patches/mysql-8.0 1970-01-01 00:00:00.000000000 +0000 +++ 0.7.2-4ubuntu4/debian/patches/mysql-8.0 2025-02-05 20:47:53.000000000 +0000 @@ -0,0 +1,78 @@ +Description: Fix build against MySQL 8.0 + Use NULL instead of casting 0 to specific pointer types since the actual type + of is_null differs based on the version and variant in use now. This allows + the build to succeed against all current versions. + . + Use MYSQL_TIME as that's the actual API, unlike struct st_mysql_time which is + internal and is no longer available in MySQL 8. +Author: Robie Basak +Origin: vendor +Forwarded: no +X-Not-Forwarded-Reason: work still in progress +Last-Update: 2018-07-16 + +--- a/dbd/mysql/statement.c ++++ b/dbd/mysql/statement.c +@@ -218,7 +218,7 @@ + switch(type) { + case LUA_TNIL: + bind[i].buffer_type = MYSQL_TYPE_NULL; +- bind[i].is_null = (int*)1; ++ bind[i].is_null = NULL; + break; + + case LUA_TBOOLEAN: +@@ -227,7 +227,7 @@ + *boolean = lua_toboolean(L, p); + + bind[i].buffer_type = MYSQL_TYPE_LONG; +- bind[i].is_null = (int*)0; ++ bind[i].is_null = NULL; + bind[i].buffer = (char *)boolean; + bind[i].length = 0; + break; +@@ -242,7 +242,7 @@ + *num = lua_tonumber(L, p); + + bind[i].buffer_type = MYSQL_TYPE_DOUBLE; +- bind[i].is_null = (int*)0; ++ bind[i].is_null = NULL; + bind[i].buffer = (char *)num; + bind[i].length = 0; + break; +@@ -253,7 +253,7 @@ + str = lua_tolstring(L, p, str_len); + + bind[i].buffer_type = MYSQL_TYPE_STRING; +- bind[i].is_null = (int*)0; ++ bind[i].is_null = NULL; + bind[i].buffer = (char *)str; + bind[i].length = str_len; + break; +@@ -424,7 +424,7 @@ + + if (fields[i].type == MYSQL_TYPE_TIMESTAMP || fields[i].type == MYSQL_TYPE_DATETIME) { + char str[20]; +- struct st_mysql_time *t = bind[i].buffer; ++ MYSQL_TIME *t = bind[i].buffer; + + snprintf(str, 20, "%d-%02d-%02d %02d:%02d:%02d", t->year, t->month, t->day, t->hour, t->minute, t->second); + +@@ -435,7 +435,7 @@ + } + } else if (fields[i].type == MYSQL_TYPE_TIME) { + char str[9]; +- struct st_mysql_time *t = bind[i].buffer; ++ MYSQL_TIME *t = bind[i].buffer; + + snprintf(str, 9, "%02d:%02d:%02d", t->hour, t->minute, t->second); + +@@ -446,7 +446,7 @@ + } + } else if (fields[i].type == MYSQL_TYPE_DATE) { + char str[20]; +- struct st_mysql_time *t = bind[i].buffer; ++ MYSQL_TIME *t = bind[i].buffer; + + snprintf(str, 11, "%d-%02d-%02d", t->year, t->month, t->day); + diff -pruN 0.7.2-4/debian/patches/mysql-8.4 0.7.2-4ubuntu4/debian/patches/mysql-8.4 --- 0.7.2-4/debian/patches/mysql-8.4 1970-01-01 00:00:00.000000000 +0000 +++ 0.7.2-4ubuntu4/debian/patches/mysql-8.4 2025-03-13 18:59:46.000000000 +0000 @@ -0,0 +1,34 @@ +Description: Fix build against MySQL 8.4 + MySQL 8.4 now uses unsigned long for length in MYSQL_BIND instead of size_t, + match this behavior in statement.c. +Author: Lena Voytek +Last-Update: 2025-03-13 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/dbd/mysql/statement.c ++++ b/dbd/mysql/statement.c +@@ -210,7 +210,7 @@ + int i = p - 2; + + const char *str = NULL; +- size_t *str_len = NULL; ++ unsigned long *str_len = NULL; + double *num = NULL; + int *boolean = NULL; + char err[64]; +@@ -248,9 +248,12 @@ + break; + + case LUA_TSTRING: +- str_len = (size_t *)(buffer + offset); +- offset += sizeof(size_t); +- str = lua_tolstring(L, p, str_len); ++ str_len = (unsigned long *)(buffer + offset); ++ offset += sizeof(unsigned long); ++ ++ size_t str_len_tostring = 0; ++ str = lua_tolstring(L, p, &str_len_tostring); ++ *str_len = (unsigned long)str_len_tostring; + + bind[i].buffer_type = MYSQL_TYPE_STRING; + bind[i].is_null = NULL; diff -pruN 0.7.2-4/debian/patches/series 0.7.2-4ubuntu4/debian/patches/series --- 0.7.2-4/debian/patches/series 2022-12-10 12:03:37.000000000 +0000 +++ 0.7.2-4ubuntu4/debian/patches/series 2025-03-13 18:59:46.000000000 +0000 @@ -1,3 +1,5 @@ # upstream # test.patch +mysql-8.0 +mysql-8.4