diff --git a/0001-Remove-stray-debugging-code.patch b/0001-Remove-stray-debugging-code.patch deleted file mode 100644 index ef5d344c2d7c94c7ab4e5a19da138bac86bbc662..0000000000000000000000000000000000000000 --- a/0001-Remove-stray-debugging-code.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1e084b3ac2ec8b4b448c2290ed4fa88e4c4212c4 Mon Sep 17 00:00:00 2001 -From: Rod Smith -Date: Sat, 9 Oct 2021 15:52:16 -0400 -Subject: [PATCH] Remove stray debugging code - ---- - NEWS | 6 ++++++ - gptcl.cc | 1 - - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index 18f6f21..4009a5b 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,9 @@ -+1.0.9 (?/?/2021): -+----------------- -+ -+- Removed stray debugging code that caused "partNum is {x}" to be printed -+ when changing a partition's name with sgdisk (-c/--change-name). -+ - 1.0.8 (6/9/2021): - ----------------- - -diff --git a/gptcl.cc b/gptcl.cc -index 65a99e9..ef7156e 100644 ---- a/gptcl.cc -+++ b/gptcl.cc -@@ -212,7 +212,6 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - partNum = (int) GetInt(partName, 1) - 1; - if (partNum < 0) - partNum = newPartNum; -- cout << "partNum is " << partNum << "\n"; - if ((partNum >= 0) && (partNum < (int) GetNumParts())) { - name = GetString(partName, 2); - if (SetName(partNum, (UnicodeString) name.c_str())) { --- -2.33.0 - diff --git a/0001-fix-Werror-format-security-error.patch b/0001-fix-Werror-format-security-error.patch deleted file mode 100644 index 11831be8988c38268d0683f05b7f02558d035c21..0000000000000000000000000000000000000000 --- a/0001-fix-Werror-format-security-error.patch +++ /dev/null @@ -1,88 +0,0 @@ -Subject: fix compiler error for option -Werror=format-security - -After ncurses upgrade to 6.3, it introduces a format-security -compile error. -To fix it, a format literal string is added. - -Reference: https://gitee.com/src-openeuler/gcc/issues/I4W7ZB - -Signed-off-by: Wei, Qiang - ---- -diff --git a/gptcurses.cc b/gptcurses.cc -index 1fbaad2..b9402cd 100644 ---- a/gptcurses.cc -+++ b/gptcurses.cc -@@ -239,22 +239,22 @@ Space* GPTDataCurses::ShowSpace(int spaceNum, int lineNum) { - ClearLine(lineNum); - if (space->partNum == -1) { // space is empty - move(lineNum, 12); -- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); -+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); - move(lineNum, 24); - printw("free space"); - } else { // space holds a partition - move(lineNum, 3); - printw("%d", space->partNum + 1); - move(lineNum, 12); -- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); -+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); - move(lineNum, 24); -- printw(space->origPart->GetTypeName().c_str()); -+ printw("%s", space->origPart->GetTypeName().c_str()); - move(lineNum, 50); - #ifdef USE_UTF16 - space->origPart->GetDescription().extract(0, 39, temp, 39); - printw(temp); - #else -- printw(space->origPart->GetDescription().c_str()); -+ printw("%s", space->origPart->GetDescription().c_str()); - #endif - } // if/else - } // if -@@ -271,10 +271,10 @@ int GPTDataCurses::DisplayParts(int selected) { - - move(lineNum++, 0); - theLine = "Part. # Size Partition Type Partition Name"; -- printw(theLine.c_str()); -+ printw("%s", theLine.c_str()); - move(lineNum++, 0); - theLine = "----------------------------------------------------------------"; -- printw(theLine.c_str()); -+ printw("%s", theLine.c_str()); - numToShow = LINES - RESERVED_TOP - RESERVED_BOTTOM; - pageNum = selected / numToShow; - for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) { -@@ -636,7 +636,7 @@ void GPTDataCurses::DisplayOptions(char selectedKey) { - } // if/else - } // for - move(LINES - 1, (COLS - optionDesc.length()) / 2); -- printw(optionDesc.c_str()); -+ printw("%s", optionDesc.c_str()); - currentKey = selectedKey; - } // if - } // GPTDataCurses::DisplayOptions() -@@ -748,11 +748,11 @@ void GPTDataCurses::DrawMenu(void) { - - clear(); - move(0, (COLS - title.length()) / 2); -- printw(title.c_str()); -+ printw("%s", title.c_str()); - move(2, (COLS - drive.length()) / 2); -- printw(drive.c_str()); -+ printw("%s", drive.c_str()); - move(3, (COLS - size.str().length()) / 2); -- printw(size.str().c_str()); -+ printw("%s", size.str().c_str()); - DisplayParts(currentSpaceNum); - } // DrawMenu - -@@ -802,7 +802,7 @@ void PromptToContinue(void) { - void Report(string theText) { - clear(); - move(0, 0); -- printw(theText.c_str()); -+ printw("%s", theText.c_str()); - move(LINES - 2, (COLS - 29) / 2); - printw("Press any key to continue...."); - cbreak(); diff --git a/gdisk.spec b/gdisk.spec index 5d821a322362108a6a8e4e9bf997812fc8ece690..bc7cbe4ffe3084a20666cbbb1e27ec03a7aac6c3 100644 --- a/gdisk.spec +++ b/gdisk.spec @@ -1,6 +1,6 @@ Name: gdisk -Version: 1.0.8 -Release: 3 +Version: 1.0.9 +Release: 1 Summary: GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools License: GPLv2 URL: http://www.rodsbooks.com/gdisk @@ -8,9 +8,6 @@ Source0: http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz BuildRequires:ncurses-devel util-linux-devel gcc-c++ popt-devel -Patch9000: 0001-fix-Werror-format-security-error.patch -Patch9001: 0001-Remove-stray-debugging-code.patch - %description GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools. rather than on the older MBR partition tables. @@ -51,6 +48,9 @@ install -Dp -m 0644 fixparts.8 %{buildroot}%{_mandir}/man8/fixparts.8 %{_mandir}/man8/* %changelog +* Thu Dec 8 2022 tangyuchen - 1.0.9-1 +- update to gptfdisk-1.0.9 + * Sat Oct 29 2022 wangzhiqiang - 1.0.8-3 - remove stray debugging code diff --git a/gptfdisk-1.0.8.tar.gz b/gptfdisk-1.0.8.tar.gz deleted file mode 100644 index 10795058fe54cca20eb04a8181d33118f1da3cbf..0000000000000000000000000000000000000000 Binary files a/gptfdisk-1.0.8.tar.gz and /dev/null differ diff --git a/gptfdisk-1.0.9.tar.gz b/gptfdisk-1.0.9.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..daf94814a090b8b0f6af668626ba18643ca9ce6e Binary files /dev/null and b/gptfdisk-1.0.9.tar.gz differ