aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel NĂ©ri <dne+alpine@mayonnaise.net>2024-02-21 23:04:41 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2024-02-22 11:22:50 +0000
commit5846b9ffe32e2aabf6a69f0e246853cdd13e3f1b (patch)
tree7c549b70f3524a791735b33f14ed56e614392060
parent6a41588a798bb9a89e03926760b31a13201c02ec (diff)
main/gptfdisk: upgrade to 1.0.10
-rw-r--r--main/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch57
-rw-r--r--main/gptfdisk/0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch39
-rw-r--r--main/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch38
-rw-r--r--main/gptfdisk/APKBUILD12
4 files changed, 3 insertions, 143 deletions
diff --git a/main/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch b/main/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch
deleted file mode 100644
index 5e1ab80c97e..00000000000
--- a/main/gptfdisk/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 <rodsmith@rodsbooks.com>
-Date: Fri, 15 Apr 2022 18:10:14 -0400
-Subject: [PATCH 1/2] 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 c7add563bab2..9e153fd73b3b 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 34c942100842..0d578ebf0034 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 8ba9ad1aa896..f91f1bc8b1ed 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.35.1
-
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
deleted file mode 100644
index db1554e2a08..00000000000
--- a/main/gptfdisk/0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-
diff --git a/main/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch b/main/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch
deleted file mode 100644
index 4354892f309..00000000000
--- a/main/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From fb181ca613329886f017bbf0129108eafd01fe0f Mon Sep 17 00:00:00 2001
-From: Damian Kurek <starfire24680@gmail.com>
-Date: Wed, 6 Jul 2022 22:23:58 +0000
-Subject: [PATCH 1/1] Fix NULL dereference when duplicating string argument
-
----
- 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;
---
-2.35.1
-
diff --git a/main/gptfdisk/APKBUILD b/main/gptfdisk/APKBUILD
index 4bf47942892..ef3d6d29525 100644
--- a/main/gptfdisk/APKBUILD
+++ b/main/gptfdisk/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gptfdisk
-pkgver=1.0.9
-pkgrel=4
+pkgver=1.0.10
+pkgrel=0
pkgdesc="Text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
arch="all"
url="https://www.rodsbooks.com/gdisk"
@@ -10,9 +10,6 @@ makedepends="ncurses-dev e2fsprogs-dev popt-dev linux-headers"
subpackages="$pkgname-doc sgdisk"
source="https://downloads.sourceforge.net/project/gptfdisk/gptfdisk/$pkgver/gptfdisk-$pkgver.tar.gz
fix-wrong-include.patch
- 0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch
- 0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch
- 0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch
fix-musl.patch
"
# secfixes:
@@ -43,10 +40,7 @@ sgdisk() {
}
sha512sums="
-c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2 gptfdisk-1.0.9.tar.gz
+76764e176cd92470648a1d7a8d2570ebc41005204e73b0f2dd5a7aff2fc1981d3bec61a3bd68b855cc3474bcb7cf49c1cb2ea25843d4e7945bef7648d548383d gptfdisk-1.0.10.tar.gz
9b64c0e565137b4d4275bd6e8b050f98a73ff5593093b54d43736e6aabd24abf6e35d88ea27be17c5fee70aada4ad05a70fe5af3523212aad114f05aaf82356f fix-wrong-include.patch
-ebd680343cd7f559503156984f056f4b49cc3581c8c7f623c66c10bb79e1dd7ee9e217cbd0479ebe3b7bce3b34b85428bc3525aa354b76789e9bcbaf1000a889 0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch
-fd2747714f854a2abaa5cbd113a9bf9eea3d8ee6c46e47dbe3246c9d3bebb621a2a7bc623827f6f44870133eb09b5b991ea73d03755fa0e2b9d73c5cea821f33 0002-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch
-f1d3b1d43490665dbe2b024027b12803ec73698dc232335fd87813ffb940202032c8f47c3410190a00d16382a2ceb35effc1f825ca87f6a0cd3dad564bb751af 0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch
c85306ad9902d4c4f685c8fa5f6f4e1976d3036a4fc747cbc68403fa811a177a0d6ce29575c4d2dc03ccf9bcc44167dd5830eb8f548d9d55d2b6579ed1b4ffab fix-musl.patch
"