Merge remote-tracking branch 'upstream/master' into mingw32

Makefile

@@ -4,7 +4,7 @@
 #   VPD Decode
 #
 #   Copyright (C) 2000-2002 Alan Cox <[email protected]>
-#   Copyright (C) 2002-2015 Jean Delvare <[email protected]>
+#   Copyright (C) 2002-2020 Jean Delvare <[email protected]>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -14,7 +14,12 @@
 
 CC      = i686-w64-mingw32-gcc
 STRIP   = i686-w64-mingw32-strip
-CFLAGS  = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+# Base CFLAGS can be overridden by environment
+CFLAGS ?= -O2
+# When debugging, disable -O2 and enable -g
+#CFLAGS ?= -g
+
+CFLAGS += -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
           -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
 
 # Let lseek and mmap support 64-bit wide offsets
@@ -23,12 +28,8 @@ CFLAGS += -D_FILE_OFFSET_BITS=64
 #CFLAGS += -DBIGENDIAN
 #CFLAGS += -DALIGNMENT_WORKAROUND
 
-# When debugging, disable -O2 and enable -g.
-CFLAGS += -O2
-#CFLAGS += -g
-
-# Pass linker flags here
-LDFLAGS =
+# Pass linker flags here (can be set from environment too)
+LDFLAGS ?=
 
 DESTDIR =
 prefix  = /usr/local
@@ -63,8 +64,8 @@ all : $(PROGRAMS)
 # Programs
 #
 
-dmidecode$(EXEEXT) : dmidecode.o dmiopt.o dmioem.o util.o winsmbios.o
-	$(CC) $(LDFLAGS) dmidecode.o dmiopt.o dmioem.o util.o winsmbios.o -o $@
+dmidecode$(EXEEXT) : dmidecode.o dmiopt.o dmioem.o dmioutput.o util.o winsmbios.o
+	$(CC) $(LDFLAGS) dmidecode.o dmiopt.o dmioem.o dmioutput.o util.o winsmbios.o -o $@
 
 biosdecode : biosdecode.o util.o
 	$(CC) $(LDFLAGS) biosdecode.o util.o -o $@
@@ -80,13 +81,16 @@ vpddecode : vpddecode.o vpdopt.o util.o
 #
 
 dmidecode.o : dmidecode.c version.h types.h util.h config.h dmidecode.h \
-	      dmiopt.h dmioem.h
+	      dmiopt.h dmioem.h dmioutput.h
 	$(CC) $(CFLAGS) -c $< -o $@
 
 dmiopt.o : dmiopt.c config.h types.h util.h dmidecode.h dmiopt.h
 	$(CC) $(CFLAGS) -c $< -o $@
 
-dmioem.o : dmioem.c types.h dmidecode.h dmioem.h
+dmioem.o : dmioem.c types.h dmidecode.h dmioem.h dmioutput.h
+	$(CC) $(CFLAGS) -c $< -o $@
+
+dmioutput.o : dmioutput.c types.h dmioutput.h
 	$(CC) $(CFLAGS) -c $< -o $@
 
 biosdecode.o : biosdecode.c version.h types.h util.h config.h 

NEWS

@@ -1,3 +1,21 @@
+Version 3.3 (Wed Oct 14 2020)
+  - [BUILD] Allow overriding build settings from the environment.
+  - [COMPATIBILITY] Document how the UUID fields are interpreted.
+  - [PORTABILITY] Don't use memcpy on /dev/mem on arm64.
+  - [PORTABILITY] Only scan /dev/mem for entry point on x86.
+  - Support for SMBIOS 3.3.0. This includes new processor names, new port
+    connector types, and new memory device form factors, types and
+    technologies.
+  - Add bios-revision, firmware-revision and system-sku-number to -s option.
+  - Use the most appropriate unit for cache size.
+  - Decode system slot base bus width and peers.
+  - Important bug fixes:
+    Fix Redfish Hostname print length
+    Fix formatting of TPM table output
+    Fix System Slot Information for PCIe SSD
+    Don't choke on invalid processor voltage
+  - Use the most appropriate unit for cache size.
+
 Version 3.2 (update 1) (Wed Jan 30 2019)
   - Fix smbios version tests
   - Under windows, the UUID is now always displayed with its first 3 fields