Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gptfdisk for openSUSE:Factory checked in at 2021-02-18 20:38:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gptfdisk (Old) and /work/SRC/openSUSE:Factory/.gptfdisk.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gptfdisk" Thu Feb 18 20:38:24 2021 rev:20 rq:872010 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/gptfdisk/gptfdisk.changes 2020-09-09 17:45:40.414364745 +0200 +++ /work/SRC/openSUSE:Factory/.gptfdisk.new.28504/gptfdisk.changes 2021-02-18 20:41:46.446746993 +0100 @@ -1,0 +2,18 @@ +Tue Feb 9 22:56:48 UTC 2021 - John Paul Adrian Glaubitz <[email protected]> + +- Update to 1.0.6 + * Fixed bug that could cause segfault if GPT header claimed partition + entries are oversized. See: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0256 + * Fixed bug that could cause a crash if a badly-formatted MBR disk was + read. See: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-0308 + * Renamed the partition type "Freedesktop $BOOT" to "XBOOTLDR partition". + * Added several more Freedesktop partition table type codes (0x8312 through + 0x831C). + * Fixed type code definition in diskio-unix.cc that prevented 32-bit builds + from correctly handling disks over 4 TiB in size. + * Minor tweaks to get the software to compile on FreeBSD; that seems to have + fallen into disrepair. + +------------------------------------------------------------------- Old: ---- gptfdisk-1.0.5.tar.gz New: ---- gptfdisk-1.0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gptfdisk.spec ++++++ --- /var/tmp/diff_new_pack.e4Giyw/_old 2021-02-18 20:41:47.570748297 +0100 +++ /var/tmp/diff_new_pack.e4Giyw/_new 2021-02-18 20:41:47.570748297 +0100 @@ -1,7 +1,7 @@ # # spec file for package gptfdisk # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gptfdisk -Version: 1.0.5 +Version: 1.0.6 Release: 0 Summary: GPT partitioning and MBR repair software License: GPL-2.0-only ++++++ gptfdisk-1.0.5.tar.gz -> gptfdisk-1.0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/Makefile.freebsd new/gptfdisk-1.0.6/Makefile.freebsd --- old/gptfdisk-1.0.5/Makefile.freebsd 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/Makefile.freebsd 2021-01-13 23:14:27.000000000 +0100 @@ -1,5 +1,5 @@ -CC=gcc -CXX=g++ +CC=clang +CXX=clang++ CFLAGS+=-D_FILE_OFFSET_BITS=64 #CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 -I/usr/local/include CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/NEWS new/gptfdisk-1.0.6/NEWS --- old/gptfdisk-1.0.5/NEWS 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/NEWS 2021-01-13 23:14:27.000000000 +0100 @@ -1,3 +1,25 @@ +1.0.6 (1/13/2021): +------------------ + +- Fixed bug that could cause segfault if GPT header claimed partition + entries are oversized. See: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0256 + +- Fixed bug that could cause a crash if a badly-formatted MBR disk was + read. See: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-0308 + +- Renamed the partition type "Freedesktop $BOOT" to "XBOOTLDR partition". + +- Added several more Freedesktop partition table type codes (0x8312 through + 0x831C). + +- Fixed type code definition in diskio-unix.cc that prevented 32-bit builds + from correctly handling disks over 4 TiB in size. + +- Minor tweaks to get the software to compile on FreeBSD; that seems to have + fallen into disrepair. + 1.0.5 (2/17/2020): ------------------ @@ -17,13 +39,6 @@ - Added numerous type codes for Container Linux, Veracrypt, and Freedesktop.org's Discoverable Partitions Specification -- Apple no longer supports building i386 or "fat" binaries in XCode (or if - they do, they're making it hard), so I've removed that support. GPT fdisk - macOS binaries are now x86-64 only. Similarly, building now seems to - require macOS 10.9 or later, so that's now the minimum macOS version. I've - also re-built my Mac build environment and tweaked Makefile.mac - appropriately. - - Partition type name searches are now case-insensitive. - It's now possible to quit out of partition type name searches by typing @@ -32,6 +47,21 @@ - When changing a partition type code, the default is now the current type code, not a platform-specific type code. +- The UEFI GPT fdisk project + (https://sourceforge.net/projects/uefigptfdisk/) hasn't been updated since + 2016, and is now broken; binaries don't compile with modern GCC + toolchains, and even when dropping back to Ubuntu 14.04, which worked for + GPT fdisk 1.0.4, the resulting binary hangs on launch. Therefore, I'm + dropping support for the EFI build of gdisk, at least unless and until + UEFI GPT fdisk is fixed. + +- Apple no longer supports building i386 or "fat" binaries in XCode (or if + they do, they're making it hard), so I've removed that support. GPT fdisk + macOS binaries are now x86-64 only. Similarly, building now seems to + require macOS 10.9 or later, so that's now the minimum macOS version. I've + also re-built my Mac build environment and tweaked Makefile.mac + appropriately. + 1.0.4 (7/5/2018): ----------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/attributes.h new/gptfdisk-1.0.6/attributes.h --- old/gptfdisk-1.0.5/attributes.h 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/attributes.h 2021-01-13 23:14:27.000000000 +0100 @@ -1,12 +1,12 @@ /* This program is copyright (c) 2009-2011 by Roderick W. Smith. It is distributed under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ -#include <stdint.h> -#include <string> - #ifndef __GPT_ATTRIBUTES #define __GPT_ATTRIBUTES +#include <stdint.h> +#include <string> + #define NUM_ATR 64 /* # of attributes -- 64, since it's a 64-bit field */ #define ATR_NAME_SIZE 25 /* maximum size of attribute names */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/basicmbr.cc new/gptfdisk-1.0.6/basicmbr.cc --- old/gptfdisk-1.0.5/basicmbr.cc 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/basicmbr.cc 2021-01-13 23:14:27.000000000 +0100 @@ -290,7 +290,8 @@ if (EbrLocations[i] == offset) { // already read this one; infinite logical partition loop! cerr << "Logical partition infinite loop detected! This is being corrected.\n"; allOK = -1; - partNum -= 1; + if (partNum > 0) //don't go negative + partNum -= 1; } // if } // for EbrLocations[partNum] = offset; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/basicmbr.h new/gptfdisk-1.0.6/basicmbr.h --- old/gptfdisk-1.0.5/basicmbr.h 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/basicmbr.h 2021-01-13 23:14:27.000000000 +0100 @@ -3,14 +3,14 @@ /* This program is copyright (c) 2009-2013 by Roderick W. Smith. It is distributed under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ +#ifndef __BASICMBRSTRUCTS +#define __BASICMBRSTRUCTS + #include <stdint.h> #include <sys/types.h> #include "diskio.h" #include "mbrpart.h" -#ifndef __BASICMBRSTRUCTS -#define __BASICMBRSTRUCTS - #define MBR_SIGNATURE UINT16_C(0xAA55) // Maximum number of MBR partitions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/bsd.h new/gptfdisk-1.0.6/bsd.h --- old/gptfdisk-1.0.5/bsd.h 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/bsd.h 2021-01-13 23:14:27.000000000 +0100 @@ -3,14 +3,14 @@ /* This program is copyright (c) 2009 by Roderick W. Smith. It is distributed under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ +#ifndef __BSD_STRUCTS +#define __BSD_STRUCTS + #include <stdint.h> #include <sys/types.h> #include "gptpart.h" #include "diskio.h" -#ifndef __BSD_STRUCTS -#define __BSD_STRUCTS - #define BSD_SIGNATURE UINT32_C(0x82564557) /* BSD disklabel signature ("magic") */ // BSD disklabels can start at offsets of 64 or the sector size -- at least, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/cgdisk.8 new/gptfdisk-1.0.6/cgdisk.8 --- old/gptfdisk-1.0.5/cgdisk.8 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/cgdisk.8 2021-01-13 23:14:27.000000000 +0100 @@ -1,6 +1,6 @@ -.\" Copyright 2011-2020 Roderick W. Smith ([email protected]) +.\" Copyright 2011-2021 Roderick W. Smith ([email protected]) .\" May be distributed under the GNU General Public License -.TH "CGDISK" "8" "1.0.5" "Roderick W. Smith" "GPT fdisk Manual" +.TH "CGDISK" "8" "1.0.6" "Roderick W. Smith" "GPT fdisk Manual" .SH "NAME" cgdisk \- Curses-based GUID partition table (GPT) manipulator .SH "SYNOPSIS" @@ -172,7 +172,7 @@ Available options are as described below. (Note that \fBcgdisk\fR provides a much more limited set of options than its sibling \fBgdisk\fR. If you -need to perform partition table recovery, hybrid MBR modifcation, or other +need to perform partition table recovery, hybrid MBR modification, or other advanced operations, you should consult the \fBgdisk\fR documentation.) .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/cgdisk.html new/gptfdisk-1.0.6/cgdisk.html --- old/gptfdisk-1.0.5/cgdisk.html 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/cgdisk.html 2021-01-13 23:14:27.000000000 +0100 @@ -4,7 +4,7 @@ <HTML><HEAD><TITLE>Man page of CGDISK</TITLE> </HEAD><BODY> <H1>CGDISK</H1> -Section: GPT fdisk Manual (8)<BR>Updated: 1.0.5<BR><A HREF="#index">Index</A> +Section: GPT fdisk Manual (8)<BR>Updated: 1.0.6<BR><A HREF="#index">Index</A> <A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR> <A NAME="lbAB"> </A> @@ -211,7 +211,7 @@ <P> Available options are as described below. (Note that <B>cgdisk</B> provides a much more limited set of options than its sibling <B>gdisk</B>. If you -need to perform partition table recovery, hybrid MBR modifcation, or other +need to perform partition table recovery, hybrid MBR modification, or other advanced operations, you should consult the <B>gdisk</B> documentation.) <P> <DL COMPACT> @@ -491,6 +491,6 @@ This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 22:34:11 GMT, February 17, 2020 +Time: 22:14:27 GMT, January 13, 2021 </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/current.spec new/gptfdisk-1.0.6/current.spec --- old/gptfdisk-1.0.5/current.spec 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/current.spec 2021-01-13 23:14:27.000000000 +0100 @@ -1,12 +1,12 @@ Summary: GPT partitioning and MBR repair software Name: gptfdisk -Version: 1.0.5 +Version: 1.0.6 Release: 1%{?dist} License: GPLv2 URL: http://www.rodsbooks.com/gdisk Group: Applications/System -Source: http://www.rodsbooks.com/gdisk/gptfdisk-1.0.5.tar.gz +Source: http://www.rodsbooks.com/gdisk/gptfdisk-1.0.6.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description @@ -81,5 +81,5 @@ %changelog -* Mon Feb 17 2020 R Smith <[email protected]> - 1.0.5 -- Created spec file for 1.0.5 release +* Wed Jan 13 2021 R Smith <[email protected]> - 1.0.6 +- Created spec file for 1.0.6 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/diskio-unix.cc new/gptfdisk-1.0.6/diskio-unix.cc --- old/gptfdisk-1.0.5/diskio-unix.cc 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/diskio-unix.cc 2021-01-13 23:14:27.000000000 +0100 @@ -37,6 +37,10 @@ using namespace std; +#ifdef __APPLE__ +#define off64_t off_t +#endif + // Returns the official "real" name for a shortened version of same. // Trivial here; more important in Windows void DiskIO::MakeRealName(void) { @@ -307,7 +311,7 @@ // Note that seeking beyond the end of the file is NOT detected as a failure! int DiskIO::Seek(uint64_t sector) { int retval = 1; - off_t seekTo, sought; + off64_t seekTo, sought; // If disk isn't open, try to open it.... if (!isOpen) { @@ -424,7 +428,7 @@ // return correct values for disk image files. uint64_t DiskIO::DiskSize(int *err) { uint64_t sectors = 0; // size in sectors - off_t bytes = 0; // size in bytes + off64_t bytes = 0; // size in bytes struct stat64 st; int platformFound = 0; #ifdef __sun__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/fixparts.8 new/gptfdisk-1.0.6/fixparts.8 --- old/gptfdisk-1.0.5/fixparts.8 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/fixparts.8 2021-01-13 23:14:27.000000000 +0100 @@ -1,6 +1,6 @@ -.\" Copyright 2011-2020 Roderick W. Smith ([email protected]) +.\" Copyright 2011-2021 Roderick W. Smith ([email protected]) .\" May be distributed under the GNU General Public License -.TH "FIXPARTS" "8" "1.0.5" "Roderick W. Smith" "FixParts Manual" +.TH "FIXPARTS" "8" "1.0.6" "Roderick W. Smith" "FixParts Manual" .SH "NAME" fixparts \- MBR partition table repair utility .SH "SYNOPSIS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/fixparts.html new/gptfdisk-1.0.6/fixparts.html --- old/gptfdisk-1.0.5/fixparts.html 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/fixparts.html 2021-01-13 23:14:27.000000000 +0100 @@ -4,7 +4,7 @@ <HTML><HEAD><TITLE>Man page of FIXPARTS</TITLE> </HEAD><BODY> <H1>FIXPARTS</H1> -Section: FixParts Manual (8)<BR>Updated: 1.0.5<BR><A HREF="#index">Index</A> +Section: FixParts Manual (8)<BR>Updated: 1.0.6<BR><A HREF="#index">Index</A> <A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR> <A NAME="lbAB"> </A> @@ -365,6 +365,6 @@ This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 22:34:11 GMT, February 17, 2020 +Time: 22:14:27 GMT, January 13, 2021 </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/gdisk.8 new/gptfdisk-1.0.6/gdisk.8 --- old/gptfdisk-1.0.5/gdisk.8 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/gdisk.8 2021-01-13 23:14:27.000000000 +0100 @@ -1,6 +1,6 @@ -.\" Copyright 2011-2020 Roderick W. Smith ([email protected]) +.\" Copyright 2011-2021 Roderick W. Smith ([email protected]) .\" May be distributed under the GNU General Public License -.TH "GDISK" "8" "1.0.5" "Roderick W. Smith" "GPT fdisk Manual" +.TH "GDISK" "8" "1.0.6" "Roderick W. Smith" "GPT fdisk Manual" .SH "NAME" gdisk \- Interactive GUID partition table (GPT) manipulator .SH "SYNOPSIS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/gdisk.html new/gptfdisk-1.0.6/gdisk.html --- old/gptfdisk-1.0.5/gdisk.html 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/gdisk.html 2021-01-13 23:14:27.000000000 +0100 @@ -4,7 +4,7 @@ <HTML><HEAD><TITLE>Man page of GDISK</TITLE> </HEAD><BODY> <H1>GDISK</H1> -Section: GPT fdisk Manual (8)<BR>Updated: 1.0.5<BR><A HREF="#index">Index</A> +Section: GPT fdisk Manual (8)<BR>Updated: 1.0.6<BR><A HREF="#index">Index</A> <A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR> <A NAME="lbAB"> </A> @@ -839,6 +839,6 @@ This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 22:34:11 GMT, February 17, 2020 +Time: 22:14:27 GMT, January 13, 2021 </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/gpt.cc new/gptfdisk-1.0.6/gpt.cc --- old/gptfdisk-1.0.5/gpt.cc 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/gpt.cc 2021-01-13 23:14:27.000000000 +0100 @@ -1041,6 +1041,14 @@ } // if *crcOk = CheckHeaderCRC(&tempHeader); + if (tempHeader.sizeOfPartitionEntries != sizeof(GPTPart)) { + cerr << "Warning: Partition table header claims that the size of partition table\n"; + cerr << "entries is " << tempHeader.sizeOfPartitionEntries << " bytes, but this program "; + cerr << " supports only " << sizeof(GPTPart) << "-byte entries.\n"; + cerr << "Adjusting accordingly, but partition table may be garbage.\n"; + tempHeader.sizeOfPartitionEntries = sizeof(GPTPart); + } + if (allOK && (numParts != tempHeader.numParts) && *crcOk) { allOK = SetGPTSize(tempHeader.numParts, 0); } @@ -1058,7 +1066,10 @@ uint32_t sizeOfParts, newCRC; int retval; - if (disk.OpenForRead()) { + if (header.sizeOfPartitionEntries != sizeof(GPTPart)) { + cerr << "Error! GPT header contains invalid partition entry size!\n"; + retval = 0; + } else if (disk.OpenForRead()) { if (sector == 0) { retval = disk.Seek(header.partitionEntriesLBA); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/gpt.h new/gptfdisk-1.0.6/gpt.h --- old/gptfdisk-1.0.5/gpt.h 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/gpt.h 2021-01-13 23:14:27.000000000 +0100 @@ -4,6 +4,9 @@ /* This program is copyright (c) 2009-2011 by Roderick W. Smith. It is distributed under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ +#ifndef __GPTSTRUCTS +#define __GPTSTRUCTS + #include <stdint.h> #include <sys/types.h> #include "gptpart.h" @@ -12,9 +15,6 @@ #include "bsd.h" #include "gptpart.h" -#ifndef __GPTSTRUCTS -#define __GPTSTRUCTS - // Default values for sector alignment #define DEFAULT_ALIGNMENT 2048 #define MAX_ALIGNMENT 65536 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/gptcurses.cc new/gptfdisk-1.0.6/gptcurses.cc --- old/gptfdisk-1.0.5/gptcurses.cc 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/gptcurses.cc 2021-01-13 23:14:27.000000000 +0100 @@ -23,7 +23,7 @@ #include <iostream> #include <string> #include <sstream> -#ifdef __APPLE__ +#if defined (__APPLE__) || (__FreeBSD__) #include <ncurses.h> #else #include <ncursesw/ncurses.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/gptcurses.h new/gptfdisk-1.0.6/gptcurses.h --- old/gptfdisk-1.0.5/gptcurses.h 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/gptcurses.h 2021-01-13 23:14:27.000000000 +0100 @@ -19,14 +19,14 @@ * */ +#ifndef __GPT_CURSES +#define __GPT_CURSES + #include <iostream> #include <string> #include "gptpart.h" #include "gpt.h" -#ifndef __GPT_CURSES -#define __GPT_CURSES - using namespace std; struct MenuItem { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/mbr.h new/gptfdisk-1.0.6/mbr.h --- old/gptfdisk-1.0.5/mbr.h 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/mbr.h 2021-01-13 23:14:27.000000000 +0100 @@ -3,6 +3,9 @@ /* This program is copyright (c) 2009-2013 by Roderick W. Smith. It is distributed under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ +#ifndef __MBRSTRUCTS +#define __MBRSTRUCTS + #include <stdint.h> #include <sys/types.h> #include "gptpart.h" @@ -10,9 +13,6 @@ #include "diskio.h" #include "basicmbr.h" -#ifndef __MBRSTRUCTS -#define __MBRSTRUCTS - using namespace std; /**************************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/parttypes.cc new/gptfdisk-1.0.6/parttypes.cc --- old/gptfdisk-1.0.5/parttypes.cc 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/parttypes.cc 2021-01-13 23:14:27.000000000 +0100 @@ -148,6 +148,18 @@ AddType(0x830F, "86ED10D5-B607-45BB-8957-D350F23D0571", "Linux IA-64 root verity"); AddType(0x8310, "4D21B016-B534-45C2-A9FB-5C16E091FD2D", "Linux /var"); // Linux /var (auto-mounted by systemd) AddType(0x8311, "7EC6F557-3BC5-4ACA-B293-16EF5DF639D1", "Linux /var/tmp"); // Linux /var/tmp (auto-mounted by systemd) + // https://systemd.io/HOME_DIRECTORY/ + AddType(0x8312, "773F91EF-66D4-49B5-BD83-D683BF40AD16", "Linux user's home"); // used by systemd-homed + AddType(0x8313, "75250D76-8CC6-458E-BD66-BD47CC81A812", "Linux x86 /usr "); // Linux /usr on x86 (auto-mounted by systemd) + AddType(0x8314, "8484680C-9521-48C6-9C11-B0720656F69E", "Linux x86-64 /usr"); // Linux /usr on x86-64 (auto-mounted by systemd) + AddType(0x8315, "7D0359A3-02B3-4F0A-865C-654403E70625", "Linux ARM32 /usr"); // Linux /usr on 32-bit ARM (auto-mounted by systemd) + AddType(0x8316, "B0E01050-EE5F-4390-949A-9101B17104E9", "Linux ARM64 /usr"); // Linux /usr on 64-bit ARM (auto-mounted by systemd) + AddType(0x8317, "4301D2A6-4E3B-4B2A-BB94-9E0B2C4225EA", "Linux IA-64 /usr"); // Linux /usr on Itanium (auto-mounted by systemd) + AddType(0x8318, "8F461B0D-14EE-4E81-9AA9-049B6FB97ABD", "Linux x86 /usr verity"); + AddType(0x8319, "77FF5F63-E7B6-4633-ACF4-1565B864C0E6", "Linux x86-64 /usr verity"); + AddType(0x831A, "C215D751-7BCD-4649-BE90-6627490A4C05", "Linux ARM32 /usr verity"); + AddType(0x831B, "6E11A4E7-FBCA-4DED-B9E9-E1A512BB664E", "Linux ARM64 /usr verity"); + AddType(0x831C, "6A491E03-3BE7-4545-8E38-83320E0EA880", "Linux IA-64 /usr verity"); // Used by Intel Rapid Start technology AddType(0x8400, "D3BFE2DE-3DAF-11DF-BA40-E3A556D89593", "Intel Rapid Start"); @@ -314,8 +326,8 @@ // Veracrypt (https://www.veracrypt.fr/en/Home.html) encrypted partition AddType(0xe900, "8C8F8EFF-AC95-4770-814A-21994F2DBC8F", "Veracrypt data"); - // See http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec - AddType(0xea00, "BC13C2FF-59E6-4262-A352-B275FD6F7172", "Freedesktop $BOOT"); + // See https://systemd.io/BOOT_LOADER_SPECIFICATION/ + AddType(0xea00, "BC13C2FF-59E6-4262-A352-B275FD6F7172", "XBOOTLDR partition"); // Type code for Haiku; uses BeOS MBR code as hex code base AddType(0xeb00, "42465331-3BA3-10F1-802A-4861696B7521", "Haiku BFS"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/parttypes.h new/gptfdisk-1.0.6/parttypes.h --- old/gptfdisk-1.0.5/parttypes.h 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/parttypes.h 2021-01-13 23:14:27.000000000 +0100 @@ -1,6 +1,9 @@ /* This program is copyright (c) 2009-2018 by Roderick W. Smith. It is distributed under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ +#ifndef __PARTITION_TYPES +#define __PARTITION_TYPES + #include <stdint.h> #include <stdlib.h> #ifdef USE_UTF16 @@ -12,9 +15,6 @@ #include "support.h" #include "guid.h" -#ifndef __PARTITION_TYPES -#define __PARTITION_TYPES - using namespace std; // A partition type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/sgdisk.8 new/gptfdisk-1.0.6/sgdisk.8 --- old/gptfdisk-1.0.5/sgdisk.8 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/sgdisk.8 2021-01-13 23:14:27.000000000 +0100 @@ -1,6 +1,6 @@ -.\" Copyright 2011-2020 Roderick W. Smith ([email protected]) +.\" Copyright 2011-2021 Roderick W. Smith ([email protected]) .\" May be distributed under the GNU General Public License -.TH "SGDISK" "8" "1.0.5" "Roderick W. Smith" "GPT fdisk Manual" +.TH "SGDISK" "8" "1.0.6" "Roderick W. Smith" "GPT fdisk Manual" .SH "NAME" sgdisk \- Command\-line GUID partition table (GPT) manipulator for Linux and Unix .SH "SYNOPSIS" @@ -167,7 +167,7 @@ \fItoggle\fR options enable you to change the attribute bit value. The \fIset\fR, \fIclear\fR, \fItoggle\fR, and \fIget\fR options work on a bit number; the others work on a hexadecimal bit mask. For example, type -\fBsgdisk -A 4:set:2 /dev/sdc\fR to set the bit 2 attribute (legacy BIOS +\fBsgdisk \-A 4:set:2 /dev/sdc\fR to set the bit 2 attribute (legacy BIOS bootable) on partition 4 on \fI/dev/sdc\fR. .TP @@ -354,7 +354,7 @@ Clear out all partition data. This includes GPT header data, all partition definitions, and the protective MBR. Note that this operation will, like most other operations, fail on a damaged disk. If you want to prepare a -disk you know to be damaged for GPT use, you should first wipe it with -Z +disk you know to be damaged for GPT use, you should first wipe it with \-Z and then partition it normally. This option will work even if the disk's original partition table is bad; however, most other options on the same command line will be ignored. @@ -504,7 +504,7 @@ .TP .B 8 -Disk replication operation (-R) failed +Disk replication operation (\-R) failed .SH "BUGS" Known bugs and limitations include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/sgdisk.html new/gptfdisk-1.0.6/sgdisk.html --- old/gptfdisk-1.0.5/sgdisk.html 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/sgdisk.html 2021-01-13 23:14:27.000000000 +0100 @@ -4,7 +4,7 @@ <HTML><HEAD><TITLE>Man page of SGDISK</TITLE> </HEAD><BODY> <H1>SGDISK</H1> -Section: GPT fdisk Manual (8)<BR>Updated: 1.0.5<BR><A HREF="#index">Index</A> +Section: GPT fdisk Manual (8)<BR>Updated: 1.0.6<BR><A HREF="#index">Index</A> <A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR> <A NAME="lbAB"> </A> @@ -738,6 +738,6 @@ This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 22:34:11 GMT, February 17, 2020 +Time: 22:14:27 GMT, January 13, 2021 </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gptfdisk-1.0.5/support.h new/gptfdisk-1.0.6/support.h --- old/gptfdisk-1.0.5/support.h 2020-02-17 23:34:11.000000000 +0100 +++ new/gptfdisk-1.0.6/support.h 2021-01-13 23:14:27.000000000 +0100 @@ -1,14 +1,14 @@ /* This program is copyright (c) 2009-2018 by Roderick W. Smith. It is distributed under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ +#ifndef __GPTSUPPORT +#define __GPTSUPPORT + #include <stdint.h> #include <stdlib.h> #include <string> -#ifndef __GPTSUPPORT -#define __GPTSUPPORT - -#define GPTFDISK_VERSION "1.0.5" +#define GPTFDISK_VERSION "1.0.6" #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64
