aboutsummaryrefslogtreecommitdiffstats
path: root/main/gptfdisk/0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch
diff options
context:
space:
mode:
authorDominique Martinet <dominique.martinet@atmark-techno.com>2022-06-14 15:26:27 +0900
committeralice <alice@ayaya.dev>2022-06-14 19:29:43 +0000
commit99d30f0b022b0183d61ca640c2df7e26141537df (patch)
tree7243e697cb2301ab5c9fe9f1615907280a932eb4 /main/gptfdisk/0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch
parentfa6eced9c93f1dd0ceae6e8b0917e2badf065ae8 (diff)
main/gptfdisk: fix bad uuid generation error
sgdisk 1.0.9 prints a scary warning on alpine 3.16: > Warning! Unable to generate a proper UUID! Creating an improper one as a last > resort! Windows 7 may crash if you save this partition table! This has been tracked and resolved as https://bugs.gentoo.org/844073 and is apparently due to an util-linux update, fixed in this patch: https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/ The other patch is unrelated but another fix we will probably need soon: popt 1.19-rc1 has been released last week (June 7th, 2022), so we might as well grab the patch now...
Diffstat (limited to 'main/gptfdisk/0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch')
-rw-r--r--main/gptfdisk/0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/main/gptfdisk/0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch b/main/gptfdisk/0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch
new file mode 100644
index 00000000000..db1554e2a08
--- /dev/null
+++ b/main/gptfdisk/0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch
@@ -0,0 +1,39 @@
+From 6a8416cbd12d55f882bb751993b94f72d338d96f Mon Sep 17 00:00:00 2001
+From: Rod Smith <rodsmith@rodsbooks.com>
+Date: Sat, 16 Apr 2022 09:32:04 -0400
+Subject: [PATCH 2/2] Updated guid.cc to deal with minor change in libuuid
+
+---
+ NEWS | 2 ++
+ guid.cc | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/NEWS b/NEWS
+index 9e153fd73b3b..9ec7e6365c50 100644
+--- a/NEWS
++++ b/NEWS
+@@ -6,6 +6,8 @@
+ (commit 740, which is pre-release as I type; presumably version 1.19 and
+ later once released).
+
++- Updated guid.cc to deal with minor change in libuuid.
++
+ 1.0.9 (4/14/2022):
+ ------------------
+
+diff --git a/guid.cc b/guid.cc
+index 1e73ab77d854..d3e4fd567dbf 100644
+--- a/guid.cc
++++ b/guid.cc
+@@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
+ void GUIDData::Randomize(void) {
+ int i, uuidGenerated = 0;
+
+-#ifdef _UUID_UUID_H
++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
+ uuid_generate(uuidData);
+ ReverseBytes(&uuidData[0], 4);
+ ReverseBytes(&uuidData[4], 2);
+--
+2.35.1
+