Import Debian changes 2.04-12parrot1

grub2 (2.04-12parrot1) rolling-testing; urgency=medium
.
  * Import new Debian release.
.
grub2 (2.04-12) unstable; urgency=medium
.
  * Cherry-pick from upstream:
    - mdraid1x_linux: Fix gcc10 error -Werror=array-bounds
    - zfs: Fix gcc10 error -Werror=zero-length-bounds
  * Build with GCC 10 (closes: #978515).

debian/.git-dpm

 # see git-dpm(1) from git-dpm package
-50f471964d9b954be2c1fb9bb82e608d657d6fc9
-50f471964d9b954be2c1fb9bb82e608d657d6fc9
+ecb767ebd71a5544ba82b2c4cc86855bab5655eb
+ecb767ebd71a5544ba82b2c4cc86855bab5655eb
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz

debian/changelog

+grub2 (2.04-12parrot1) rolling-testing; urgency=medium
+
+  * Import new Debian release.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@localhost.localdomain>  Sun, 17 Jan 2021 17:10:33 +0100
+
+grub2 (2.04-12) unstable; urgency=medium
+
+  * Cherry-pick from upstream:
+    - mdraid1x_linux: Fix gcc10 error -Werror=array-bounds
+    - zfs: Fix gcc10 error -Werror=zero-length-bounds
+  * Build with GCC 10 (closes: #978515).
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 28 Dec 2020 22:33:23 +0000
+
 grub2 (2.04-11parrot1) rolling-testing; urgency=medium
 
   * Import new Debian release.

debian/control

@@ -2,8 +2,7 @@ Source: grub2
 Section: admin
 Priority: optional
 XSBC-Original-Maintainer: GRUB Maintainers <pkg-grub-devel@alioth-lists.debian.net>
-Maintainer: Parrot Dev Team <team@parrotsec.org>
-Uploaders: Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>
+Maintainer: Kali Developers <devel@kali.org>
 Build-Depends: debhelper-compat (= 10),
  patchutils,
  python3,
@@ -12,8 +11,8 @@ Build-Depends: debhelper-compat (= 10),
  po-debconf,
  help2man,
  texinfo,
- gcc-9,
- gcc-9-multilib [i386 kopensolaris-i386 any-amd64 any-ppc64 any-sparc],
+ gcc-10,
+ gcc-10-multilib [i386 kopensolaris-i386 any-amd64 any-ppc64 any-sparc],
  xfonts-unifont,
  libfreetype6-dev,
  gettext,

debian/gbp.conf

 [DEFAULT]
+debian-branch = kali/master
+debian-tag = kali/%(version)s
 pristine-tar = True
 
 [pq]

debian/kali-ci.yml

+include:
+  - https://gitlab.com/kalilinux/tools/kali-ci-pipeline/raw/master/recipes/kali.yml

debian/patches/mdraid1x-linux-gcc-10.patch

+From 1f3a28894d09af418669940dedb217e97e1f9c83 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Thu, 26 Mar 2020 14:35:34 +0800
+Subject: mdraid1x_linux: Fix gcc10 error -Werror=array-bounds
+
+We bumped into the build error while testing gcc-10 pre-release.
+
+../../grub-core/disk/mdraid1x_linux.c: In function 'grub_mdraid_detect':
+../../grub-core/disk/mdraid1x_linux.c:181:15: error: array subscript <unknown> is outside array bounds of 'grub_uint16_t[0]' {aka 'short unsigned int[0]'} [-Werror=array-bounds]
+  181 |      (char *) &sb.dev_roles[grub_le_to_cpu32 (sb.dev_number)]
+      |               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../grub-core/disk/mdraid1x_linux.c:98:17: note: while referencing 'dev_roles'
+   98 |   grub_uint16_t dev_roles[0]; /* Role in array, or 0xffff for a spare, or 0xfffe for faulty.  */
+      |                 ^~~~~~~~~
+../../grub-core/disk/mdraid1x_linux.c:127:33: note: defined here 'sb'
+  127 |       struct grub_raid_super_1x sb;
+      |                                 ^~
+cc1: all warnings being treated as errors
+
+Apparently gcc issues the warning when trying to access sb.dev_roles
+array's member, since it is a zero length array as the last element of
+struct grub_raid_super_1x that is allocated sparsely without extra
+chunks for the trailing bits, so the warning looks legitimate in this
+regard.
+
+As the whole thing here is doing offset computation, it is undue to use
+syntax that would imply array member access then take address from it
+later. Instead we could accomplish the same thing through basic array
+pointer arithmetic to pacify the warning.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+
+Last-Update: 2020-12-28
+
+Patch-Name: mdraid1x-linux-gcc-10.patch
+---
+ grub-core/disk/mdraid1x_linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/disk/mdraid1x_linux.c b/grub-core/disk/mdraid1x_linux.c
+index 7cc80d3df..c980feba4 100644
+--- a/grub-core/disk/mdraid1x_linux.c
++++ b/grub-core/disk/mdraid1x_linux.c
+@@ -178,7 +178,7 @@ grub_mdraid_detect (grub_disk_t disk,
+ 	return NULL;
+ 
+       if (grub_disk_read (disk, sector, 
+-			  (char *) &sb.dev_roles[grub_le_to_cpu32 (sb.dev_number)]
++			  (char *) (sb.dev_roles + grub_le_to_cpu32 (sb.dev_number))
+ 			  - (char *) &sb,
+ 			  sizeof (role), &role))
+ 	return NULL;

debian/patches/series

@@ -96,4 +96,6 @@ unix-config-overflow.patch
 deviceiter-overflow.patch
 grub-install-backup-and-restore.patch
 tftp-roll-over-block-counter.patch
+mdraid1x-linux-gcc-10.patch
+zfs-gcc-10.patch
 add-failsafe-boot-options.patch

debian/patches/zfs-gcc-10.patch

+From ecb767ebd71a5544ba82b2c4cc86855bab5655eb Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Thu, 26 Mar 2020 14:35:35 +0800
+Subject: zfs: Fix gcc10 error -Werror=zero-length-bounds
+
+We bumped into the build error while testing gcc-10 pre-release.
+
+In file included from ../../include/grub/file.h:22,
+		from ../../grub-core/fs/zfs/zfs.c:34:
+../../grub-core/fs/zfs/zfs.c: In function 'zap_leaf_lookup':
+../../grub-core/fs/zfs/zfs.c:2263:44: error: array subscript '<unknown>' is outside the bounds of an interior zero-length array 'grub_uint16_t[0]' {aka 'short unsigned int[0]'} [-Werror=zero-length-bounds]
+2263 |   for (chunk = grub_zfs_to_cpu16 (l->l_hash[LEAF_HASH (blksft, h, l)], endian);
+../../include/grub/types.h:241:48: note: in definition of macro 'grub_le_to_cpu16'
+ 241 | # define grub_le_to_cpu16(x) ((grub_uint16_t) (x))
+     |                                                ^
+../../grub-core/fs/zfs/zfs.c:2263:16: note: in expansion of macro 'grub_zfs_to_cpu16'
+2263 |   for (chunk = grub_zfs_to_cpu16 (l->l_hash[LEAF_HASH (blksft, h, l)], endian);
+     |                ^~~~~~~~~~~~~~~~~
+In file included from ../../grub-core/fs/zfs/zfs.c:48:
+../../include/grub/zfs/zap_leaf.h:72:16: note: while referencing 'l_hash'
+  72 |  grub_uint16_t l_hash[0];
+     |                ^~~~~~
+
+Here I'd like to quote from the gcc document [1] which seems best to
+explain what is going on here.
+
+"Although the size of a zero-length array is zero, an array member of
+this kind may increase the size of the enclosing type as a result of
+tail padding. The offset of a zero-length array member from the
+beginning of the enclosing structure is the same as the offset of an
+array with one or more elements of the same type. The alignment of a
+zero-length array is the same as the alignment of its elements.
+
+Declaring zero-length arrays in other contexts, including as interior
+members of structure objects or as non-member objects, is discouraged.
+Accessing elements of zero-length arrays declared in such contexts is
+undefined and may be diagnosed."
+
+The l_hash[0] is apparnetly an interior member to the enclosed structure
+while l_entries[0] is the trailing member. And the offending code tries
+to access members in l_hash[0] array that triggers the diagnose.
+
+Given that the l_entries[0] is used to get proper alignment to access
+leaf chunks, we can accomplish the same thing through the ALIGN_UP macro
+thus eliminating l_entries[0] from the structure. In this way we can
+pacify the warning as l_hash[0] now becomes the last member to the
+enclosed structure.
+
+[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+
+Last-update: 2020-12-28
+
+Patch-Name: zfs-gcc-10.patch
+---
+ grub-core/fs/zfs/zfs.c      | 5 ++++-
+ include/grub/zfs/zap_leaf.h | 1 -
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
+index 36d0373a6..41ef0ff57 100644
+--- a/grub-core/fs/zfs/zfs.c
++++ b/grub-core/fs/zfs/zfs.c
+@@ -142,7 +142,10 @@ ZAP_LEAF_NUMCHUNKS (int bs)
+ static inline zap_leaf_chunk_t *
+ ZAP_LEAF_CHUNK (zap_leaf_phys_t *l, int bs, int idx)
+ {
+-  return &((zap_leaf_chunk_t *) (l->l_entries 
++  grub_properly_aligned_t *l_entries;
++
++  l_entries = (grub_properly_aligned_t *) ALIGN_UP((grub_addr_t)l->l_hash, sizeof (grub_properly_aligned_t));
++  return &((zap_leaf_chunk_t *) (l_entries
+ 				 + (ZAP_LEAF_HASH_NUMENTRIES(bs) * 2)
+ 				 / sizeof (grub_properly_aligned_t)))[idx];
+ }
+diff --git a/include/grub/zfs/zap_leaf.h b/include/grub/zfs/zap_leaf.h
+index 95c67dcba..11447c166 100644
+--- a/include/grub/zfs/zap_leaf.h
++++ b/include/grub/zfs/zap_leaf.h
+@@ -70,7 +70,6 @@ typedef struct zap_leaf_phys {
+ 	 */
+ 
+ 	grub_uint16_t l_hash[0];
+-        grub_properly_aligned_t l_entries[0];
+ } zap_leaf_phys_t;
+ 
+ typedef union zap_leaf_chunk {

debian/rules

@@ -39,7 +39,7 @@ else
 with_check := yes
 endif
 
-CC := gcc-9
+CC := gcc-10
 
 confflags = \
 	PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version)" \