From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Sat, 20 Aug 2016 21:51:20 +0000 (+0200)
Subject: smartmontools: Update to 6.5
X-Git-Tag: v2.19-core106~104^2~4
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=53aad60d6f35b622ea571faf3fc1c5d4ee28e1f0

smartmontools: Update to 6.5

For details, see:
https://www.smartmontools.org/browser/tags/RELEASE_6_5/smartmontools/NEWS

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/smartmontools b/lfs/smartmontools
index c3ba635a56..6c6d7db1d0 100644
--- a/lfs/smartmontools
+++ b/lfs/smartmontools
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.3
+VER        = 6.5
 
 THISAPP    = smartmontools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2ea0c62206e110192a97b59291b17f54
+$(DL_FILE)_MD5 = 093aeec3f8f39fa9a37593c4012d3156
 
 install : $(TARGET)
 
@@ -70,7 +70,7 @@ $(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-5.39-exit_segfault.patch
+	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-5.39-exit_segfault.patch b/src/patches/smartmontools-6.5-exit_segfault.patch
similarity index 50%
rename from src/patches/smartmontools-5.39-exit_segfault.patch
rename to src/patches/smartmontools-6.5-exit_segfault.patch
index 5ed4b10993..6c5df8aac8 100644
--- a/src/patches/smartmontools-5.39-exit_segfault.patch
+++ b/src/patches/smartmontools-6.5-exit_segfault.patch
@@ -1,7 +1,6 @@
-diff -Naur smartmontools-5.39-svn_r2877/utility.h smartmontools-5.39-svn_r2877.new/utility.h
---- smartmontools-5.39-svn_r2877/utility.h	2009-08-24 12:48:50.000000000 +0200
-+++ smartmontools-5.39-svn_r2877.new/utility.h	2009-08-29 09:11:07.000000000 +0200
-@@ -102,7 +102,11 @@
+--- 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)
@@ -12,5 +11,6 @@ diff -Naur smartmontools-5.39-svn_r2877/utility.h smartmontools-5.39-svn_r2877.n
 +//tried to use exit and found no problems yet
 +#define EXIT(status) { exit ((int)(status)); }
  
- 
- #ifdef OLD_INTERFACE
+ // Compile time check of byte ordering
+ // (inline const function allows compiler to remove dead code)
+