diff --git a/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch b/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch deleted file mode 100644 index 9f135fd..0000000 --- a/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001 -From: Rod Smith -Date: Fri, 15 Apr 2022 18:10:14 -0400 -Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt - (commit 740; presumably eventually release 1.19) - ---- - NEWS | 8 ++++++++ - gptcl.cc | 2 +- - support.h | 2 +- - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/NEWS b/NEWS -index c7add56..9e153fd 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,11 @@ -+1.0.10 (?/??/2022): -+------------------- -+ -+- 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 -+ later once released). -+ - 1.0.9 (4/14/2022): - ------------------ - -diff --git a/gptcl.cc b/gptcl.cc -index 34c9421..0d578eb 100644 ---- a/gptcl.cc -+++ b/gptcl.cc -@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - } // while - - // Assume first non-option argument is the device filename.... -- device = (char*) poptGetArg(poptCon); -+ device = strdup((char*) poptGetArg(poptCon)); - poptResetContext(poptCon); - - if (device != NULL) { -diff --git a/support.h b/support.h -index 8ba9ad1..f91f1bc 100644 ---- a/support.h -+++ b/support.h -@@ -8,7 +8,7 @@ - #include - #include - --#define GPTFDISK_VERSION "1.0.9" -+#define GPTFDISK_VERSION "1.0.9.1" - - #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) - // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 --- -2.36.1 - diff --git a/gptfdisk-1.0.10.tar.gz b/gptfdisk-1.0.10.tar.gz new file mode 100644 index 0000000..a2e8a19 --- /dev/null +++ b/gptfdisk-1.0.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2abed61bc6d2b9ec498973c0440b8b804b7a72d7144069b5a9209b2ad693a282 +size 220787 diff --git a/gptfdisk-1.0.9-libuuid.patch b/gptfdisk-1.0.9-libuuid.patch deleted file mode 100644 index a70970c..0000000 --- a/gptfdisk-1.0.9-libuuid.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e67faca2c0ca955f56cbd22e90941cdcbdc12597 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 - ---- - 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); diff --git a/gptfdisk-1.0.9.tar.gz b/gptfdisk-1.0.9.tar.gz deleted file mode 100644 index e2de6e2..0000000 --- a/gptfdisk-1.0.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2 -size 215065 diff --git a/gptfdisk-fix-null-pointer-dereference.patch b/gptfdisk-fix-null-pointer-dereference.patch deleted file mode 100644 index 6766772..0000000 --- a/gptfdisk-fix-null-pointer-dereference.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001 -From: Damian Kurek -Date: Thu, 7 Jul 2022 03:39:16 +0000 -Subject: [PATCH] Fix NULL dereference when duplicating string argument - -poptGetArg can return NULL if there are no additional arguments, which -makes strdup dereference NULL on strlen ---- - gptcl.cc | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gptcl.cc b/gptcl.cc -index 0d578eb..ab95239 100644 ---- a/gptcl.cc -+++ b/gptcl.cc -@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - } // while - - // Assume first non-option argument is the device filename.... -- device = strdup((char*) poptGetArg(poptCon)); -- poptResetContext(poptCon); -+ device = (char*) poptGetArg(poptCon); - - if (device != NULL) { -+ device = strdup(device); -+ poptResetContext(poptCon); - JustLooking(); // reset as necessary - BeQuiet(); // Tell called functions to be less verbose & interactive - if (LoadPartitions((string) device)) { -@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - cerr << "Error encountered; not saving changes.\n"; - retval = 4; - } // if -+ free(device); - } // if (device != NULL) - poptFreeContext(poptCon); - return retval; diff --git a/gptfdisk.changes b/gptfdisk.changes index 8aa53bf..42346f8 100644 --- a/gptfdisk.changes +++ b/gptfdisk.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Apr 11 19:44:38 UTC 2024 - Jan Engelhardt + +- Update to release 1.0.10 + * Fix failure & crash of sgdisk when compiled with latest popt + * Fix NULL dereference when duplicating string argument + * Allow partition dynamically allocated by --largest-new to be + referenced by other options + * Truncate decimal inputs (e.g. "9.5G" becomes "9G") + * New partition type codes from the Discoverable Partitions + Specification +- Delete 0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch + gptfdisk-1.0.9-libuuid.patch, + gptfdisk-fix-null-pointer-dereference.patch (merged) + ------------------------------------------------------------------- Thu Sep 7 08:44:04 UTC 2023 - Fabian Vogt diff --git a/gptfdisk.spec b/gptfdisk.spec index 7a72467..8668bab 100644 --- a/gptfdisk.spec +++ b/gptfdisk.spec @@ -1,7 +1,7 @@ # # spec file for package gptfdisk # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gptfdisk -Version: 1.0.9 +Version: 1.0.10 Release: 0 Summary: GPT partitioning and MBR repair software License: GPL-2.0-only @@ -26,11 +26,6 @@ URL: http://rodsbooks.com/gdisk #Git-Clone: https://git.code.sf.net/p/gptfdisk/code gptfdisk-code #Git-Web: https://sourceforge.net/p/gptfdisk/code/ci/master/tree/ 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)