diff -pruN 1:3.0.8.2-6.1/debian/changelog 1:3.0.8.2-6.1ubuntu1/debian/changelog --- 1:3.0.8.2-6.1/debian/changelog 2021-10-01 20:44:40.000000000 +0000 +++ 1:3.0.8.2-6.1ubuntu1/debian/changelog 2022-01-17 16:36:46.000000000 +0000 @@ -1,3 +1,15 @@ +argus-clients (1:3.0.8.2-6.1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. + (LP #1863026) + [Forwarded upstream and updated DEP3 header] + * Dropped delta, applied upstream: + - debian/patch/check-libtirpc.diff + * Fixes FTBFS with autoconf 2.70+ + + -- Lukas Märdian Mon, 17 Jan 2022 17:36:46 +0100 + argus-clients (1:3.0.8.2-6.1) unstable; urgency=medium * Non-maintainer upload. @@ -13,6 +25,22 @@ argus-clients (1:3.0.8.2-6.1) unstable; -- Boyuan Yang Fri, 01 Oct 2021 16:44:40 -0400 +argus-clients (1:3.0.8.2-6ubuntu3) hirsute; urgency=medium + + * Fix FTBFS + - debian/patch/check-libtirpc.diff: link to and include tirpc headers. + + -- Tiago Stürmer Daitx Tue, 12 Jan 2021 21:46:28 +0000 + +argus-clients (1:3.0.8.2-6ubuntu1) groovy; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. + (LP #1863026) + [Forwarded upstream and updated DEP3 header] + + -- Andreas Hasenack Mon, 10 Aug 2020 09:59:22 -0300 + argus-clients (1:3.0.8.2-6) unstable; urgency=low * Fix FTBFS with gcc-10 (Closes: #957004) @@ -21,6 +49,13 @@ argus-clients (1:3.0.8.2-6) unstable; ur -- Michael Stone Wed, 29 Jul 2020 15:25:38 -0400 +argus-clients (1:3.0.8.2-5ubuntu1) focal; urgency=medium + + * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. + (LP: #1863026) + + -- Andreas Hasenack Wed, 12 Feb 2020 19:47:54 -0300 + argus-clients (1:3.0.8.2-5) unstable; urgency=low * update debhelper dependencies diff -pruN 1:3.0.8.2-6.1/debian/control 1:3.0.8.2-6.1ubuntu1/debian/control --- 1:3.0.8.2-6.1/debian/control 2021-10-01 20:06:01.000000000 +0000 +++ 1:3.0.8.2-6.1ubuntu1/debian/control 2020-08-10 12:59:22.000000000 +0000 @@ -1,7 +1,8 @@ Source: argus-clients Section: utils Priority: optional -Maintainer: Michael Stone +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Michael Stone Build-Depends: debhelper (>= 12), libreadline-dev, zlib1g-dev, libpcre3-dev, bison, flex, libncurses5-dev, libwrap0-dev, libsasl2-dev, libgeoip-dev, default-libmysqlclient-dev Standards-Version: 4.5.0 Homepage: http://qosient.com/argus diff -pruN 1:3.0.8.2-6.1/debian/patches/mysql8_my_bool.patch 1:3.0.8.2-6.1ubuntu1/debian/patches/mysql8_my_bool.patch --- 1:3.0.8.2-6.1/debian/patches/mysql8_my_bool.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.0.8.2-6.1ubuntu1/debian/patches/mysql8_my_bool.patch 2020-08-10 12:59:22.000000000 +0000 @@ -0,0 +1,43 @@ +Description: Reintroduce my_bool to fix build with MySQL 8 +Author: Andreas Hasenack +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026 +Forwarded: Forwarded: https://lists.andrew.cmu.edu/mailman/private/argus-info/2020-August/008333.html +Last-Update: 2020-08-10 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff --git a/examples/ramysql/rasql.c b/examples/ramysql/rasql.c +index 3d49ee8..fc55776 100644 +--- a/examples/ramysql/rasql.c ++++ b/examples/ramysql/rasql.c +@@ -57,6 +57,7 @@ + #include + + #include ++typedef bool my_bool; + + char *RaDatabase = NULL; + char **RaTables = NULL; +diff --git a/examples/ramysql/rasqlinsert.c b/examples/ramysql/rasqlinsert.c +index 2772c9c..6c4d37c 100644 +--- a/examples/ramysql/rasqlinsert.c ++++ b/examples/ramysql/rasqlinsert.c +@@ -71,6 +71,7 @@ int ArgusTotalSelectSQLStatements = 0; + #include + + #include ++typedef bool my_bool; + + char *RaDatabase = NULL; + char **RaTables = NULL; +diff --git a/examples/ramysql/rasqltimeindex.c b/examples/ramysql/rasqltimeindex.c +index 16cbdfe..8fd81b6 100644 +--- a/examples/ramysql/rasqltimeindex.c ++++ b/examples/ramysql/rasqltimeindex.c +@@ -54,6 +54,7 @@ + #include + + #include ++typedef bool my_bool; + + #include + diff -pruN 1:3.0.8.2-6.1/debian/patches/series 1:3.0.8.2-6.1ubuntu1/debian/patches/series --- 1:3.0.8.2-6.1/debian/patches/series 2021-10-01 20:36:27.000000000 +0000 +++ 1:3.0.8.2-6.1ubuntu1/debian/patches/series 2022-01-17 16:36:06.000000000 +0000 @@ -3,5 +3,6 @@ man-warnings.diff zstd-support.diff rabins-path.diff gcc10ftbfs.diff +mysql8_my_bool.patch check-libtirpc.diff 0007-Fix-autoconf-2.70-build.patch