Hello community, here is the log from the commit of package gptfdisk for openSUSE:Factory checked in at 2013-08-01 06:54:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gptfdisk (Old) and /work/SRC/openSUSE:Factory/.gptfdisk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gptfdisk" Changes: -------- --- /work/SRC/openSUSE:Factory/gptfdisk/gptfdisk.changes 2013-04-02 11:49:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gptfdisk.new/gptfdisk.changes 2013-08-01 06:54:45.000000000 +0200 @@ -1,0 +2,23 @@ +Mon Jul 29 22:18:09 UTC 2013 - [email protected] + +- Update to new upstream release 0.8.7 + * Small improvements and bug fixes mark this revision. + * Three new partition type codes have been added: + freedesktop.org's proposed $BOOT partition (type code EA00), + the Intel Rapid Start partition (code 8400), + and for Haiku's BFS (code EB00). + * Removed a stray debug message that appeared when reading MBR + disks. + * The "converting MBR to GPT" message has been modified to + clarify that changes are being held in memory. + * The Mac version now works on /dev/rdisk* devices as well as + /dev/disk* devices. + * When used with /dev/rdisk* devices, the partition table can + sometimes be re-read without rebooting or unplugging and + re-inserting the disk. + * Finally, cgdisk now supports a -a option, which works similarly + to the -a option in cfdisk. +- remove gptfdisk-0.8.5-fix-test-suite-short-opt-usage.patch, is + upstream merged + +------------------------------------------------------------------- @@ -11,0 +35,3 @@ + * new check in the verification code + * support for building under Solaris. + * fix Mac OS X build Old: ---- gptfdisk-0.8.5-fix-test-suite-short-opt-usage.patch gptfdisk-0.8.6.tar.gz New: ---- gptfdisk-0.8.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gptfdisk.spec ++++++ --- /var/tmp/diff_new_pack.FRh8BU/_old 2013-08-01 06:54:46.000000000 +0200 +++ /var/tmp/diff_new_pack.FRh8BU/_new 2013-08-01 06:54:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: gptfdisk -Version: 0.8.6 +Version: 0.8.7 Release: 0 Summary: GPT partitioning and MBR repair software License: GPL-2.0 @@ -26,7 +26,6 @@ #DL-URL: http://downloads.sf.net/gptfdisk/gptfdisk-0.8.6.tar.gz Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.gz -Patch1: gptfdisk-0.8.5-fix-test-suite-short-opt-usage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: ncurses-devel @@ -64,7 +63,6 @@ %prep %setup -q -%patch -P 1 -p1 %build CFLAGS="%optflags" CXXFLAGS="%optflags" make %{?_smp_mflags} ++++++ gptfdisk-0.8.6.tar.gz -> gptfdisk-0.8.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/NEWS new/gptfdisk-0.8.7/NEWS --- old/gptfdisk-0.8.6/NEWS 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/NEWS 2013-07-09 04:01:10.000000000 +0200 @@ -1,3 +1,43 @@ +0.8.7 (7/8/2013): +----------------- + +- Modified Mac version so that it can work on /dev/rdisk* devices as well + as /dev/disk* devices. The result is that, when using the /dev/rdisk* + devices, the partition table can sometimes be re-read without removing + the disk or rebooting. + +- Added "-a" option to cgdisk to use a ">" symbol to the left of the + selected partition rather than ncurses highlighting. + +- Modified "converting MBR to GPT" message to clarify that the conversion + is being held in memory, since some people have mistakenly assumed that a + "gdisk -l" operation will change an MBR disk to a GPT disk without + prompting. + +- Added partition type code for freedesktop.org's proposed $BOOT partition + (bc13c2ff-59e6-4262-a352-b275fd6f7172; GPT fdisk type code EA00) + +- Adjusted alignment code when using -n or -N in sgdisk to keep the + requested partition size (if specified using +###{MGT} terminology) + as the requested value rather than relative to the requested start + point. This gives you the requested partition size rather than be + slightly smaller if sgdisk needs to adjust the start point up a bit and + it prevents gaps from appearing between partitions if several are created + in succession using automatic placement of the start point. + +- Fixed small bugs in gdisk_test.sh script. + +- Removed stray debug message that would appear when reading MBR disks. + +- Added partition type code for Intel Rapid Start partition (GUID + D3BFE2DE-3DAF-11DF-BA40-E3A556D89593, code 8400), used by systems that + implement Intel's Rapid Start technology. See + http://blog.adios.tw/2012/10/funtoo-linux-and-intel-rapid-start.html or + http://mjg59.dreamwidth.org/26022.html. + +- Added partition type code for Haiku BFS (GUID + 42465331-3BA3-10F1-802A-4861696B7521; code EB00). + 0.8.6 (1/9/2013): ----------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/README new/gptfdisk-0.8.7/README --- old/gptfdisk-0.8.6/README 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/README 2013-07-09 04:01:10.000000000 +0200 @@ -163,8 +163,10 @@ To compile GPT fdisk, you must have appropriate development tools installed, most notably the GNU Compiler Collection (GCC) and its g++ -compiler for C++. (Under Windows, Microsoft Visual C++ 2008 can also be -used.) In addition, note these requirements: +compiler for C++. I've also tested compilation with Clang, which seems to +work; however, I've not done extensive testing of the resulting binaries, +beyond checking a few basics. Under Windows, Microsoft Visual C++ 2008 can +be used instead. In addition, note these requirements: * On Linux, FreeBSD, OS X, and Solaris, libuuid must be installed. This is the standard for Linux and OS X, although you may need to install a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/cgdisk.8 new/gptfdisk-0.8.7/cgdisk.8 --- old/gptfdisk-0.8.6/cgdisk.8 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/cgdisk.8 2013-07-09 04:01:10.000000000 +0200 @@ -1,10 +1,11 @@ .\" Copyright 2011-2013 Roderick W. Smith ([email protected]) .\" May be distributed under the GNU General Public License -.TH "CGDISK" "8" "0.8.6" "Roderick W. Smith" "GPT fdisk Manual" +.TH "CGDISK" "8" "0.8.7" "Roderick W. Smith" "GPT fdisk Manual" .SH "NAME" cgdisk \- Curses-based GUID partition table (GPT) manipulator .SH "SYNOPSIS" .BI "cgdisk " +[ \-a ] .I device .SH "DESCRIPTION" @@ -105,6 +106,13 @@ .PP +Only one command-line option is accepted, aside from the device filename: +\fI\-a\fR. This option alters the highlighting of partitions and blocks of +free space: Instead of using ncurses, when \fI\-a\fR is used \fBcgdisk\fR +uses a ">" symbol to the left of the selected partition or free space. +This option is intended for use on limited display devices such as +teletypes and screen readers. + Interactions with \fBcgdisk\fR occur with its interactive text\-mode menus. The display is broken into two interactive parts: @@ -268,7 +276,7 @@ .SH "BUGS" -As of January 2013 (version 0.8.6), \fBcgdisk\fR should be considered +As of July 2013 (version 0.8.7), \fBcgdisk\fR should be considered beta software. Although the underlying partition manipulation code is much older, the \fBcgdisk\fR ncurses user interface is brand new with GPT fdisk version 0.8.0. Known bugs and limitations include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/cgdisk.cc new/gptfdisk-0.8.7/cgdisk.cc --- old/gptfdisk-0.8.6/cgdisk.cc 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/cgdisk.cc 2013-07-09 04:01:09.000000000 +0200 @@ -20,7 +20,7 @@ /* This class implements an interactive curses-based interface atop the GPTData class */ -#include <string> +#include <string.h> #include "gptcurses.h" using namespace std; @@ -29,6 +29,7 @@ int main(int argc, char *argv[]) { string device = ""; + int displayType = USE_CURSES; if (!SizesOK()) exit(1); @@ -41,16 +42,28 @@ exit(0); break; case 2: // basic usage - device = argv[1]; + device = (string) argv[1]; + break; + case 3: // "-a" usage or illegal + if (strcmp(argv[1], "-a") == 0) { + device = (string) argv[2]; + } else if (strcmp(argv[2], "-a") == 0) { + device = (string) argv[1]; + } else { + cerr << "Usage: " << argv[0] << " [-a] device_file\n"; + exit(1); + } // if/elseif/else + displayType = USE_ARROW; break; default: - cerr << "Usage: " << argv[0] << " device_file\n"; + cerr << "Usage: " << argv[0] << " [-a] device_file\n"; exit(1); break; } // switch GPTDataCurses theGPT; + theGPT.SetDisplayType(displayType); if (theGPT.LoadPartitions(device)) { if (theGPT.GetState() != use_gpt) { Report("Warning! Non-GPT or damaged disk detected! This program will attempt to\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/cgdisk.html new/gptfdisk-0.8.7/cgdisk.html --- old/gptfdisk-0.8.6/cgdisk.html 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/cgdisk.html 2013-07-09 04:01:10.000000000 +0200 @@ -3,7 +3,7 @@ <HTML><HEAD><TITLE>Manpage of CGDISK</TITLE> </HEAD><BODY> <H1>CGDISK</H1> -Section: GPT fdisk Manual (8)<BR>Updated: 0.8.6<BR><A HREF="#index">Index</A> +Section: GPT fdisk Manual (8)<BR>Updated: 0.8.7<BR><A HREF="#index">Index</A> <A HREF="http://localhost/cgi-bin/man/man2html";>Return to Main Contents</A><HR> <A NAME="lbAB"> </A> @@ -15,6 +15,7 @@ <B>cgdisk </B> +[ -a ] <I>device</I> <P> @@ -128,6 +129,13 @@ <P> <P> +Only one command-line option is accepted, aside from the device filename: +<I>-a</I>. This option alters the highlighting of partitions and blocks of +free space: Instead of using ncurses, when <I>-a</I> is used <B>cgdisk</B> +uses a ">" symbol to the left of the selected partition or free space. +This option is intended for use on limited display devices such as +teletypes and screen readers. +<P> Interactions with <B>cgdisk</B> occur with its interactive text-mode menus. The display is broken into two interactive parts: <P> @@ -322,7 +330,7 @@ <H2>BUGS</H2> <P> -As of January 2013 (version 0.8.6), <B>cgdisk</B> should be considered +As of July 2013 (version 0.8.7), <B>cgdisk</B> should be considered beta software. Although the underlying partition manipulation code is much older, the <B>cgdisk</B> ncurses user interface is brand new with GPT fdisk version 0.8.0. Known bugs and limitations include: @@ -472,6 +480,6 @@ This document was created by <A HREF="http://localhost/cgi-bin/man/man2html";>man2html</A>, using the manual pages.<BR> -Time: 16:09:33 GMT, January 09, 2013 +Time: 02:01:10 GMT, July 09, 2013 </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/current.spec new/gptfdisk-0.8.7/current.spec --- old/gptfdisk-0.8.6/current.spec 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/current.spec 2013-07-09 04:01:10.000000000 +0200 @@ -1,11 +1,11 @@ Summary: GPT partitioning and MBR repair software Name: gptfdisk -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} License: GPLv2 URL: http://www.rodsbooks.com/gdisk Group: Applications/System -Source: http://www.rodsbooks.com/gdisk/gptfdisk-0.8.6.tar.gz +Source: http://www.rodsbooks.com/gdisk/gptfdisk-0.8.7.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description @@ -80,5 +80,5 @@ %changelog -* Wed Jan 9 2013 R Smith <[email protected]> - 0.8.6 -- Created spec file for 0.8.6 release +* Mon Jul 8 2013 R Smith <[email protected]> - 0.8.7 +- Created spec file for 0.8.7 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/diskio-unix.cc new/gptfdisk-0.8.7/diskio-unix.cc --- old/gptfdisk-0.8.6/diskio-unix.cc 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/diskio-unix.cc 2013-07-09 04:01:09.000000000 +0200 @@ -73,7 +73,7 @@ if (fstat64(fd, &st) == 0) { if (S_ISDIR(st.st_mode)) cerr << "The specified path is a directory!\n"; -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__APPLE__) else if (S_ISCHR(st.st_mode)) cerr << "The specified path is a character device!\n"; #endif @@ -104,6 +104,7 @@ #ifdef __APPLE__ // MacOS X requires a shared lock under some circumstances.... if (fd < 0) { + cerr << "Warning: Devices opened with shared lock will not have their\npartition table automatically reloaded!\n"; fd = open(realFilename.c_str(), O_WRONLY | O_SHLOCK); } // if #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/fixparts.8 new/gptfdisk-0.8.7/fixparts.8 --- old/gptfdisk-0.8.6/fixparts.8 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/fixparts.8 2013-07-09 04:01:10.000000000 +0200 @@ -1,6 +1,6 @@ .\" Copyright 2011-2013 Roderick W. Smith ([email protected]) .\" May be distributed under the GNU General Public License -.TH "FIXPARTS" "8" "0.8.6" "Roderick W. Smith" "FixParts Manual" +.TH "FIXPARTS" "8" "0.8.7" "Roderick W. Smith" "FixParts Manual" .SH "NAME" fixparts \- MBR partition table repair utility .SH "SYNOPSIS" @@ -202,7 +202,7 @@ .PP .SH "BUGS" -As of January 2013 (version 0.8.6), \fBfixparts\fR +As of July 2013 (version 0.8.7), \fBfixparts\fR should be considered beta software. Known bugs and limitations include: .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/fixparts.html new/gptfdisk-0.8.7/fixparts.html --- old/gptfdisk-0.8.6/fixparts.html 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/fixparts.html 2013-07-09 04:01:10.000000000 +0200 @@ -3,7 +3,7 @@ <HTML><HEAD><TITLE>Manpage of FIXPARTS</TITLE> </HEAD><BODY> <H1>FIXPARTS</H1> -Section: FixParts Manual (8)<BR>Updated: 0.8.6<BR><A HREF="#index">Index</A> +Section: FixParts Manual (8)<BR>Updated: 0.8.7<BR><A HREF="#index">Index</A> <A HREF="http://localhost/cgi-bin/man/man2html";>Return to Main Contents</A><HR> <A NAME="lbAB"> </A> @@ -245,7 +245,7 @@ <A NAME="lbAF"> </A> <H2>BUGS</H2> -As of January 2013 (version 0.8.6), <B>fixparts</B> +As of July 2013 (version 0.8.7), <B>fixparts</B> should be considered beta software. Known bugs and limitations include: <P> <DL COMPACT> @@ -357,6 +357,6 @@ This document was created by <A HREF="http://localhost/cgi-bin/man/man2html";>man2html</A>, using the manual pages.<BR> -Time: 16:09:33 GMT, January 09, 2013 +Time: 02:01:10 GMT, July 09, 2013 </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gdisk.8 new/gptfdisk-0.8.7/gdisk.8 --- old/gptfdisk-0.8.6/gdisk.8 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gdisk.8 2013-07-09 04:01:10.000000000 +0200 @@ -1,6 +1,6 @@ .\" Copyright 2011-2013 Roderick W. Smith ([email protected]) .\" May be distributed under the GNU General Public License -.TH "GDISK" "8" "0.8.6" "Roderick W. Smith" "GPT fdisk Manual" +.TH "GDISK" "8" "0.8.7" "Roderick W. Smith" "GPT fdisk Manual" .SH "NAME" gdisk \- Interactive GUID partition table (GPT) manipulator .SH "SYNOPSIS" @@ -561,7 +561,7 @@ usually bypasses the prompt entirely. .SH "BUGS" -As of January 2013 (version 0.8.6), \fBgdisk\fR +As of July 2013 (version 0.8.7), \fBgdisk\fR should be considered beta software. Known bugs and limitations include: .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gdisk.html new/gptfdisk-0.8.7/gdisk.html --- old/gptfdisk-0.8.6/gdisk.html 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gdisk.html 2013-07-09 04:01:10.000000000 +0200 @@ -3,7 +3,7 @@ <HTML><HEAD><TITLE>Manpage of GDISK</TITLE> </HEAD><BODY> <H1>GDISK</H1> -Section: GPT fdisk Manual (8)<BR>Updated: 0.8.6<BR><A HREF="#index">Index</A> +Section: GPT fdisk Manual (8)<BR>Updated: 0.8.7<BR><A HREF="#index">Index</A> <A HREF="http://localhost/cgi-bin/man/man2html";>Return to Main Contents</A><HR> <A NAME="lbAB"> </A> @@ -656,7 +656,7 @@ <A NAME="lbAF"> </A> <H2>BUGS</H2> -As of January 2013 (version 0.8.6), <B>gdisk</B> +As of July 2013 (version 0.8.7), <B>gdisk</B> should be considered beta software. Known bugs and limitations include: <P> <DL COMPACT> @@ -816,6 +816,6 @@ This document was created by <A HREF="http://localhost/cgi-bin/man/man2html";>man2html</A>, using the manual pages.<BR> -Time: 16:09:33 GMT, January 09, 2013 +Time: 02:01:10 GMT, July 09, 2013 </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gdisk_test.sh new/gptfdisk-0.8.7/gdisk_test.sh --- old/gptfdisk-0.8.6/gdisk_test.sh 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gdisk_test.sh 2013-07-09 04:01:09.000000000 +0200 @@ -147,7 +147,7 @@ ;; sgdisk) - $SGDISK_BIN $TEMP_DISK -${OPT_NEW}=1 -${OPT_CHANGE_NAME}=1:"${TEST_PART_DEFAULT_NAME}" + $SGDISK_BIN $TEMP_DISK -${OPT_NEW} 1 -${OPT_CHANGE_NAME} 1:"${TEST_PART_DEFAULT_NAME}" ;; esac @@ -171,7 +171,7 @@ ;; sgdisk) - $SGDISK_BIN $TEMP_DISK -${OPT_CHANGE_NAME}=1:${TEST_PART_NEWNAME} + $SGDISK_BIN $TEMP_DISK -${OPT_CHANGE_NAME} 1:${TEST_PART_NEWNAME} ;; esac @@ -195,7 +195,7 @@ ;; sgdisk) - $SGDISK_BIN $TEMP_DISK -${OPT_CHANGE_TYPE}=1:${TEST_PART_NEWTYPE} + $SGDISK_BIN $TEMP_DISK -${OPT_CHANGE_TYPE} 1:${TEST_PART_NEWTYPE} ;; esac @@ -219,7 +219,7 @@ ;; sgdisk) - $SGDISK_BIN $TEMP_DISK -${OPT_BACKUP}=${GPT_BACKUP_FILENAME} + $SGDISK_BIN $TEMP_DISK -${OPT_BACKUP} ${GPT_BACKUP_FILENAME} ;; esac @@ -248,7 +248,7 @@ ;; sgdisk) - $SGDISK_BIN $TEMP_DISK -${OPT_DELETE}=1 + $SGDISK_BIN $TEMP_DISK -${OPT_DELETE} 1 ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gpt.cc new/gptfdisk-0.8.7/gpt.cc --- old/gptfdisk-0.8.6/gpt.cc 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gpt.cc 2013-07-09 04:01:09.000000000 +0200 @@ -1429,12 +1429,14 @@ if ((state == gpt_invalid) && ((mbrState == mbr) || (mbrState == hybrid))) { cout << "\n***************************************************************\n" - << "Found invalid GPT and valid MBR; converting MBR to GPT format.\n"; + << "Found invalid GPT and valid MBR; converting MBR to GPT format\n" + << "in memory. "; if (!justLooking) { - cout << "\aTHIS OPERATION IS POTENTIALLY DESTRUCTIVE! Exit by typing 'q' if\n" - << "you don't want to convert your MBR partitions to GPT format!\n"; + cout << "\aTHIS OPERATION IS POTENTIALLY DESTRUCTIVE! Exit by\n" + << "typing 'q' if you don't want to convert your MBR partitions\n" + << "to GPT format!"; } // if - cout << "***************************************************************\n\n"; + cout << "\n***************************************************************\n\n"; which = use_mbr; } // if @@ -2088,7 +2090,7 @@ } // GPTData::FindFirstInLargest() // Find the last available block on the disk. -// Returns 0 if there are no available partitions +// Returns 0 if there are no available sectors uint64_t GPTData::FindLastAvailable(void) { uint64_t last; uint32_t i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gpt.h new/gptfdisk-0.8.7/gpt.h --- old/gptfdisk-0.8.6/gpt.h 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gpt.h 2013-07-09 04:01:09.000000000 +0200 @@ -134,7 +134,7 @@ // Convert between GPT and other formats virtual WhichToUse UseWhichPartitions(void); void XFormPartitions(void); - virtual int XFormDisklabel(uint32_t partNum); + int XFormDisklabel(uint32_t partNum); int XFormDisklabel(BSDData* disklabel); int OnePartToMBR(uint32_t gptPart, int mbrPart); // add one partition to MBR. Returns 1 if successful diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gptcl.cc new/gptfdisk-0.8.7/gptcl.cc --- old/gptfdisk-0.8.6/gptcl.cc 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gptcl.cc 2013-07-09 04:01:09.000000000 +0200 @@ -280,6 +280,7 @@ if (partNum < 0) partNum = FindFirstFreePart(); low = FindFirstInLargest(); + Align(&low); high = FindLastInFree(low); startSector = IeeeToInt(GetString(newPartInfo, 2), sSize, low, high, low); endSector = IeeeToInt(GetString(newPartInfo, 3), sSize, startSector, high, high); @@ -295,6 +296,7 @@ case 'N': JustLooking(0); startSector = FindFirstInLargest(); + Align(&startSector); endSector = FindLastInFree(startSector); if (largestPartNum < 0) largestPartNum = FindFirstFreePart(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gptcurses.cc new/gptfdisk-0.8.7/gptcurses.cc --- old/gptfdisk-0.8.6/gptcurses.cc 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gptcurses.cc 2013-07-09 04:01:09.000000000 +0200 @@ -53,6 +53,7 @@ currentSpaceNum = -1; whichOptions = ""; // current set of options currentKey = 'b'; // currently selected option + displayType = USE_CURSES; } // GPTDataCurses constructor GPTDataCurses::~GPTDataCurses(void) { @@ -273,10 +274,16 @@ for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) { if (i < numSpaces) { // real space; show it if (i == selected) { - attron(A_REVERSE); currentSpaceNum = i; - currentSpace = ShowSpace(i, lineNum++); - attroff(A_REVERSE); + if (displayType == USE_CURSES) { + attron(A_REVERSE); + currentSpace = ShowSpace(i, lineNum++); + attroff(A_REVERSE); + } else { + currentSpace = ShowSpace(i, lineNum); + move(lineNum++, 0); + printw(">"); + } DisplayOptions(i); retval = selected; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gptcurses.h new/gptfdisk-0.8.7/gptcurses.h --- old/gptfdisk-0.8.6/gptcurses.h 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gptcurses.h 2013-07-09 04:01:09.000000000 +0200 @@ -54,6 +54,9 @@ #define EMPTY_SPACE_OPTIONS "abhlnqvw" #define PARTITION_OPTIONS "abdhilmqtvw" +// Constants for how to highlight a selected menu item +#define USE_CURSES 1 +#define USE_ARROW 2 // A "Space" is a partition or an unallocated chunk of disk space, maintained // in a doubly-linked-list data structure to facilitate creating displays of @@ -81,6 +84,7 @@ string whichOptions; char currentKey; int numSpaces; + int displayType; // Functions relating to Spaces data structures void EmptySpaces(void); @@ -111,6 +115,7 @@ void LoadBackup(void); void ShowHelp(void); // User input and menuing functions + void SetDisplayType(int dt) {displayType = dt;} void ChangeSpaceSelection(int delta); void MoveSelection(int delta); void DisplayOptions(char selectedKey); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gptpart.cc new/gptfdisk-0.8.7/gptpart.cc --- old/gptfdisk-0.8.6/gptpart.cc 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gptpart.cc 2013-07-09 04:01:09.000000000 +0200 @@ -91,7 +91,6 @@ // Return 1 if the partition is in use int GPTPart::IsUsed(void) { return (partitionType != GUIDData("0x00")); -// return (firstLBA != UINT64_C(0)); } // GPTPart::IsUsed() // Set the type code to the specified one. Also changes the partition @@ -114,7 +113,6 @@ // Set the name for a partition to theName, using a Unicode string as // input. void GPTPart::SetName(const UnicodeString & theName) { - cout << "Entering GPTPart::SetName(const UnicodeString...)\n"; if (theName.isBogus()) { cerr << "Bogus UTF-16 name found in GPTPart::SetName()! Name not changed!\n"; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/gpttext.cc new/gptfdisk-0.8.7/gpttext.cc --- old/gptfdisk-0.8.6/gpttext.cc 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/gpttext.cc 2013-07-09 04:01:09.000000000 +0200 @@ -132,7 +132,7 @@ numDone = GPTData::XFormDisklabel(partNum); return numDone; -} // GPTData::XFormDisklabel(int i) +} // GPTData::XFormDisklabel(void) /********************************************************************* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/mbrpart.cc new/gptfdisk-0.8.7/mbrpart.cc --- old/gptfdisk-0.8.6/mbrpart.cc 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/mbrpart.cc 2013-07-09 04:01:09.000000000 +0200 @@ -319,7 +319,7 @@ void MBRPart::ShowData(int isGpt) { char bootCode = ' '; - if (status && 0x80) // it's bootable + if (status & 0x80) // it's bootable bootCode = '*'; cout.fill(' '); cout << bootCode << " "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/parttypes.cc new/gptfdisk-0.8.7/parttypes.cc --- old/gptfdisk-0.8.6/parttypes.cc 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/parttypes.cc 2013-07-09 04:01:09.000000000 +0200 @@ -110,6 +110,11 @@ AddType(0x8200, "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F", "Linux swap"); // Linux swap (or Solaris on MBR) AddType(0x8300, "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "Linux filesystem"); // Linux native AddType(0x8301, "8DA63339-0007-60C0-C436-083AC8230908", "Linux reserved"); + + // Used by Intel Rapid Start technology + AddType(0x8400, "D3BFE2DE-3DAF-11DF-BA40-E3A556D89593", "Intel Rapid Start"); + + // Another Linux type code.... AddType(0x8e00, "E6D6D379-F507-44C2-A23C-238F2A3DF928", "Linux LVM"); // FreeBSD partition types.... @@ -172,6 +177,12 @@ AddType(0xc001, "75894C1E-3AEB-11D3-B7C1-7B03A0000000", "HP-UX data"); AddType(0xc002, "E2A1E728-32E3-11D6-A682-7B03A0000000", "HP-UX service"); + // See http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec + AddType(0xea00, "BC13C2FF-59E6-4262-A352-B275FD6F7172", "Freedesktop $BOOT"); + + // Type code for Haiku; uses BeOS MBR code as hex code base + AddType(0xeb00, "42465331-3BA3-10F1-802A-4861696B7521", "Haiku BFS"); + // Sony uses this GUID on some of its computers. AddType(0xed00, "F4019732-066E-4E12-8273-346C5641494F", "Sony system partition"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/sgdisk.8 new/gptfdisk-0.8.7/sgdisk.8 --- old/gptfdisk-0.8.6/sgdisk.8 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/sgdisk.8 2013-07-09 04:01:10.000000000 +0200 @@ -1,6 +1,6 @@ .\" Copyright 2011-2013 Roderick W. Smith ([email protected]) .\" May be distributed under the GNU General Public License -.TH "SGDISK" "8" "0.8.6" "Roderick W. Smith" "GPT fdisk Manual" +.TH "SGDISK" "8" "0.8.7" "Roderick W. Smith" "GPT fdisk Manual" .SH "NAME" sgdisk \- Command\-line GUID partition table (GPT) manipulator for Linux and Unix .SH "SYNOPSIS" @@ -490,7 +490,7 @@ Disk replication operation (-R) failed .SH "BUGS" -As of January 2013 (version 0.8.6), \fBsgdisk\fR +As of July 2013 (version 0.8.7), \fBsgdisk\fR should be considered beta software. Known bugs and limitations include: .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/sgdisk.html new/gptfdisk-0.8.7/sgdisk.html --- old/gptfdisk-0.8.6/sgdisk.html 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/sgdisk.html 2013-07-09 04:01:10.000000000 +0200 @@ -3,7 +3,7 @@ <HTML><HEAD><TITLE>Manpage of SGDISK</TITLE> </HEAD><BODY> <H1>SGDISK</H1> -Section: GPT fdisk Manual (8)<BR>Updated: 0.8.6<BR><A HREF="#index">Index</A> +Section: GPT fdisk Manual (8)<BR>Updated: 0.8.7<BR><A HREF="#index">Index</A> <A HREF="http://localhost/cgi-bin/man/man2html";>Return to Main Contents</A><HR> <A NAME="lbAB"> </A> @@ -563,7 +563,7 @@ <A NAME="lbAG"> </A> <H2>BUGS</H2> -As of January 2013 (version 0.8.6), <B>sgdisk</B> +As of July 2013 (version 0.8.7), <B>sgdisk</B> should be considered beta software. Known bugs and limitations include: <P> <DL COMPACT> @@ -711,6 +711,6 @@ This document was created by <A HREF="http://localhost/cgi-bin/man/man2html";>man2html</A>, using the manual pages.<BR> -Time: 16:09:33 GMT, January 09, 2013 +Time: 02:01:10 GMT, July 09, 2013 </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-0.8.6/support.h new/gptfdisk-0.8.7/support.h --- old/gptfdisk-0.8.6/support.h 2013-01-09 17:09:33.000000000 +0100 +++ new/gptfdisk-0.8.7/support.h 2013-07-09 04:01:09.000000000 +0200 @@ -8,7 +8,7 @@ #ifndef __GPTSUPPORT #define __GPTSUPPORT -#define GPTFDISK_VERSION "0.8.6" +#define GPTFDISK_VERSION "0.8.7" #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
