Merge ~ahasenack/ubuntu/+source/frr:focal-frr-fbfs-s390x into ~ahasenack/ubuntu/+source/frr:master

[Andreas Hasenack]

Fix test failure on big endian arches. Patch from upstream. Also submitted to debian at https://salsa.debian.org/Jonathan_Ferguson-guest/frr/merge_requests/1

PPA with test builds: https://launchpad.net/~ahasenack/+archive/ubuntu/frr-ftbfs-390x/

sudo add-apt-repository ppa:ahasenack/frr-ftbfs-390x

[Rafael David Tinoco (rafaeldtinoco)]

Reviewing...

[Andreas Hasenack (ahasenack)]

DEP8 passes locally on s390x with proposed enabled:
(...)
autopkgtest [14:25:10]: test py-frr-reload: - - - - - - - - - - results - - - - - - - - - -
py-frr-reload PASS
autopkgtest [14:25:10]: @@@@@@@@@@@@@@@@@@@@ summary
zebra-lo PASS
bgpd-snmp-rpki PASS
py-frr-reload PASS

real 5m18.977s
user 0m5.176s
sys 0m8.542s

ubuntu@focal-s390x:~/deb/frr$ uname -a
Linux focal-s390x 5.4.0-9-generic #12-Ubuntu SMP Mon Dec 16 22:31:38 UTC 2019 s390x s390x s390x GNU/Linux

[Rafael David Tinoco (rafaeldtinoco)]

- [√] changelog entry correct, targeted to correct codename
- [-] no major upstream changes to consider
- [-] debian changes look safe
- [√] update-maintainer has been run
- [√] changes forwarded upstream/debian (if appropriate)
- [-] nothing else to drop
- [√] patches match what was proposed upstream
- [√] patches correctly included in debian/patches/series?
- [√] patches have correct DEP3 metadata
- [√] verified PPA package installs/uninstalls
- [√] autopkgtest against the PPA package passes

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploading 89ed0969f894940cb8c5d3228b329018c4ba1e91

$ dput ubuntu ../frr_7.2-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../frr_7.2-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../frr_7.2-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading frr_7.2-1ubuntu1.dsc: done.
  Uploading frr_7.2-1ubuntu1.debian.tar.xz: done.
  Uploading frr_7.2-1ubuntu1_source.buildinfo: done.
  Uploading frr_7.2-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This is done.

diff --git a/debian/changelog b/debian/changelog
index b56a9c6..134295b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+frr (7.2-1ubuntu1) focal; urgency=medium
+
+  * d/p/fix-endian-bug-in-test_typelist.patch: fix test
+    failure on big endian.  Thanks to Mark Stapp <[e-mail]>.
+    (LP: #1860733)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 24 Jan 2020 10:53:23 -0300
+
 frr (7.2-1build1) focal; urgency=medium
 
   * Rebuild for libsnmp35.
diff --git a/debian/control b/debian/control
index ab2df20..e204ad7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: frr
 Section: net
 Priority: optional
-Maintainer: David Lamparter <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: David Lamparter <[e-mail]>
 Uploaders: FRRouting-dev <[e-mail]>
 Build-Depends:
  autotools-dev,
diff --git a/debian/patches/fix-endian-bug-in-test_typelist.patch b/debian/patches/fix-endian-bug-in-test_typelist.patch
new file mode 100644
index 0000000..f5863d7
--- /dev/null
+++ b/debian/patches/fix-endian-bug-in-test_typelist.patch
@@ -0,0 +1,48 @@
+From 1dc46d1ece1f0db8dff79957473942f6fff00761 Mon Sep 17 00:00:00 2001
+From: Mark Stapp <[e-mail]>
+Date: Wed, 18 Dec 2019 10:52:08 -0500
+Subject: [PATCH] tests: fix endian bug in test_typelist
+
+Fix a byte-swapping bug that appeared on big-endian arch but
+wasn't visible on little-endian runs.
+
+Signed-off-by: Mark Stapp <[e-mail]>
+
+Origin: upstream, https://github.com/FRRouting/frr/pull/5559/commits/1dc46d1ece1f0db8dff79957473942f6fff00761
+Bug: https://github.com/FRRouting/frr/issues/5557
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/frr/+bug/1860733
+Last-Update: 2020-01-24
+---
+ tests/lib/test_typelist.h | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tests/lib/test_typelist.h b/tests/lib/test_typelist.h
+index f20bbc52d9..9039fa8a46 100644
+--- a/tests/lib/test_typelist.h
++++ b/tests/lib/test_typelist.h
+@@ -98,12 +98,13 @@ static void ts_hash(const char *text, const char *expect)
+ 	unsigned i = 0;
+ 	uint8_t hash[32];
+ 	char hashtext[65];
+-	uint32_t count;
++	uint32_t swap_count, count;
+ 
+-	count = htonl(list_count(&head));
++	count = list_count(&head);
++	swap_count = htonl(count);
+ 
+ 	SHA256_Init(&ctx);
+-	SHA256_Update(&ctx, &count, sizeof(count));
++	SHA256_Update(&ctx, &swap_count, sizeof(swap_count));
+ 
+ 	frr_each (list, &head, item) {
+ 		struct {
+@@ -115,7 +116,7 @@ static void ts_hash(const char *text, const char *expect)
+ 		};
+ 		SHA256_Update(&ctx, &hashitem, sizeof(hashitem));
+ 		i++;
+-		assert(i < count);
++		assert(i <= count);
+ 	}
+ 	SHA256_Final(hash, &ctx);
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..afd1848
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-endian-bug-in-test_typelist.patch