From 176f419cce82dd0dcdd5ebf36f840563fa568dd4 Mon Sep 17 00:00:00 2001 From: lvyy Date: Wed, 18 Dec 2024 09:59:42 +0000 Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid (cherry picked from commit 3717ce89da717fa1e96976246abdf96d8b5aacf8) --- ...to-deal-with-minor-change-in-libuuid.patch | 27 +++++++++++++++++++ gdisk.spec | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0003-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch diff --git a/0003-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch b/0003-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch new file mode 100644 index 0000000..ca4134e --- /dev/null +++ b/0003-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch @@ -0,0 +1,27 @@ +From 6a8416cbd12d55f882bb751993b94f72d338d96f Mon Sep 17 00:00:00 2001 +From: Rod Smith +Date: Sat, 16 Apr 2022 09:32:04 -0400 +Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid + +Conflict:Delete modifications to NEWS. +Reference:https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f +--- + guid.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/guid.cc b/guid.cc +index 1e73ab7..d3e4fd5 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.33.0 + diff --git a/gdisk.spec b/gdisk.spec index 81e738e..8ea8e8d 100644 --- a/gdisk.spec +++ b/gdisk.spec @@ -1,6 +1,6 @@ Name: gdisk Version: 1.0.9 -Release: 2 +Release: 3 Summary: GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools License: GPLv2 URL: http://www.rodsbooks.com/gdisk @@ -10,6 +10,7 @@ BuildRequires:ncurses-devel util-linux-devel gcc-c++ popt-devel Patch0001: 0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch Patch0002: 0002-Fix-NULL-dereference-when-duplicating-string-argumen.patch +Patch0003: 0003-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch %description GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools. @@ -51,6 +52,9 @@ install -Dp -m 0644 fixparts.8 %{buildroot}%{_mandir}/man8/fixparts.8 %{_mandir}/man8/* %changelog +* Thu Dec 19 2024 lvyy - 1.0.9-3 +- Updated guid.cc to deal with minor change in libuuid + * Tue Sep 24 2024 lvyy - 1.0.9-2 - DESC: fix problem that caused sgdisk to crash when using the latest popt -- Gitee