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

Proposed by Rafael David Tinoco
Status: Merged
Merge reported by: Rafael David Tinoco
Merged at revision: 17e9b5454a6f074f486e837f46160f5e7ba55258
Proposed branch: ~rafaeldtinoco/ubuntu/+source/cacti:lp1863739-focal
Merge into: ubuntu/+source/cacti:debian/sid
Diff against target: 160 lines (+94/-4)
6 files modified
debian/README.Debian (+8/-3)
debian/cacti.config (+1/-0)
debian/changelog (+38/-0)
debian/control (+2/-1)
debian/patches/general-instructions-no-auto-create-user.patch (+44/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Graham Inggs Pending
Canonical Server MOTU reviewers Pending
Canonical Server Core Reviewers Pending
Canonical Server Pending
Review via email: mp+379397@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :

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.
"""

Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :

$ 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/README.Debian b/debian/README.Debian
2index 13220d4..ce92a33 100644
3--- a/debian/README.Debian
4+++ b/debian/README.Debian
5@@ -11,9 +11,14 @@ cacti for Debian
6 and load up the cacti skeleton. Assuming you chose a database and
7 user both named 'cacti' and your database is on localhost:
8
9- mysql -u root -p -e "create database cacti"
10- mysql -u root -p -e "grant all privileges on cacti.* to cacti@localhost identified by 'yourpasswordhere'; flush privileges"
11- cat /usr/share/doc/cacti/cacti.sql | mysql -u cacti -p cacti
12+ mysql -u root (-p) -e "create database cacti"
13+ mysql -u root (-p) -e "create user 'cacti'@'localhost';"
14+ mysql -u root (-p) -e "alter user 'cacti'@'localhost' identified with 'sha256_password';
15+ mysql -u root (-p) -e "alter user 'cacti'@'localhost' identified by 'yourpasswordhere';"
16+ mysql -u root (-p) -e "grant all privileges on cacti.* to 'cacti'@'localhost';"
17+ mysql -u root (-p) -e "flush privileges;"
18+
19+ cat /usr/share/doc/cacti/cacti.sql | mysql -u cacti -p cacti
20
21 Next, go to http://$yourhost/cacti/, and follow the on-screen directions.
22 The default login/password is admin/admin.
23diff --git a/debian/cacti.config b/debian/cacti.config
24index 3d5b0a2..a1ffaa2 100644
25--- a/debian/cacti.config
26+++ b/debian/cacti.config
27@@ -13,6 +13,7 @@ if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
28 dbc_first_version="0.8.6g-3"
29 dbc_load_include="php:/etc/cacti/debian.php"
30 dbc_load_include_args="--dbname=database_default --dbpass=database_password --dbuser=database_username --dbserver=database_hostname --dbport=database_port"
31+ dbc_authplugin="sha256_password"
32 dbc_go cacti $@
33 fi
34
35diff --git a/debian/changelog b/debian/changelog
36index b8e4887..81e2743 100644
37--- a/debian/changelog
38+++ b/debian/changelog
39@@ -1,3 +1,16 @@
40+cacti (1.2.9+ds1-1ubuntu1) focal; urgency=medium
41+
42+ * Merge with Debian unstable (LP: #1863739). Remaining changes:
43+ - General installing instructions update for NO_AUTO_CREATE_USER.
44+ - Use new dbconfig "dbc_authplugin" variable to mitigate MySQL 8 issues.
45+ * Dropped changes [upstream]:
46+ - MySQL 8 change needs: NO_AUTO_CREATE_USER and grouping keyword.
47+ * Dropped changes [debian]:
48+ - Replace php-php-gettext dependency in order to fix translations
49+ (LP #1844070)
50+
51+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Tue, 18 Feb 2020 13:28:26 +0000
52+
53 cacti (1.2.9+ds1-1) unstable; urgency=medium
54
55 * New upstream version 1.2.9+ds1
56@@ -60,6 +73,31 @@ cacti (1.2.6+ds1-1) unstable; urgency=medium
57
58 -- Paul Gevers <elbrus@debian.org> Thu, 05 Sep 2019 17:47:08 +0200
59
60+cacti (1.2.4+ds1-2ubuntu3) eoan; urgency=medium
61+
62+ * Replace php-php-gettext dependency in order to fix translations
63+ (LP: #1844070)
64+
65+ -- Graham Inggs <ginggs@ubuntu.com> Thu, 19 Sep 2019 10:30:52 +0000
66+
67+cacti (1.2.4+ds1-2ubuntu2) eoan; urgency=medium
68+
69+ * Fix CREATE FUNCTION errors if binary logging is enabled:
70+ - d/p/MySQL-8-change-needs-NO_AUTO_CREATE_USER_and_groupin.patch
71+ - d/cacti.admin.sql
72+ - d/cacti.admin.rm.sql
73+
74+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Fri, 09 Aug 2019 06:10:31 +0000
75+
76+cacti (1.2.4+ds1-2ubuntu1) eoan; urgency=medium
77+
78+ * Fixes for MySQL upstream updates. (Closes: #933683)
79+ - General installing instructions update for NO_AUTO_CREATE_USER.
80+ - Use new dbconfig "dbc_authplugin" variable to mitigate MySQL 8 issues.
81+ - Debian Instructions have to contain workaround for NO_AUTO_CREATE_USER.
82+
83+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Thu, 08 Aug 2019 09:42:54 -0300
84+
85 cacti (1.2.4+ds1-2) unstable; urgency=medium
86
87 * tests: add new IMPORT messages to ignore filter
88diff --git a/debian/control b/debian/control
89index a60b9ea..3433974 100644
90--- a/debian/control
91+++ b/debian/control
92@@ -1,7 +1,8 @@
93 Source: cacti
94 Section: web
95 Priority: optional
96-Maintainer: Cacti Maintainer <pkg-cacti-maint@lists.alioth.debian.org>
97+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
98+XSBC-Original-Maintainer: Cacti Maintainer <pkg-cacti-maint@lists.alioth.debian.org>
99 Uploaders: Paul Gevers <elbrus@debian.org>
100 Build-Depends: debhelper (>= 11~),
101 dh-linktree (>=0.5~),
102diff --git a/debian/patches/general-instructions-no-auto-create-user.patch b/debian/patches/general-instructions-no-auto-create-user.patch
103new file mode 100644
104index 0000000..6f75dc4
105--- /dev/null
106+++ b/debian/patches/general-instructions-no-auto-create-user.patch
107@@ -0,0 +1,44 @@
108+From cbb63ddf62e01dfb8f9df81de8f087764bceecc3 Mon Sep 17 00:00:00 2001
109+From: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
110+Date: Fri, 9 Aug 2019 16:25:49 +0000
111+Subject: [PATCH] General installing instructions update for
112+ NO_AUTO_CREATE_USER
113+
114+After MySQL 8 started using NO_AUTO_CREATE_USER by default, the general
115+installing instructions need update to instruct one on how to proper
116+create the user separately from the ALTER SQL command given by example.
117+
118+Signed-off-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
119+
120+Author: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
121+Forwarded: https://salsa.debian.org/cacti-team/cacti/merge_requests/1
122+Bug: https://github.com/Cacti/cacti/issues/2872
123+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=933683
124+---
125+ docs-source/General-Installing-Instructions.md | 10 +++++++---
126+ 1 file changed, 7 insertions(+), 3 deletions(-)
127+
128+diff --git a/docs-source/General-Installing-Instructions.md b/docs-source/General-Installing-Instructions.md
129+index bc2c765..4d5ffcd 100644
130+--- a/docs-source/General-Installing-Instructions.md
131++++ b/docs-source/General-Installing-Instructions.md
132+@@ -250,9 +250,13 @@ back into rotation.
133+
134+ ```sql
135+ shell> mysql --user=root mysql
136+- MySQL> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
137+- MySQL> GRANT SELECT ON mysql.time_zone_name TO cactiuser@localhost IDENTIFIED BY 'somepassword';
138+- MySQL> flush privileges;
139++ mysql> CREATE DATABASE cacti
140++ mysql> CREATE USER 'cacti'@'localhost';
141++ mysql> ALTER USER 'cacti'@'localhost' IDENTIFIED WITH 'sha256_password';
142++ mysql> ALTER USER 'cacti'@'localhost' IDENTIFIED BY 'somepassword';
143++ mysql> GRANT ALL PRIVILEGES ON cacti.* to 'cacti'@'localhost';
144++ mysql> GRANT SELECT ON mysql.time_zone_name TO 'cacti'@'localhost';
145++ mysql> FLUSH PRIVILEGES;
146+ ```
147+
148+ Note that if your `root` (or equivalent) user does not have `SUPER` permissions,
149+--
150+2.20.1
151+
152diff --git a/debian/patches/series b/debian/patches/series
153index 9635522..75b7da0 100644
154--- a/debian/patches/series
155+++ b/debian/patches/series
156@@ -2,3 +2,4 @@
157 enable-system-jqueryui-by-putting-cacti-changes-in-main.css.patch
158 perl-path.patch
159 font-awesome-path.patch
160+general-instructions-no-auto-create-user.patch

Subscribers

People subscribed via source and target branches