diff --git a/.gitignore b/.gitignore index 12535bf..98a2ae2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ gdisk-0.6.8.tgz /gptfdisk-0.8.5.tar.gz /gptfdisk-0.8.6.tar.gz /gptfdisk-0.8.7.tar.gz +/gptfdisk-0.8.8.tar.gz diff --git a/gdisk-0.8.7-add-range-check.patch b/gdisk-0.8.7-add-range-check.patch deleted file mode 100644 index bd9f09c..0000000 --- a/gdisk-0.8.7-add-range-check.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gptfdisk-0.8.7.old/gpt.cc 2013-07-09 03:01:09.000000000 +0100 -+++ gptfdisk-0.8.7/gpt.cc 2013-09-13 14:12:19.154495469 +0100 -@@ -1402,6 +1402,10 @@ - - // Show detailed information on the specified partition - void GPTData::ShowPartDetails(uint32_t partNum) { -+ if (partNum >= numParts) { -+ cerr << "Partition number out of range\n"; -+ exit (1); -+ } - if (!IsFreePartNum(partNum)) { - partitions[partNum].ShowDetails(blockSize); - } else { diff --git a/gdisk.spec b/gdisk.spec index c1d98b8..982c56e 100644 --- a/gdisk.spec +++ b/gdisk.spec @@ -1,14 +1,11 @@ Summary: An fdisk-like partitioning tool for GPT disks Name: gdisk -Version: 0.8.7 -Release: 2%{?dist} +Version: 0.8.8 +Release: 1%{?dist} License: GPLv2 URL: http://www.rodsbooks.com/gdisk/ Group: System Environment/Base Source0: http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz -Patch0: gptfdisk-0.8.1-gcc47.patch -# RHBZ#1007847 - patch sent upstream on 2013-09-13. -Patch1: gdisk-0.8.7-add-range-check.patch BuildRequires: popt-devel BuildRequires: libicu-devel BuildRequires: libuuid-devel @@ -22,8 +19,6 @@ tables, and the ability to convert MBR disks to GPT format. %prep %setup -q -n gptfdisk-%{version} -%patch0 -p1 -%patch1 -p1 chmod 0644 gdisk_test.sh %build @@ -52,6 +47,9 @@ done %{_mandir}/man8/fixparts.8* %changelog +* Tue Oct 17 2013 Terje Rosten - 0.8.8-1 +- 0.8.8 + * Fri Sep 13 2013 Richard W.M. Jones - 0.8.7-2 - Range check -i option (RHBZ#1007847). diff --git a/gptfdisk-0.8.1-gcc47.patch b/gptfdisk-0.8.1-gcc47.patch deleted file mode 100644 index 392ef4a..0000000 --- a/gptfdisk-0.8.1-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gptfdisk-0.8.1/diskio-unix.cc~ 2011-10-01 23:52:33.000000000 +0200 -+++ gptfdisk-0.8.1/diskio-unix.cc 2012-01-05 10:14:49.440260712 +0100 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include - diff --git a/sources b/sources index 3b9ff8a..33b8d4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -005b45c0b37c37a99024704fdb2ee610 gptfdisk-0.8.7.tar.gz +bd47d03ec27bab5613254b5a20f72143 gptfdisk-0.8.8.tar.gz