Merge ~athos-ribeiro/ubuntu/+source/cacti:merge-lp1972833-kinetic into ubuntu/+source/cacti:debian/sid

[Athos Ribeiro]

[Athos Ribeiro (athos-ribeiro)]

Merge cacti from Debian unstable for kinetic (LP: #1972833)

A PPA with the proposed merge is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/cacti-lp1972833-kinetic/+packages

The autopkgtest suite fail due to the issues (partially) addressed in the package delta. This is not a regression, as observed in https://autopkgtest.ubuntu.com/packages/c/cacti/jammy/amd64

[Bryce Harrington (bryce)]

Looks like the delta already was forwarded by Rafael but has not moved ahead since then. So, carrying the changes forward another release is fine. LGTM, +1.

Sounds like debian / upstream aren't opposed to the changes, just haven't picked them up. Some day might be worth looping back into that discussion.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Bryce!

Uploaded

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 7c07282..2cc00c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cacti (1.2.20+ds1-2ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1972833). Remaining changes:
+    - General installing instructions update for NO_AUTO_CREATE_USER.
+    - Use new dbconfig "dbc_authplugin" variable to mitigate MySQL 8 issues.
+
+ -- Athos Ribeiro <[e-mail]>  Tue, 10 May 2022 10:03:33 -0300
+
 cacti (1.2.20+ds1-2) unstable; urgency=medium
 
   * Revert "Replace dependency on libjs-d3 by node-d3" (Opens: #913385)
@@ -24,6 +32,15 @@ cacti (1.2.20+ds1-1) unstable; urgency=medium
 
  -- Paul Gevers <[e-mail]>  Thu, 14 Apr 2022 10:16:39 +0200
 
+cacti (1.2.19+ds1-2ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable. (LP: #1964653)
+    Remaining changes:
+    - General installing instructions update for NO_AUTO_CREATE_USER.
+    - Use new dbconfig "dbc_authplugin" variable to mitigate MySQL 8 issues.
+
+ -- Bryce Harrington <[e-mail]>  Thu, 10 Mar 2022 18:27:38 -0800
+
 cacti (1.2.19+ds1-2) unstable; urgency=medium
 
   * Support cacti on PHP8.1 by incorporating upstream patches
@@ -46,6 +63,21 @@ cacti (1.2.19+ds1-1) unstable; urgency=medium
 
  -- Paul Gevers <[e-mail]>  Mon, 22 Nov 2021 20:30:48 +0100
 
+cacti (1.2.16+ds1-2ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - General installing instructions update for NO_AUTO_CREATE_USER.
+    - Use new dbconfig "dbc_authplugin" variable to mitigate MySQL 8 issues.
+  * Dropped:
+    - d/p/fix-32bit-ip-conversion.patch: fix netmask generation on 32bit
+      architectures (LP #1865067)
+      [Fixed in 1.2.11]
+    - d/p/0001-PHP-7.4-Array-and-string-offset-access-syntax-with-c.patch
+      + Fix deprecated curly bracket style syntax
+      [Fixed in 1.2.11]
+
+ -- Bryce Harrington <[e-mail]>  Wed, 20 Jan 2021 12:17:39 -0800
+
 cacti (1.2.16+ds1-2) unstable; urgency=medium
 
   * Add 0001-Fixing-Issue-4022.patch (Closes: #979998)
@@ -113,6 +145,20 @@ cacti (1.2.11+ds1-1) unstable; urgency=medium
 
  -- Paul Gevers <[e-mail]>  Tue, 07 Apr 2020 22:22:16 +0200
 
+cacti (1.2.10+ds1-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - General installing instructions update for NO_AUTO_CREATE_USER.
+      (refreshed when merging with debian 1.2.9+ds1-1)
+    - Use new dbconfig "dbc_authplugin" variable to mitigate MySQL 8 issues.
+      (refreshed when merging with debian 1.2.9+ds1-1)
+    - d/p/fix-32bit-ip-conversion.patch: fix netmask generation on 32bit
+      architectures (LP #1865067)
+  * d/p/0001-PHP-7.4-Array-and-string-offset-access-syntax-with-c.patch
+    - Fix deprecated curly bracket style syntax
+
+ -- Bryce Harrington <[e-mail]>  Mon, 23 Mar 2020 22:08:43 +0000
+
 cacti (1.2.10+ds1-1) unstable; urgency=medium
 
   * New upstream version 1.2.10
@@ -122,6 +168,26 @@ cacti (1.2.10+ds1-1) unstable; urgency=medium
 
  -- Paul Gevers <[e-mail]>  Sun, 08 Mar 2020 21:26:46 +0100
 
+cacti (1.2.9+ds1-1ubuntu2) focal; urgency=medium
+
+  * d/p/fix-32bit-ip-conversion.patch: fix netmask generation on 32bit
+    architectures (LP: #1865067)
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 02 Mar 2020 14:52:15 -0300
+
+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
@@ -184,6 +250,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 6e2070f..b66c1e1 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-compat (= 13),
                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..208b5bd
--- /dev/null
+++ b/debian/patches/general-instructions-no-auto-create-user.patch
@@ -0,0 +1,39 @@
+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(-)
+
+--- a/docs-source/General-Installing-Instructions.md
++++ b/docs-source/General-Installing-Instructions.md
+@@ -251,9 +251,13 @@
+ 
+    ```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,
diff --git a/debian/patches/series b/debian/patches/series
index abb272a..ee07943 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,6 @@ update-check_all_pages-for-1.2.20.patch
 prevent-errors-while-editing-new-users.patch
 0001-push_out_hosts.php-is-missing-its-header.patch
 fix-CRLF-line-ends.patch
+
+# Ubuntu patches:
+general-instructions-no-auto-create-user.patch