pool/gptfdisk
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1110822 from home:favogt:combustion

Browse Source 
- Add patch to fix UUID generation with util-linux >= 2.38:
  * gptfdisk-1.0.9-libuuid.patch

OBS-URL: https://build.opensuse.org/request/show/1110822
OBS-URL: https://build.opensuse.org/package/show/filesystems/gptfdisk?expand=0&rev=25
This commit is contained in:
Jan Engelhardt 2023-09-13 11:29:30 +00:00 committed by Git OBS Bridge
parent fa00c5e951
commit 33aca30caa
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gptfdisk-1.0.9-libuuid.patch Normal file
View File

@ -0,0 +1,36 @@
From e67faca2c0ca955f56cbd22e90941cdcbdc12597 Mon Sep 17 00:00:00 2001
From: Rod Smith <rodsmith@rodsbooks.com>
Date: Sat, 16 Apr 2022 09:32:04 -0400
Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid
---
NEWS | 3 +++
guid.cc | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
Index: gptfdisk-1.0.9/NEWS
===================================================================
--- gptfdisk-1.0.9.orig/NEWS
+++ gptfdisk-1.0.9/NEWS
@@ -1,6 +1,8 @@
1.0.10 (?/??/2022):
-------------------
+- Updated guid.cc to deal with minor change in libuuid.
+
- Fixed problem that caused sgdisk to crash with errors about being unable
to read the disk's partition table when compiled with the latest popt
(commit 740, which is pre-release as I type; presumably version 1.19 and
Index: gptfdisk-1.0.9/guid.cc
===================================================================
--- gptfdisk-1.0.9.orig/guid.cc
+++ gptfdisk-1.0.9/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);

6
gptfdisk.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 7 08:44:04 UTC 2023 - Fabian Vogt <fvogt@suse.com>
- Add patch to fix UUID generation with util-linux >= 2.38:
* gptfdisk-1.0.9-libuuid.patch
-------------------------------------------------------------------
Tue Mar 7 02:57:27 UTC 2023 - Alynx Zhou <alynx.zhou@suse.com>

2
gptfdisk.spec
View File

@ -29,6 +29,8 @@ Source: https://downloads.sf.net/%name/%name-%version.tar.gz
Patch1: 0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch
# PATCH-FIX-UPSTREAM gptfdisk-fix-null-pointer-dereference.patch bsc#1208877 alynx.zhou@suse.com -- Fix NULL pointer dereference in previous patch
Patch2: gptfdisk-fix-null-pointer-dereference.patch
# PATCH-FIX-UPSTREAM https://bugs.gentoo.org/844073 https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/
Patch3: gptfdisk-1.0.9-libuuid.patch
BuildRequires: gcc-c++
BuildRequires: ncurses-devel
BuildRequires: pkgconfig(popt)