Merge ~rafaeldtinoco/ubuntu/+source/cacti:lp1863739-focal into ubuntu/+source/cacti:debian/sid

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/cacti/+bug/1863739
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1863739

[Rafael David Tinoco (rafaeldtinoco)]

I got this reviewed by @ginggs and comments were given in the LP bug:

"""
I think the only change needed is to mention in the changelog that the 'Replace php-php-gettext dependency' change was dropped.
"""

[Rafael David Tinoco (rafaeldtinoco)]

$ git push -f rafaeldtinoco lp1863739-focal
Enumerating objects: 12, done.
Counting objects: 100% (12/12), done.
Delta compression using up to 8 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 1.03 KiB | 211.00 KiB/s, done.
Total 8 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~rafaeldtinoco/ubuntu/+source/cacti
 + 14a2ccf...17e9b54 lp1863739-focal -> lp1863739-focal (forced update)

$ dput ubuntu cacti_1.2.9+ds1-1ubuntu1_source.changes
Checking signature on .changes
gpg: /home/rafaeldtinoco/work/sources/ubuntu/cacti_1.2.9+ds1-1ubuntu1_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: /home/rafaeldtinoco/work/sources/ubuntu/cacti_1.2.9+ds1-1ubuntu1.dsc: Valid signature from A93E0E0AD83C0D0F
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 cacti_1.2.9+ds1-1ubuntu1.dsc: done.
  Uploading cacti_1.2.9+ds1.orig-docs-source.tar.gz: done.
  Uploading cacti_1.2.9+ds1.orig.tar.gz: done.
  Uploading cacti_1.2.9+ds1-1ubuntu1.debian.tar.xz: done.
  Uploading cacti_1.2.9+ds1-1ubuntu1_source.buildinfo: done.
  Uploading cacti_1.2.9+ds1-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/README.Debian b/debian/README.Debian
index 13220d4..ce92a33 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,9 +11,14 @@ cacti for Debian
   and load up the cacti skeleton. Assuming you chose a database and
   user both named 'cacti' and your database is on localhost:
 
-  mysql -u root -p -e "create database cacti"
-  mysql -u root -p -e "grant all privileges on cacti.* to cacti@localhost identified by 'yourpasswordhere'; flush privileges"
-  cat /usr/share/doc/cacti/cacti.sql | mysql -u cacti -p cacti 
+  mysql -u root (-p) -e "create database cacti"
+  mysql -u root (-p) -e "create user 'cacti'@'localhost';"
+  mysql -u root (-p) -e "alter user 'cacti'@'localhost' identified with 'sha256_password';
+  mysql -u root (-p) -e "alter user 'cacti'@'localhost' identified by 'yourpasswordhere';"
+  mysql -u root (-p) -e "grant all privileges on cacti.* to 'cacti'@'localhost';"
+  mysql -u root (-p) -e "flush privileges;"
+
+  cat /usr/share/doc/cacti/cacti.sql | mysql -u cacti -p cacti
 
   Next, go to http://$yourhost/cacti/, and follow the on-screen directions.
   The default login/password is admin/admin.
diff --git a/debian/cacti.config b/debian/cacti.config
index 3d5b0a2..a1ffaa2 100644
--- a/debian/cacti.config
+++ b/debian/cacti.config
@@ -13,6 +13,7 @@ if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
 	dbc_first_version="0.8.6g-3"
 	dbc_load_include="php:/etc/cacti/debian.php"
 	dbc_load_include_args="--dbname=database_default --dbpass=database_password --dbuser=database_username --dbserver=database_hostname --dbport=database_port"
+	dbc_authplugin="sha256_password"
 	dbc_go cacti $@
 fi
 
diff --git a/debian/changelog b/debian/changelog
index b8e4887..81e2743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+cacti (1.2.9+ds1-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable (LP: #1863739). Remaining changes:
+    - General installing instructions update for NO_AUTO_CREATE_USER.
+    - Use new dbconfig "dbc_authplugin" variable to mitigate MySQL 8 issues.
+  * Dropped changes [upstream]:
+    - MySQL 8 change needs: NO_AUTO_CREATE_USER and grouping keyword.
+  * Dropped changes [debian]:
+    - Replace php-php-gettext dependency in order to fix translations
+      (LP #1844070)
+
+ -- Rafael David Tinoco <[e-mail]>  Tue, 18 Feb 2020 13:28:26 +0000
+
 cacti (1.2.9+ds1-1) unstable; urgency=medium
 
   * New upstream version 1.2.9+ds1
@@ -60,6 +73,31 @@ cacti (1.2.6+ds1-1) unstable; urgency=medium
 
  -- Paul Gevers <[e-mail]>  Thu, 05 Sep 2019 17:47:08 +0200
 
+cacti (1.2.4+ds1-2ubuntu3) eoan; urgency=medium
+
+  * Replace php-php-gettext dependency in order to fix translations
+    (LP: #1844070)
+
+ -- Graham Inggs <[e-mail]>  Thu, 19 Sep 2019 10:30:52 +0000
+
+cacti (1.2.4+ds1-2ubuntu2) eoan; urgency=medium
+
+  * Fix CREATE FUNCTION errors if binary logging is enabled:
+    - d/p/MySQL-8-change-needs-NO_AUTO_CREATE_USER_and_groupin.patch
+    - d/cacti.admin.sql
+    - d/cacti.admin.rm.sql
+
+ -- Rafael David Tinoco <[e-mail]>  Fri, 09 Aug 2019 06:10:31 +0000
+
+cacti (1.2.4+ds1-2ubuntu1) eoan; urgency=medium
+
+  * Fixes for MySQL upstream updates. (Closes: #933683)
+    - General installing instructions update for NO_AUTO_CREATE_USER.
+    - Use new dbconfig "dbc_authplugin" variable to mitigate MySQL 8 issues.
+    - Debian Instructions have to contain workaround for NO_AUTO_CREATE_USER.
+
+ -- Rafael David Tinoco <[e-mail]>  Thu, 08 Aug 2019 09:42:54 -0300
+
 cacti (1.2.4+ds1-2) unstable; urgency=medium
 
   * tests: add new IMPORT messages to ignore filter
diff --git a/debian/control b/debian/control
index a60b9ea..3433974 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: cacti
 Section: web
 Priority: optional
-Maintainer: Cacti Maintainer <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Cacti Maintainer <[e-mail]>
 Uploaders: Paul Gevers <[e-mail]>
 Build-Depends: debhelper (>= 11~),
                dh-linktree (>=0.5~),
diff --git a/debian/patches/general-instructions-no-auto-create-user.patch b/debian/patches/general-instructions-no-auto-create-user.patch
new file mode 100644
index 0000000..6f75dc4
--- /dev/null
+++ b/debian/patches/general-instructions-no-auto-create-user.patch
@@ -0,0 +1,44 @@
+From cbb63ddf62e01dfb8f9df81de8f087764bceecc3 Mon Sep 17 00:00:00 2001
+From: Rafael David Tinoco <[e-mail]>
+Date: Fri, 9 Aug 2019 16:25:49 +0000
+Subject: [PATCH] General installing instructions update for
+ NO_AUTO_CREATE_USER
+
+After MySQL 8 started using NO_AUTO_CREATE_USER by default, the general
+installing instructions need update to instruct one on how to proper
+create the user separately from the ALTER SQL command given by example.
+
+Signed-off-by: Rafael David Tinoco <[e-mail]>
+
+Author: Rafael David Tinoco <[e-mail]>
+Forwarded: https://salsa.debian.org/cacti-team/cacti/merge_requests/1
+Bug: https://github.com/Cacti/cacti/issues/2872
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=933683
+---
+ docs-source/General-Installing-Instructions.md | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/docs-source/General-Installing-Instructions.md b/docs-source/General-Installing-Instructions.md
+index bc2c765..4d5ffcd 100644
+--- a/docs-source/General-Installing-Instructions.md
++++ b/docs-source/General-Installing-Instructions.md
+@@ -250,9 +250,13 @@ back into rotation.
+ 
+    ```sql
+    shell> mysql --user=root mysql
+-   MySQL> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
+-   MySQL> GRANT SELECT ON mysql.time_zone_name TO cactiuser@localhost IDENTIFIED BY 'somepassword';
+-   MySQL> flush privileges;
++   mysql> CREATE DATABASE cacti
++   mysql> CREATE USER 'cacti'@'localhost';
++   mysql> ALTER USER 'cacti'@'localhost' IDENTIFIED WITH 'sha256_password';
++   mysql> ALTER USER 'cacti'@'localhost' IDENTIFIED BY 'somepassword';
++   mysql> GRANT ALL PRIVILEGES ON cacti.* to 'cacti'@'localhost';
++   mysql> GRANT SELECT ON mysql.time_zone_name TO 'cacti'@'localhost';
++   mysql> FLUSH PRIVILEGES;
+    ```
+ 
+ Note that if your `root` (or equivalent) user does not have `SUPER` permissions,
+-- 
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 9635522..75b7da0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 enable-system-jqueryui-by-putting-cacti-changes-in-main.css.patch
 perl-path.patch
 font-awesome-path.patch
+general-instructions-no-auto-create-user.patch