diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-13 18:33:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-16 08:07:01 +0100 |
commit | e55b3e209a0f7582401bfb6c7efa34fe6d0f0960 (patch) | |
tree | f158b208f483bfaa96e36228f5f168a29aab29ba /meta/recipes-devtools | |
parent | 1cfb2dc0def0eb5cd5698262a0a2e1c060ac4d00 (diff) | |
download | poky-e55b3e209a0f7582401bfb6c7efa34fe6d0f0960.tar.gz |
gptfdisk: update 1.0.9 -> 1.0.10
(From OE-Core rev: d41178f9fea7e4121f582eaec68a6aa308e71b6e)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch | 46 | ||||
-rw-r--r-- | meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch | 27 | ||||
-rw-r--r-- | meta/recipes-devtools/fdisk/gptfdisk/0001-Use-64bit-time_t-on-linux-as-well.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/fdisk/gptfdisk/popt-1.19-follow-up.patch | 41 | ||||
-rw-r--r-- | meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb (renamed from meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb) | 6 |
6 files changed, 3 insertions, 154 deletions
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch deleted file mode 100644 index 095d00b1e2..0000000000 --- a/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From e7f9c9909c27d6ceed5aa4ca17023a1bc94b620a Mon Sep 17 00:00:00 2001 | ||
2 | From: Rod Smith <rodsmith@rodsbooks.com> | ||
3 | Date: Fri, 15 Apr 2022 18:10:14 -0400 | ||
4 | Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt | ||
5 | (commit 740; presumably eventually release 1.19) | ||
6 | |||
7 | Upstream-Status: Backport [https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d/] | ||
8 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
10 | --- | ||
11 | NEWS | 8 ++++++++ | ||
12 | gptcl.cc | 2 +- | ||
13 | 2 files changed, 9 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/NEWS b/NEWS | ||
16 | index c7add56..9e153fd 100644 | ||
17 | --- a/NEWS | ||
18 | +++ b/NEWS | ||
19 | @@ -1,3 +1,11 @@ | ||
20 | +1.0.10 (?/??/2022): | ||
21 | +------------------- | ||
22 | + | ||
23 | +- Fixed problem that caused sgdisk to crash with errors about being unable | ||
24 | + to read the disk's partition table when compiled with the latest popt | ||
25 | + (commit 740, which is pre-release as I type; presumably version 1.19 and | ||
26 | + later once released). | ||
27 | + | ||
28 | 1.0.9 (4/14/2022): | ||
29 | ------------------ | ||
30 | |||
31 | diff --git a/gptcl.cc b/gptcl.cc | ||
32 | index 34c9421..0d578eb 100644 | ||
33 | --- a/gptcl.cc | ||
34 | +++ b/gptcl.cc | ||
35 | @@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { | ||
36 | } // while | ||
37 | |||
38 | // Assume first non-option argument is the device filename.... | ||
39 | - device = (char*) poptGetArg(poptCon); | ||
40 | + device = strdup((char*) poptGetArg(poptCon)); | ||
41 | poptResetContext(poptCon); | ||
42 | |||
43 | if (device != NULL) { | ||
44 | -- | ||
45 | 2.35.5 | ||
46 | |||
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch deleted file mode 100644 index f358081092..0000000000 --- a/meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From c640d9011a8330ebaad501784fb0ee1ce5e7a5ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Rod Smith <rodsmith@rodsbooks.com> | ||
3 | Date: Sat, 16 Apr 2022 09:32:04 -0400 | ||
4 | Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid | ||
5 | |||
6 | Upstream-Status: Backport [https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/] | ||
7 | Signed-off-by: Peter Bergin <peter@berginkonsult.se> | ||
8 | --- | ||
9 | guid.cc | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/guid.cc b/guid.cc | ||
13 | index 1e73ab7..d3e4fd5 100644 | ||
14 | --- a/guid.cc | ||
15 | +++ b/guid.cc | ||
16 | @@ -141,7 +141,7 @@ void GUIDData::Zero(void) { | ||
17 | void GUIDData::Randomize(void) { | ||
18 | int i, uuidGenerated = 0; | ||
19 | |||
20 | -#ifdef _UUID_UUID_H | ||
21 | +#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) | ||
22 | uuid_generate(uuidData); | ||
23 | ReverseBytes(&uuidData[0], 4); | ||
24 | ReverseBytes(&uuidData[4], 2); | ||
25 | -- | ||
26 | 2.34.1 | ||
27 | |||
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-Use-64bit-time_t-on-linux-as-well.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-Use-64bit-time_t-on-linux-as-well.patch deleted file mode 100644 index 80e6f1bc9c..0000000000 --- a/meta/recipes-devtools/fdisk/gptfdisk/0001-Use-64bit-time_t-on-linux-as-well.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From cbdbabcc14e4ae4debcc64e41c0bb97d47b4eeef Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 12 Dec 2022 12:50:07 -0800 | ||
4 | Subject: [PATCH] Use 64bit time_t on linux as well | ||
5 | |||
6 | Alias 64bit version of stat functions to original functions | ||
7 | we are already passing -D_FILE_OFFSET_BITS=64 in linux Makefile | ||
8 | |||
9 | Upstream-Status: Submitted [https://sourceforge.net/p/gptfdisk/code/merge-requests/29/] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | diskio-unix.cc | 6 +++++- | ||
13 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/diskio-unix.cc b/diskio-unix.cc | ||
16 | index 7780aeb..0897c56 100644 | ||
17 | --- a/diskio-unix.cc | ||
18 | +++ b/diskio-unix.cc | ||
19 | @@ -37,8 +37,12 @@ | ||
20 | |||
21 | using namespace std; | ||
22 | |||
23 | -#ifdef __APPLE__ | ||
24 | +#if defined(__APPLE__) || defined(__linux__) | ||
25 | #define off64_t off_t | ||
26 | +#define stat64 stat | ||
27 | +#define fstat64 fstat | ||
28 | +#define lstat64 lstat | ||
29 | +#define lseek64 lseek | ||
30 | #endif | ||
31 | |||
32 | // Returns the official "real" name for a shortened version of same. | ||
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch index 266afbfa11..011eec36f9 100644 --- a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch +++ b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch | |||
@@ -1,17 +1,16 @@ | |||
1 | From 6bc6e867c5b3a774c0d7819ee5a3d2885e97caa9 Mon Sep 17 00:00:00 2001 | 1 | From 510d0d27f90dfb1c4afd0722580bb8a828b52b7f Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 30 Mar 2020 17:11:19 +0200 | 3 | Date: Mon, 30 Mar 2020 17:11:19 +0200 |
4 | Subject: [PATCH] gptcurses: correctly include curses.h | 4 | Subject: [PATCH] gptcurses: correctly include curses.h |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | gptcurses.cc | 4 ---- | 9 | gptcurses.cc | 4 ---- |
11 | 1 file changed, 4 deletions(-) | 10 | 1 file changed, 4 deletions(-) |
12 | 11 | ||
13 | diff --git a/gptcurses.cc b/gptcurses.cc | 12 | diff --git a/gptcurses.cc b/gptcurses.cc |
14 | index 71aa734..4ebfde1 100644 | 13 | index b476700..476fc43 100644 |
15 | --- a/gptcurses.cc | 14 | --- a/gptcurses.cc |
16 | +++ b/gptcurses.cc | 15 | +++ b/gptcurses.cc |
17 | @@ -23,11 +23,7 @@ | 16 | @@ -23,11 +23,7 @@ |
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/popt-1.19-follow-up.patch b/meta/recipes-devtools/fdisk/gptfdisk/popt-1.19-follow-up.patch deleted file mode 100644 index c7fa965ec9..0000000000 --- a/meta/recipes-devtools/fdisk/gptfdisk/popt-1.19-follow-up.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Damian Kurek <starfire24680@gmail.com> | ||
3 | Date: Thu, 7 Jul 2022 03:39:16 +0000 | ||
4 | Subject: [PATCH] Fix NULL dereference when duplicating string argument | ||
5 | |||
6 | poptGetArg can return NULL if there are no additional arguments, which | ||
7 | makes strdup dereference NULL on strlen | ||
8 | |||
9 | Upstream-Status: Submitted [https://sourceforge.net/p/gptfdisk/code/merge-requests/28/] | ||
10 | |||
11 | --- | ||
12 | gptcl.cc | 6 ++++-- | ||
13 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/gptcl.cc b/gptcl.cc | ||
16 | index 0d578eb..ab95239 100644 | ||
17 | --- a/gptcl.cc | ||
18 | +++ b/gptcl.cc | ||
19 | @@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { | ||
20 | } // while | ||
21 | |||
22 | // Assume first non-option argument is the device filename.... | ||
23 | - device = strdup((char*) poptGetArg(poptCon)); | ||
24 | - poptResetContext(poptCon); | ||
25 | + device = (char*) poptGetArg(poptCon); | ||
26 | |||
27 | if (device != NULL) { | ||
28 | + device = strdup(device); | ||
29 | + poptResetContext(poptCon); | ||
30 | JustLooking(); // reset as necessary | ||
31 | BeQuiet(); // Tell called functions to be less verbose & interactive | ||
32 | if (LoadPartitions((string) device)) { | ||
33 | @@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { | ||
34 | cerr << "Error encountered; not saving changes.\n"; | ||
35 | retval = 4; | ||
36 | } // if | ||
37 | + free(device); | ||
38 | } // if (device != NULL) | ||
39 | poptFreeContext(poptCon); | ||
40 | return retval; | ||
41 | |||
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb index cf0a60a1a9..ba891931ac 100644 --- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb +++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb | |||
@@ -9,12 +9,8 @@ DEPENDS = "util-linux" | |||
9 | 9 | ||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \ | 10 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \ |
11 | file://0001-gptcurses-correctly-include-curses.h.patch \ | 11 | file://0001-gptcurses-correctly-include-curses.h.patch \ |
12 | file://0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch \ | ||
13 | file://0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch \ | ||
14 | file://0001-Use-64bit-time_t-on-linux-as-well.patch \ | ||
15 | file://popt-1.19-follow-up.patch \ | ||
16 | " | 12 | " |
17 | SRC_URI[sha256sum] = "dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2" | 13 | SRC_URI[sha256sum] = "2abed61bc6d2b9ec498973c0440b8b804b7a72d7144069b5a9209b2ad693a282" |
18 | 14 | ||
19 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/" | 15 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/" |
20 | UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/" | 16 | UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/" |