diff -Nru parted-3.3/debian/changelog parted-3.3/debian/changelog --- parted-3.3/debian/changelog 2020-01-19 22:35:35.000000000 +0000 +++ parted-3.3/debian/changelog 2020-02-08 09:56:05.000000000 +0000 @@ -1,3 +1,11 @@ +parted (3.3-4) unstable; urgency=medium + + * gptsync.patch: Silence stderr output from dmidecode, since only stdout + is considered anyway (fixes + https://github.com/martijnvanbrummelen/nwipe/issues/111; thanks, louib). + + -- Colin Watson Sat, 08 Feb 2020 09:56:05 +0000 + parted (3.3-3) unstable; urgency=medium * Fix chromeos-kernel-flag.patch to patch include/parted/disk.h too. diff -Nru parted-3.3/debian/.git-dpm parted-3.3/debian/.git-dpm --- parted-3.3/debian/.git-dpm 2020-01-19 22:35:35.000000000 +0000 +++ parted-3.3/debian/.git-dpm 2020-02-08 09:56:05.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -1440f9f4392ed031108ad4b00c5e3868c2d7ed42 -1440f9f4392ed031108ad4b00c5e3868c2d7ed42 +c100cf111f94637955cb803b25ec6bd2c1ebde38 +c100cf111f94637955cb803b25ec6bd2c1ebde38 e01b510697b22842003c86e8a43abf89e2593613 e01b510697b22842003c86e8a43abf89e2593613 parted_3.3.orig.tar.xz diff -Nru parted-3.3/debian/patches/align-new-partitions-on-fresh-disks.patch parted-3.3/debian/patches/align-new-partitions-on-fresh-disks.patch --- parted-3.3/debian/patches/align-new-partitions-on-fresh-disks.patch 2020-01-19 22:35:35.000000000 +0000 +++ parted-3.3/debian/patches/align-new-partitions-on-fresh-disks.patch 2020-02-08 09:56:05.000000000 +0000 @@ -1,4 +1,4 @@ -From 9626fa0e647f3ec0078ebc6356b436a12ece4875 Mon Sep 17 00:00:00 2001 +From 04a41cf2dac4e5dc7743127b9f1cd1519725afc0 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 6 Aug 2014 16:07:28 +0200 Subject: Align new partitions created on fresh disks diff -Nru parted-3.3/debian/patches/chromeos-kernel-flag.patch parted-3.3/debian/patches/chromeos-kernel-flag.patch --- parted-3.3/debian/patches/chromeos-kernel-flag.patch 2020-01-19 22:35:35.000000000 +0000 +++ parted-3.3/debian/patches/chromeos-kernel-flag.patch 2020-02-08 09:56:05.000000000 +0000 @@ -1,4 +1,4 @@ -From 1440f9f4392ed031108ad4b00c5e3868c2d7ed42 Mon Sep 17 00:00:00 2001 +From c100cf111f94637955cb803b25ec6bd2c1ebde38 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 10 Oct 2019 21:03:22 +0300 Subject: libparted: Add ChromeOS Kernel partition flag @@ -113,7 +113,7 @@ default: ped_exception_throw ( diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c -index f999452b..91a94c50 100644 +index dc9fa967..435ceb7a 100644 --- a/libparted/labels/gpt.c +++ b/libparted/labels/gpt.c @@ -156,6 +156,10 @@ typedef struct diff -Nru parted-3.3/debian/patches/gptsync.patch parted-3.3/debian/patches/gptsync.patch --- parted-3.3/debian/patches/gptsync.patch 2020-01-19 22:35:35.000000000 +0000 +++ parted-3.3/debian/patches/gptsync.patch 2020-02-08 09:56:05.000000000 +0000 @@ -1,4 +1,4 @@ -From 41a604461fea6d6a65a180e2f8d90a35cc371789 Mon Sep 17 00:00:00 2001 +From 992df2bd0138ac23eb822a5d096dd511bd30be06 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 28 Mar 2014 17:10:01 +0000 Subject: GPT syncing for Intel Macs @@ -7,7 +7,7 @@ From: Colin Watson Forwarded: no -Last-Update: 2018-04-09 +Last-Update: 2020-02-08 Patch-Name: gptsync.patch --- @@ -18,7 +18,7 @@ create mode 100644 tests/t0290-gptsync.sh diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c -index 9446d5a9..f999452b 100644 +index 9446d5a9..dc9fa967 100644 --- a/libparted/labels/gpt.c +++ b/libparted/labels/gpt.c @@ -311,6 +311,40 @@ typedef struct _GPTPartitionData @@ -42,7 +42,7 @@ + char *manufacturer = NULL; + size_t manufacturer_len = 0; + -+ dmidecode = popen ("dmidecode -s system-manufacturer", "r"); ++ dmidecode = popen ("dmidecode -s system-manufacturer 2>/dev/null", "r"); + if (getline (&manufacturer, &manufacturer_len, dmidecode) < 0) { + /* ignore; will return NULL */ + } diff -Nru parted-3.3/debian/patches/probe-lvs-again.patch parted-3.3/debian/patches/probe-lvs-again.patch --- parted-3.3/debian/patches/probe-lvs-again.patch 2020-01-19 22:35:35.000000000 +0000 +++ parted-3.3/debian/patches/probe-lvs-again.patch 2020-02-08 09:56:05.000000000 +0000 @@ -1,4 +1,4 @@ -From 189ac78fdceddd15d689797cdee31088ed3250b6 Mon Sep 17 00:00:00 2001 +From a6537050b120538c5905841eee6017c8dfd57e23 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 9 Aug 2014 16:23:26 +0200 Subject: Probe LVM logical volumes again diff -Nru parted-3.3/debian/patches/udevadm-settle.patch parted-3.3/debian/patches/udevadm-settle.patch --- parted-3.3/debian/patches/udevadm-settle.patch 2020-01-19 22:35:35.000000000 +0000 +++ parted-3.3/debian/patches/udevadm-settle.patch 2020-02-08 09:56:05.000000000 +0000 @@ -1,4 +1,4 @@ -From c6433e0bb1b3b31bfbd1dd568364472ab3a9e271 Mon Sep 17 00:00:00 2001 +From 0002018ed01111bc0a03e17f1dcd117d6dfaf686 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 28 Mar 2014 17:10:16 +0000 Subject: udev handling