Commit ea027f99 authored by Lorenzo "Palinuro" Faletra's avatar Lorenzo "Palinuro" Faletra
Browse files

Import Debian changes 2.04-7parrot1

grub2 (2.04-7parrot1) rolling; urgency=medium

  * Import new Debian release.
  * Include Parrot patches.

grub2 (2.04-7) unstable; urgency=medium

  [ Christian Göttsche ]
  * Create grub default configuration with default SELinux context.

  [ Steve McIntyre ]
  * In the signed packages, change the version dependency on
    grub-common to be >= and not =. This will allow for installation
    in unstable to still work in the window while we wait for the
    template package to do its second trip through the archive.
  * Tweak the build-dep architecture listing for libefiboot-dev and
    libefivar-dev. The linux-* wildcards don't work in the way
    expected, and were missing out (at least) armhf and armel.
    Closes: #958461

grub2 (2.04-6) unstable; urgency=medium

  [ Romain Perier ]
  * Add f2fs module to signed UEFI images

  [ Steve McIntyre ]
  * Add jfs module to signed UEFI images. Closes: #950959

  [ Colin Watson ]
  * Drop mkconfig-mid-upgrade.patch; it was only needed for upgrades from
    GRUB 1.99 (now a long time ago) and can inappropriately hide problems
    when /etc/grub.d/00_header should have been updated but wasn't (closes:
    #953201).
  * Cherry-pick from upstream:
    - btrfs: Add support for new RAID1C34 profiles (closes: #958236).
parent ad816d9c
Pipeline #3014 failed with stages
# see git-dpm(1) from git-dpm package
7606547586b2d6ca1b384e15e0358d3a3ddc48a6
7606547586b2d6ca1b384e15e0358d3a3ddc48a6
71e87f5ac2ffac3705655aecc22f3f872fb603d6
71e87f5ac2ffac3705655aecc22f3f872fb603d6
578bb115fbd47e1c464696f1f8d6183e5443975d
578bb115fbd47e1c464696f1f8d6183e5443975d
grub2_2.04.orig.tar.xz
......
......@@ -94,6 +94,7 @@ CD_MODULES="
ext2
fat
font
f2fs
gettext
gfxmenu
gfxterm
......@@ -103,6 +104,7 @@ CD_MODULES="
help
hfsplus
iso9660
jfs
jpeg
keystatus
loadenv
......
grub2 (2.04-7parrot1) rolling; urgency=medium
* Import new Debian release.
* Include Parrot patches.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Sun, 31 May 2020 03:48:13 +0200
grub2 (2.04-7) unstable; urgency=medium
[ Christian Göttsche ]
* Create grub default configuration with default SELinux context.
[ Steve McIntyre ]
* In the signed packages, change the version dependency on
grub-common to be >= and not =. This will allow for installation
in unstable to still work in the window while we wait for the
template package to do its second trip through the archive.
* Tweak the build-dep architecture listing for libefiboot-dev and
libefivar-dev. The linux-* wildcards don't work in the way
expected, and were missing out (at least) armhf and armel.
Closes: #958461
-- Colin Watson <cjwatson@debian.org> Wed, 22 Apr 2020 14:52:13 +0100
grub2 (2.04-6) unstable; urgency=medium
[ Romain Perier ]
* Add f2fs module to signed UEFI images
[ Steve McIntyre ]
* Add jfs module to signed UEFI images. Closes: #950959
[ Colin Watson ]
* Drop mkconfig-mid-upgrade.patch; it was only needed for upgrades from
GRUB 1.99 (now a long time ago) and can inappropriately hide problems
when /etc/grub.d/00_header should have been updated but wasn't (closes:
#953201).
* Cherry-pick from upstream:
- btrfs: Add support for new RAID1C34 profiles (closes: #958236).
-- Colin Watson <cjwatson@debian.org> Mon, 20 Apr 2020 01:03:08 +0100
grub2 (2.04-5parrot1) rolling-testing; urgency=medium
* Import new Debian release.
......
......@@ -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: Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>
Build-Depends: debhelper-compat (= 10),
patchutils,
python3,
......@@ -33,13 +32,13 @@ Build-Depends: debhelper-compat (= 10),
libparted-dev [any-powerpc any-ppc64 any-ppc64el],
pkg-config,
bash-completion,
libefiboot-dev [linux-i386 linux-amd64 linux-ia64 linux-arm linux-arm64],
libefivar-dev [linux-i386 linux-amd64 linux-ia64 linux-arm linux-arm64],
libefiboot-dev [i386 amd64 ia64 x32 armel armhf arm64],
libefivar-dev [i386 amd64 ia64 x32 armel armhf arm64],
Build-Conflicts: autoconf2.13, libzfs-dev, libnvpair-dev
Standards-Version: 3.9.6
Homepage: https://www.gnu.org/software/grub/
Vcs-Git: https://nest.parrot.sh/packages/debian/grub2.git
Vcs-Browser: https://nest.parrot.sh/packages/debian/grub2
Vcs-Git: https://nest.parrotsec.org/packages/debian/grub2
Vcs-Browser: https://nest.parrotsec.org/packages/debian/grub2
Rules-Requires-Root: no
Package: grub2
......
From 5e8e27477cd1ab3a6039ed7ad8f9ce737282876d Mon Sep 17 00:00:00 2001
From 274c57260b4b599874e9ede10ea417b7bb7c98e2 Mon Sep 17 00:00:00 2001
From: Jeroen Dekkers <jeroen@dekkers.ch>
Date: Sat, 12 Jan 2019 21:02:18 +0100
Subject: at_keyboard: initialize keyboard in module init if keyboard is ready
......
From 4415572b37c92c22301b1914d04f1459a32b1ac7 Mon Sep 17 00:00:00 2001
From 2e8913f8b9759a926cae0b07c112e42e03621bac Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Fri, 16 Nov 2018 16:37:02 +0000
Subject: bash-completion: Drop "have" checks
......
From 49e89abd1779d3b755d3fbc56a7d4859f39f7792 Mon Sep 17 00:00:00 2001
From e36b83c8b3b320365deddc2a3df266a57857fda7 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:11 +0000
Subject: Blacklist 1440x900x32 from VBE preferred mode handling
......
From c26ef80083bf37adae620412162b118c8426f170 Mon Sep 17 00:00:00 2001
From e1a872b0277a1c405bc7120b89e70001a60a6d12 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:41:04 -0400
Subject: bootp: New net_bootp6 command
......
From f42a830d5e94bab4f1f513fac1bca108f134fd88 Mon Sep 17 00:00:00 2001
From 1728caae46b17a42da4f1fb86b5d194d879bd4aa Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:42:19 -0400
Subject: bootp: Add processing DHCPACK packet from HTTP Boot
......
From 71e87f5ac2ffac3705655aecc22f3f872fb603d6 Mon Sep 17 00:00:00 2001
From: David Sterba <dave@jikos.cz>
Date: Mon, 4 Nov 2019 17:23:22 +0100
Subject: btrfs: Add support for new RAID1C34 profiles
New 3- and 4-copy variants of RAID1 were merged into Linux kernel 5.5.
Add the two new profiles to the list of recognized ones. As this builds
on the same code as RAID1, only the redundancy level needs to be
adjusted, the rest is done by the existing code.
Signed-off-by: David Sterba <dsterba@suse.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=495781f5ed1b48bf27f16c53940d6700c181c74c
Bug-Debian: https://bugs.debian.org/958236
Last-Update: 2020-04-20
Patch-Name: btrfs-raid1c34.patch
---
grub-core/fs/btrfs.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 48bd3d04a..63f9657a6 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -136,6 +136,8 @@ struct grub_btrfs_chunk_item
#define GRUB_BTRFS_CHUNK_TYPE_RAID10 0x40
#define GRUB_BTRFS_CHUNK_TYPE_RAID5 0x80
#define GRUB_BTRFS_CHUNK_TYPE_RAID6 0x100
+#define GRUB_BTRFS_CHUNK_TYPE_RAID1C3 0x200
+#define GRUB_BTRFS_CHUNK_TYPE_RAID1C4 0x400
grub_uint8_t dummy2[0xc];
grub_uint16_t nstripes;
grub_uint16_t nsubstripes;
@@ -964,14 +966,19 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr,
csize = (stripen + 1) * stripe_length - off;
break;
}
+ case GRUB_BTRFS_CHUNK_TYPE_RAID1C4:
+ redundancy++;
+ /* fall through */
+ case GRUB_BTRFS_CHUNK_TYPE_RAID1C3:
+ redundancy++;
+ /* fall through */
case GRUB_BTRFS_CHUNK_TYPE_DUPLICATED:
case GRUB_BTRFS_CHUNK_TYPE_RAID1:
{
- grub_dprintf ("btrfs", "RAID1\n");
+ grub_dprintf ("btrfs", "RAID1 (copies: %d)\n", ++redundancy);
stripen = 0;
stripe_offset = off;
csize = grub_le_to_cpu64 (chunk->size) - off;
- redundancy = 2;
break;
}
case GRUB_BTRFS_CHUNK_TYPE_RAID0:
From 413121ddac2aa1484b0dc6fd3a32aad0d417aa80 Mon Sep 17 00:00:00 2001
From 83446ff328321ff05818fee1ed150f8efd4730b8 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:10 +0000
Subject: Read /etc/default/grub.d/*.cfg after /etc/default/grub
......@@ -178,10 +178,10 @@ index 65effa9f3..5478030fd 100644
+ free (cfgdir);
}
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index b506d63bf..d18bf972f 100644
index 45cd4cc54..8a1bc0441 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -164,6 +164,11 @@ fi
@@ -157,6 +157,11 @@ fi
if test -f ${sysconfdir}/default/grub ; then
. ${sysconfdir}/default/grub
fi
......
From d6ca3b2da81970a6194a2da62498525909145739 Mon Sep 17 00:00:00 2001
From fc333cf241ea774b0610c8ba57c833d6937dd0f5 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 11 Mar 2019 11:17:43 +0000
Subject: Minimise writes to EFI variable storage
......
From 563ed9650433306740919af81fe0b4d453ed24ed Mon Sep 17 00:00:00 2001
From b9b962cbf2657ee5912b6951654c6c6e1965fc3e Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:43:21 -0400
Subject: efinet: Setting DNS server from UEFI protocol
......
From 14e7603b5e94ab4ff5dd9171b1508439500acce4 Mon Sep 17 00:00:00 2001
From 9d4c6679960366658950f8727497a85cf3d26fc8 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:43:05 -0400
Subject: efinet: Setting network from UEFI device path
......
From 89450c887f5dda15c19a742d7b51eaa7464dcf5a Mon Sep 17 00:00:00 2001
From da20e93fb30294801f9ea0dd2917d945654174e1 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:41:21 -0400
Subject: efinet: UEFI IPv6 PXE support
......
From ce28ebda0d4dc6e9c5945965f16a26f67ab11792 Mon Sep 17 00:00:00 2001
From ea65cb74601fd4c8229349d6d937d18033af796e Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Tue, 15 May 2018 11:36:46 +0100
Subject: Do not overwrite sentinel byte in boot_params, breaks lockdown
......
From 5e6eccc38c0ab7dc93339b6618135119fdcc5bed Mon Sep 17 00:00:00 2001
From f892ba14f3ec78b03cd3feb2f5845a223786823f Mon Sep 17 00:00:00 2001
From: Evan Broder <evan@ebroder.net>
Date: Mon, 13 Jan 2014 12:13:29 +0000
Subject: Add configure option to enable gfxpayload=keep dynamically
......
From ac0feeb94e747a85ee781025239e2c0fba012f99 Mon Sep 17 00:00:00 2001
From 6394c8c2ce2bdec46c94942fae6546e125047165 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Wed, 3 Dec 2014 01:25:12 +0000
Subject: Add support for forcing EFI installation to the removable media path
......
From 04aa0aa735f4bfa2d7a4f6593745fbe1d7fa0d0a Mon Sep 17 00:00:00 2001
From 1a4d25cb7f215fcd61f50b3ee99b6f34ee06fff6 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Sat, 6 Sep 2014 12:20:12 +0100
Subject: grub-install: Install PV Xen binaries into the upstream specified
......
From 445328f936b63c4ed3bfb2a713716598154ecc77 Mon Sep 17 00:00:00 2001
From cb2746b915b7d8b5a3c78fae3d40fc0ccc41b650 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Fri, 14 Jun 2019 16:37:11 +0100
Subject: Deal with --force-extra-removable with signed shim too
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment