git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d 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 ---
  10  NEWS      | 8 ++++++++
  11  gptcl.cc  | 2 +-
  12  support.h | 2 +-
  13  3 files changed, 10 insertions(+), 2 deletions(-)
  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 diff --git a/support.h b/support.h
  45 index 8ba9ad1..f91f1bc 100644
  46 --- a/support.h
  47 +++ b/support.h
  48 @@ -8,7 +8,7 @@
  49  #include <stdlib.h>
  50  #include <string>
  51
  52 -#define GPTFDISK_VERSION "1.0.9"
  53 +#define GPTFDISK_VERSION "1.0.9.1"
  54
  55  #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
  56  // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64
  57 --
  58 2.30.2
  59