summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Smith <rodsmith@rodsbooks.com>2021-01-13 17:17:41 -0500
committerRod Smith <rodsmith@rodsbooks.com>2021-01-13 17:17:41 -0500
commit6180deb472c302c47f4d4acff8f2123d10824364 (patch)
tree0b2cd29c86a87f854fb784751c7b5c9cf0f0d644
parent273fff5c84288f3c09b32521d1217619e9cc079e (diff)
downloadsgdisk-6180deb472c302c47f4d4acff8f2123d10824364.tar.gz
Version 1.0.6 release
-rw-r--r--Makefile.freebsd4
-rw-r--r--NEWS11
-rw-r--r--gptcurses.cc2
-rw-r--r--parttypes.cc4
4 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.freebsd b/Makefile.freebsd
index dace733..4b4b616 100644
--- a/Makefile.freebsd
+++ b/Makefile.freebsd
@@ -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 --git a/NEWS b/NEWS
index 72a2cc3..f74bad0 100644
--- a/NEWS
+++ b/NEWS
@@ -2,10 +2,12 @@
------------------
- Fixed bug that could cause segfault if GPT header claimed partition
- entries are oversized.
+ 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.
+ read. See:
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-0308
- Renamed the partition type "Freedesktop $BOOT" to "XBOOTLDR partition".
@@ -13,7 +15,10 @@
0x831C).
- Fixed type code definition in diskio-unix.cc that prevented 32-bit builds
- from correctly handling disks over 4 GiB in size.
+ 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):
------------------
diff --git a/gptcurses.cc b/gptcurses.cc
index 1b18cf2..71aa734 100644
--- a/gptcurses.cc
+++ b/gptcurses.cc
@@ -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 --git a/parttypes.cc b/parttypes.cc
index ed6dd24..231d214 100644
--- a/parttypes.cc
+++ b/parttypes.cc
@@ -148,6 +148,8 @@ void PartType::AddAllTypes(void) {
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)
@@ -158,8 +160,6 @@ void PartType::AddAllTypes(void) {
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");
- // https://systemd.io/HOME_DIRECTORY/
- AddType(0x8312, "773F91EF-66D4-49B5-BD83-D683BF40AD16", "Linux user's home"); // used by systemd-homed
// Used by Intel Rapid Start technology
AddType(0x8400, "D3BFE2DE-3DAF-11DF-BA40-E3A556D89593", "Intel Rapid Start");