Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 21 Mar 2020, at 19:59, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> Summary: smartmontools release 7.1
> -----------------------------------------------------------
> - smartctl: Fixed bogus exception on unknown form factor value (regression).
> - smartctl '--json=cg': Suppresses extra spaces also in 'g' format.
> - smartctl '-i': ATA ACS-4 and ACS-5 enhancements.
> - smartd: No longer truncates very long device names in warning emails.
> - smartd: No longer skips scheduled tests if system clock has been adjusted
>  to the past.
> - smartd '-A': Attribute logs now use local time instead of UTC.
> - ATA: Device type '-d jmb39x,N' for drives behind JMicron JMB39x RAID port
>  multipliers.
> - SCSI: Workaround for incomplete Log subpages response from some SAS SSDs.
> - HDD, SSD and USB additions to drive database.
> - Autodetection of '-d sntjmicron' type for JMicron USB to NVMe bridges.
> - configure: Defines '_FORTIFY_SOURCE=2' if supported and not defined.
> - Linux/FreeBSD: Fixed segfault on CCISS transfer sizes > 512 bytes.
> - Linux: Fixed smartd.service 'Type' if libsystemd-dev is not available.
> - Linux: Fixed '/dev/megaraid_sas_ioctl_node' fd leak.
> - Linux: Fixed GPL licensing problem of 'linux_nvme_ioctl.h'.
> - FreeBSD update-smart-drivedb: Now uses 'fetch' as default download tool.
> - FreeBSD big endian: Fixed NVMe access.
> - FreeBSD: Compile fix for FreeBSD 12.
> - NetBSD: Fixed device scan crash on empty name list.
> - NetBSD: Fixed memory leak in device scan.
> - Windows: Fixed log page access via Windows 10 NVMe driver for NVMe 1.2.1+.
> - Windows: Allow drive letters as device names for Windows 10 NVMe driver.
> - Windows: Workround to allow CSMI access to devices behind AMD RAID drivers.
> - Windows: Fixed MinGW options to add relocation info if ASLR is enabled.
> - Windows wtssendmsg: No longer writes '\n' line endings to event log.
> - Windows wtssendmsg: New options '-t' and '-w'.
> 
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> lfs/smartmontools                                 |  7 +++----
> src/patches/smartmontools-6.5-exit_segfault.patch | 16 ----------------
> 2 files changed, 3 insertions(+), 20 deletions(-)
> delete mode 100644 src/patches/smartmontools-6.5-exit_segfault.patch
> 
> diff --git a/lfs/smartmontools b/lfs/smartmontools
> index 2c3fd39d8..98f6a5eca 100644
> --- a/lfs/smartmontools
> +++ b/lfs/smartmontools
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
> +# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                     #
> #                                                                             #
> # 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        #
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 6.6
> +VER        = 7.1
> 
> THISAPP    = smartmontools-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 9ae2c6e7131cd2813edcc65cbe5f223f
> +$(DL_FILE)_MD5 = 430cd5f64caa4524018b536e5ecd9c29
> 
> install : $(TARGET)
> 
> @@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	@$(PREBUILD)
> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/smartmontools-6.5-exit_segfault.patch
> 	cd $(DIR_APP) && autoreconf
> 	cd $(DIR_APP) && ./configure --prefix=/usr
> 	cd $(DIR_APP) && make BUILD_INFO='"($(NAME) $(VERSION))"' $(MAKETUNING)
> diff --git a/src/patches/smartmontools-6.5-exit_segfault.patch b/src/patches/smartmontools-6.5-exit_segfault.patch
> deleted file mode 100644
> index 6c5df8aac..000000000
> --- a/src/patches/smartmontools-6.5-exit_segfault.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> ---- a/utility.h	Sun Apr 24 16:59:15 2016
> -+++ b/utility.h	Sat Aug 20 22:40:33 2016
> -@@ -97,7 +97,11 @@
> - 
> - // Replacement for exit(status)
> - // (exit is not compatible with C++ destructors)
> --#define EXIT(status) { throw (int)(status); }
> -+
> -+//This doesn't work on IPFire.
> -+//#define EXIT(status) { throw (int)(status); }
> -+//tried to use exit and found no problems yet
> -+#define EXIT(status) { exit ((int)(status)); }
> - 
> - // Compile time check of byte ordering
> - // (inline const function allows compiler to remove dead code)
> -
> -- 
> 2.16.4