diff -pruN 1.2.4-1/debian/changelog 1.2.4-1ubuntu3/debian/changelog --- 1.2.4-1/debian/changelog 2020-08-23 11:15:26.000000000 +0000 +++ 1.2.4-1ubuntu3/debian/changelog 2022-01-24 16:20:42.000000000 +0000 @@ -1,3 +1,24 @@ +mysql-ocaml (1.2.4-1ubuntu3) jammy; urgency=medium + + * No-change rebuild for ocaml abi changes. + + -- Matthias Klose Mon, 24 Jan 2022 17:20:42 +0100 + +mysql-ocaml (1.2.4-1ubuntu2) hirsute; urgency=medium + + * No-change rebuild for ocaml abi changes. + + -- Matthias Klose Mon, 02 Nov 2020 14:08:33 +0100 + +mysql-ocaml (1.2.4-1ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop references to removed features when building against MySQL >= 8.0 to + fix FTBFS. + - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. + + -- Gianfranco Costamagna Mon, 24 Aug 2020 10:49:52 +0200 + mysql-ocaml (1.2.4-1) unstable; urgency=medium * Team upload @@ -11,6 +32,26 @@ mysql-ocaml (1.2.4-1) unstable; urgency= -- Stéphane Glondu Sun, 23 Aug 2020 13:15:26 +0200 +mysql-ocaml (1.2.1-1ubuntu3) focal; urgency=medium + + * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. + (LP: #1863026) + + -- Gianfranco Costamagna Fri, 21 Feb 2020 08:51:18 +0100 + +mysql-ocaml (1.2.1-1ubuntu1) eoan; urgency=medium + + * Drop references to removed features when building against MySQL >= 8.0 to + fix FTBFS. + + -- Robie Basak Tue, 16 Jul 2019 16:45:45 +0000 + +mysql-ocaml (1.2.1-1build1) bionic; urgency=medium + + * Rebuild against new OCAML ABIs. + + -- Gianfranco Costamagna Fri, 27 Oct 2017 21:58:07 +0200 + mysql-ocaml (1.2.1-1) unstable; urgency=medium * Team upload @@ -236,4 +277,3 @@ mysql-ocaml (1.0.2-1) unstable; urgency= * Initial Release. -- Samuel Mimram Sun, 16 Nov 2003 22:44:10 +0100 - diff -pruN 1.2.4-1/debian/control 1.2.4-1ubuntu3/debian/control --- 1.2.4-1/debian/control 2020-08-23 11:15:26.000000000 +0000 +++ 1.2.4-1ubuntu3/debian/control 2020-08-23 15:22:33.000000000 +0000 @@ -1,7 +1,8 @@ Source: mysql-ocaml Section: ocaml Priority: optional -Maintainer: Debian OCaml Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OCaml Maintainers Uploaders: Mehdi Dogguy Build-Depends: diff -pruN 1.2.4-1/debian/patches/mysq8_my_bool.patch 1.2.4-1ubuntu3/debian/patches/mysq8_my_bool.patch --- 1.2.4-1/debian/patches/mysq8_my_bool.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.4-1ubuntu3/debian/patches/mysq8_my_bool.patch 2020-02-21 07:51:15.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Reintroduce my_bool to fix build with MySQL 8 + (patch inspired from the one in cppdb 0.3.1+dfsg-8ubuntu2) +Author: Gianfranco Costamagna , Andreas Hasenack +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026 +Forwarded: no +Last-Update: 2020-02-21 + +--- mysql-ocaml-1.2.1.orig/mysql_stubs.c ++++ mysql-ocaml-1.2.1/mysql_stubs.c +@@ -71,6 +71,7 @@ + #define STMTval(x) (*(MYSQL_STMT**)Data_custom_val(x)) + #define ROWval(x) (*(row_t**)Data_custom_val(x)) + ++typedef bool my_bool; + static void mysqlfailwith(char *err) Noreturn; + static void mysqlfailmsg(const char *fmt, ...) Noreturn; + diff -pruN 1.2.4-1/debian/patches/mysql-8.0 1.2.4-1ubuntu3/debian/patches/mysql-8.0 --- 1.2.4-1/debian/patches/mysql-8.0 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.4-1ubuntu3/debian/patches/mysql-8.0 2019-07-16 16:45:45.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Drop support for options removed in MySQL 8.0 + These are no longer available in MySQL 8.0. There is already an "unknown + option" default case, so it should be safe security-wise: anything still + requesting these options will correctly fail. +Author: Robie Basak +Origin: vendor +Forwarded: no +X-Not-Forwarded-Reason: work still in progress +Last-Update: 2018-07-16 + +--- a/mysql_stubs.c ++++ b/mysql_stubs.c +@@ -227,9 +227,13 @@ + { + case 0: SET_OPTION_BOOL(OPT_LOCAL_INFILE); + case 1: SET_OPTION_BOOL(OPT_RECONNECT); ++#if defined(MARIADB_BASE_VERSION) || MYSQL_VERSION_ID < 80000 + case 2: SET_OPTION_BOOL(OPT_SSL_VERIFY_SERVER_CERT); ++#endif + case 3: SET_OPTION_BOOL(REPORT_DATA_TRUNCATION); ++#if defined(MARIADB_BASE_VERSION) || MYSQL_VERSION_ID < 80000 + case 4: SET_OPTION_BOOL(SECURE_AUTH); ++#endif + case 5: SET_OPTION(OPT_PROTOCOL, &ml_mysql_protocol_type[Int_val(v)]); + case 6: SET_OPTION_INT(OPT_CONNECT_TIMEOUT); + case 7: SET_OPTION_INT(OPT_READ_TIMEOUT); diff -pruN 1.2.4-1/debian/patches/series 1.2.4-1ubuntu3/debian/patches/series --- 1.2.4-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.4-1ubuntu3/debian/patches/series 2020-02-21 07:51:00.000000000 +0000 @@ -0,0 +1,2 @@ +mysql-8.0 +mysq8_my_bool.patch