Merge ~ahasenack/ubuntu/+source/argus-clients:groovy-argus-clients-merge into ubuntu/+source/argus-clients:debian/sid

[Andreas Hasenack]

Merge from debian. We still have to keep the my_bool patch. I browsed upstream's site, but couldn't find a git repo or bugtracker, just a mention of using the mailing list, so I sent the patch there.

The mailing list has a private archive, so the link I added to the patch won't work unless you are a subscriber.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/argus-merge/

[Christian Ehrhardt  (paelzer)]

Thank you for the effort of trying to get it upstream - these changes easily enough become "carried forever" :-)

The merge LGTM and gladly it isn't a lot of Delta.

review: Approve

8dc0d13... by Andreas Hasenack on 2020-08-10

merge-changelogs

558a246... by Andreas Hasenack on 2020-08-10

reconstruct-changelog

7e9dce9... by Andreas Hasenack on 2020-08-10

update-maintainer

[Andreas Hasenack (ahasenack)]

I went a bit of back and forth between the original patch, and something upstream just proposed, but turns out that proposal doesn't work correctly, so I'm back to the original patch now, and will upload that.

[Andreas Hasenack (ahasenack)]

Tagging and uploading 7e9dce9a63c37bcb95c928640861a4d0a9b933e5

$ git push pkg upload/1%3.0.8.2-6ubuntu1
Enumerating objects: 25, done.
Counting objects: 100% (25/25), done.
Delta compression using up to 4 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (19/19), 2.60 KiB | 380.00 KiB/s, done.
Total 19 (delta 13), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/argus-clients
 * [new tag] upload/1%3.0.8.2-6ubuntu1 -> upload/1%3.0.8.2-6ubuntu1

$ dput ubuntu ../argus-clients_3.0.8.2-6ubuntu1_source.changes
Checking signature on .changes
gpg: ../argus-clients_3.0.8.2-6ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../argus-clients_3.0.8.2-6ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading argus-clients_3.0.8.2-6ubuntu1.dsc: done.
  Uploading argus-clients_3.0.8.2.orig.tar.gz: done.
  Uploading argus-clients_3.0.8.2-6ubuntu1.debian.tar.xz: done.
  Uploading argus-clients_3.0.8.2-6ubuntu1_source.buildinfo: done.
  Uploading argus-clients_3.0.8.2-6ubuntu1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

merged
 argus-clients | 1:3.0.8.2-6ubuntu1 | groovy/universe | source

diff --git a/debian/changelog b/debian/changelog
index 5a1c721..4ce5807 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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 <[e-mail]>  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)
@@ -6,6 +15,13 @@ argus-clients (1:3.0.8.2-6) unstable; urgency=low
 
  -- Michael Stone <[e-mail]>  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 <[e-mail]>  Wed, 12 Feb 2020 19:47:54 -0300
+
 argus-clients (1:3.0.8.2-5) unstable; urgency=low
 
   * update debhelper dependencies
diff --git a/debian/control b/debian/control
index a5af89d..879242d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: argus-clients
 Section: utils
 Priority: optional
-Maintainer: Michael Stone <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Michael Stone <[e-mail]>
 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 --git a/debian/patches/mysql8_my_bool.patch b/debian/patches/mysql8_my_bool.patch
new file mode 100644
index 0000000..719d736
--- /dev/null
+++ b/debian/patches/mysql8_my_bool.patch
@@ -0,0 +1,43 @@
+Description: Reintroduce my_bool to fix build with MySQL 8
+Author: Andreas Hasenack <[e-mail]>
+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 <rasplit.h>
+  
+ #include <mysql.h>
++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 <sys/socket.h>
+ 
+ #include <mysql.h>
++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 <sys/socket.h>
+  
+ #include <mysql.h>
++typedef bool my_bool;
+ 
+ #include <rasqltimeindex.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9fc5dbe..cd8cd95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ man-warnings.diff
 zstd-support.diff
 rabins-path.diff
 gcc10ftbfs.diff
+mysql8_my_bool.patch