Now with debdiff. On 23-07-2019 11:38, Paul Gevers wrote: > After the release of buster, an upgrade issue was reported against > cacti, bug #931702, which has been fixed upstream. I decided to fix two > additional reported issues at the same time, which can cause loss of > functionality when upgrading from stretch.
Paul
diff -Nru cacti-1.2.2+ds1/debian/changelog cacti-1.2.2+ds1/debian/changelog
--- cacti-1.2.2+ds1/debian/changelog 2019-04-09 20:42:38.000000000 +0200
+++ cacti-1.2.2+ds1/debian/changelog 2019-07-16 21:40:32.000000000 +0200
@@ -1,3 +1,15 @@
+cacti (1.2.2+ds1-2+deb10u1) buster; urgency=medium
+
+ * Depends i.s.o. Recommends on php-gmp as this is now a requirement of
+ the upstream code (Closes: #930252)
+ * Fix reading of snmp gauges (0001-Resolving-issue-2474.patch) (Closes:
+ #930254)
+ * Fix upgrade from stretch (0001-Resolving-issue-2482.patch); the
+ upgrade code attempted to drop a non-existing primary key (Closes:
+ #931702)
+
+ -- Paul Gevers <elb...@debian.org> Tue, 16 Jul 2019 21:40:32 +0200
+
cacti (1.2.2+ds1-2) unstable; urgency=medium
* Add 0001-Resolving-Issue-2581.patch from upstream (Closes: #926700)
diff -Nru cacti-1.2.2+ds1/debian/control cacti-1.2.2+ds1/debian/control
--- cacti-1.2.2+ds1/debian/control 2019-04-09 20:36:27.000000000 +0200
+++ cacti-1.2.2+ds1/debian/control 2019-07-16 20:47:33.000000000 +0200
@@ -43,6 +43,7 @@
php-cli,
php-gd,
php-json,
+ php-gmp,
php-ldap,
php-mbstring,
php-mysql,
@@ -60,7 +61,6 @@
default-mysql-server | virtual-mysql-server,
inetutils-ping | iputils-ping,
logrotate,
- php-gmp,
Suggests: cacti-spine,
moreutils,
snmpd,
diff -Nru cacti-1.2.2+ds1/debian/patches/0001-Resolving-issue-2474.patch
cacti-1.2.2+ds1/debian/patches/0001-Resolving-issue-2474.patch
--- cacti-1.2.2+ds1/debian/patches/0001-Resolving-issue-2474.patch
1970-01-01 01:00:00.000000000 +0100
+++ cacti-1.2.2+ds1/debian/patches/0001-Resolving-issue-2474.patch
2019-07-16 21:35:29.000000000 +0200
@@ -0,0 +1,25 @@
+From a32dfb6a8f921e93d667119caebb33daf7f3decc Mon Sep 17 00:00:00 2001
+From: netniV <net...@hotmail.com>
+Date: Fri, 1 Mar 2019 19:54:39 +0000
+Subject: [PATCH] Resolving issue #2474
+
+REGEXP_SNMP_TRIM does not handle Gauge fields properly
+---
+ CHANGELOG | 1 +
+ lib/snmp.php | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/snmp.php b/lib/snmp.php
+index 4c67feab1..70c0b799c 100644
+--- a/lib/snmp.php
++++ b/lib/snmp.php
+@@ -24,7 +24,7 @@
+ */
+
+ /* trim all but hex-string:, which will return 'hex-' */
+-define('REGEXP_SNMP_TRIM',
'/(counter(32|64):|gauge|gauge(32|64):|float:|ipaddress:|string:|integer:)|(up|down)\(|\)$/i');
++define('REGEXP_SNMP_TRIM',
'/(counter(32|64):|gauge:|gauge(32|64):|float:|ipaddress:|string:|integer:)|(up|down)\(|\)$/i');
+
+ define('SNMP_METHOD_PHP', 1);
+ define('SNMP_METHOD_BINARY', 2);
+
diff -Nru cacti-1.2.2+ds1/debian/patches/0001-Resolving-issue-2482.patch
cacti-1.2.2+ds1/debian/patches/0001-Resolving-issue-2482.patch
--- cacti-1.2.2+ds1/debian/patches/0001-Resolving-issue-2482.patch
1970-01-01 01:00:00.000000000 +0100
+++ cacti-1.2.2+ds1/debian/patches/0001-Resolving-issue-2482.patch
2019-07-16 21:38:12.000000000 +0200
@@ -0,0 +1,25 @@
+From be50141315b1c474cbca33e9ad26cacc0ef9c110 Mon Sep 17 00:00:00 2001
+From: netniV <net...@hotmail.com>
+Date: Mon, 4 Mar 2019 14:54:47 +0000
+Subject: [PATCH] Resolving issue #2482
+
+When upgrading past 1.1.34, upgrade attempts to drop a non-existing primary key
+---
+ CHANGELOG | 1 +
+ install/upgrades/1_1_34.php | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/install/upgrades/1_1_34.php b/install/upgrades/1_1_34.php
+index 2154b0c11..e6a902a9b 100644
+--- a/install/upgrades/1_1_34.php
++++ b/install/upgrades/1_1_34.php
+@@ -244,7 +244,7 @@ function upgrade_to_1_1_34() {
+ db_install_execute('ALTER TABLE `version`
+ MODIFY COLUMN `cacti` char(20) NOT NULL DEFAULT ""');
+
+- db_install_execute('ALTER IGNORE TABLE version DROP PRIMARY KEY');
++ db_install_drop_key('version', 'key', 'PRIMARY');
+
+ db_install_add_key('version', 'key', 'PRIMARY', array('cacti'),
'BTREE');
+ }
+
diff -Nru cacti-1.2.2+ds1/debian/patches/series
cacti-1.2.2+ds1/debian/patches/series
--- cacti-1.2.2+ds1/debian/patches/series 2019-04-09 20:38:14.000000000
+0200
+++ cacti-1.2.2+ds1/debian/patches/series 2019-07-16 21:38:38.000000000
+0200
@@ -3,3 +3,5 @@
perl-path.patch
font-awesome-path.patch
0001-Resolving-Issue-2581.patch
+0001-Resolving-issue-2474.patch
+0001-Resolving-issue-2482.patch
signature.asc
Description: OpenPGP digital signature
