Merge ~ahasenack/ubuntu/+source/cacti:focal-cacti-32bit-dep8-failure into ubuntu/+source/cacti:ubuntu/devel

[Andreas Hasenack]

Bileto ticket: https://bileto.ubuntu.com/#/ticket/3960

Fix netmask calculation on armhf (32bits).

To test:

sudo apt install php-cli
php -a

Original code:
64bits:
php > $range = 24;
php > var_dump(bindec(str_repeat("1", $range) . str_repeat("0", 32-$range)));
int(4294967040) <--- it's an int!
php > var_dump(long2ip(4294967040));
string(13) "255.255.255.0"

32bits:
php > $range = 24;
php > var_dump(bindec(str_repeat("1", $range) . str_repeat("0", 32-$range)));
float(4294967040) <-- it's a float!
php > var_dump(long2ip(4294967040));
PHP Warning: long2ip() expects parameter 1 to be int, float given in php shell code on line 1
NULL

new code, 32bits:
php > $range = 24;
php > var_dump(long2ip((2**$range-1) << (32-$range)));
string(13) "255.255.255.0"

new code, 64bits:
php > $range = 24;
php > var_dump(long2ip((2**$range-1) << (32-$range)));
string(13) "255.255.255.0"
php >

Same results on armhf, amd64, ppc64el, s390x, arm64.

[Christian Ehrhardt  (paelzer)]

Changelog good
Patch good
Upstreaming good (ongoing still)
Fix works as expected

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading 4b05e01490f95a587a95b1a3bf63fba16e42d6d7

$ git push pkg upload/1.2.9+ds1-1ubuntu2
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 4 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.83 KiB | 170.00 KiB/s, done.
Total 11 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/cacti
 * [new tag] upload/1.2.9+ds1-1ubuntu2 -> upload/1.2.9+ds1-1ubuntu2

$ dput ubuntu ../cacti_1.2.9+ds1-1ubuntu2_source.changes
Checking signature on .changes
gpg: ../cacti_1.2.9+ds1-1ubuntu2_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../cacti_1.2.9+ds1-1ubuntu2.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading cacti_1.2.9+ds1-1ubuntu2.dsc: done.
  Uploading cacti_1.2.9+ds1-1ubuntu2.debian.tar.xz: done.
  Uploading cacti_1.2.9+ds1-1ubuntu2_source.buildinfo: done.
  Uploading cacti_1.2.9+ds1-1ubuntu2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 81e2743..31d67b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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:
diff --git a/debian/patches/fix-32bit-ip-conversion.patch b/debian/patches/fix-32bit-ip-conversion.patch
new file mode 100644
index 0000000..9262eee
--- /dev/null
+++ b/debian/patches/fix-32bit-ip-conversion.patch
@@ -0,0 +1,25 @@
+Description: Fix 32bit netmask generation
+ bindec() may return a float instead of an int if needed, see
+ https://www.php.net/manual/en/function.bindec.php. For IP netmasks, which is
+ what it is being used for here, this happens almost always on 32bit
+ architectures, in which case long2ip() will fail, as it only takes an int.
+Author: Andreas Hasenack <[e-mail]>
+Bug: https://github.com/Cacti/cacti/issues/3310
+Bug-Ubuntu: https://bugs.launchpad.net/cacti/+bug/1865067
+Forwarded: https://github.com/Cacti/cacti/pull/3311
+Last-Update: 2020-03-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/lib/api_automation.php b/lib/api_automation.php
+index a1373af08..b9fffbeeb 100644
+--- a/lib/api_automation.php
++++ b/lib/api_automation.php
+@@ -3003,7 +3003,7 @@ function automation_get_valid_mask($range) {
+ 			$cidr = $range;
+ 			$mask = array(
+ 				'cidr' => $cidr,
+-				'subnet' => long2ip(bindec(str_repeat('1',$range) . str_repeat('0',32-$range))));
++				'subnet' => long2ip((2**$range-1) << (32-$range)));
+ 		} else {
+ 			$mask = false;
+ 		}
diff --git a/debian/patches/series b/debian/patches/series
index 75b7da0..541367e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,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
+fix-32bit-ip-conversion.patch