Merge pull request #13371 from Rmys/master

gptfdisk-1.0.10

hardware/disk/gptfdisk/files/gentoo/gptfdisk-1.0.9-libuuid.patch

@@ -1,26 +0,0 @@
-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(-)
-
-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.36.1
-

hardware/disk/gptfdisk/files/opensuse/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch

@@ -1,57 +0,0 @@
-From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001
-From: Rod Smith <rodsmith@rodsbooks.com>
-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 <stdlib.h>
- #include <string>
- 
--#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
-

hardware/disk/gptfdisk/files/opensuse/gptfdisk-fix-null-pointer-dereference.patch

@@ -1,37 +0,0 @@
-From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001
-From: Damian Kurek <starfire24680@gmail.com>
-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;

hardware/disk/gptfdisk/pspec.xml

@@ -10,7 +10,7 @@
         <IsA>app:console</IsA>
         <Summary>A text-mode partitioning tool that works on GUID Partition Table (GPT) disks</Summary>
         <Description>A text-mode partitioning tool that works on GUID Partition Table (GPT) disks</Description>
-        <Archive sha1sum="284bd000edaf7874b472bd01719c6a71a8030e13" type="targz">http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.9/gptfdisk-1.0.9.tar.gz</Archive>
+        <Archive sha1sum="70c0bfe4290c2893fc957ef7f6156c5e74e469fc" type="targz">http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.10/gptfdisk-1.0.10.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>util-linux</Dependency>
             <Dependency>ncurses-devel</Dependency>
@@ -18,9 +18,9 @@
             <Dependency>libutil-linux-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">opensuse/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch</Patch>
+<!--             <Patch level="1">opensuse/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch</Patch> -->
-            <Patch level="1">opensuse/gptfdisk-fix-null-pointer-dereference.patch</Patch>
+<!--             <Patch level="1">opensuse/gptfdisk-fix-null-pointer-dereference.patch</Patch> -->
-            <Patch level="1">gentoo/gptfdisk-1.0.9-libuuid.patch</Patch>
+<!--             <Patch level="1">gentoo/gptfdisk-1.0.9-libuuid.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -40,6 +40,13 @@
     </Package>
 
     <History>
+        <Update release="11">
+            <Date>2024-02-21</Date>
+            <Version>1.0.10</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="10">
             <Date>2023-09-11</Date>
             <Version>1.0.9</Version>