Updated smartmontools 5.39 stable.

diff --git a/config/rootfiles/core/34/filelists/smartmontools b/config/rootfiles/core/34/filelists/smartmontools
new file mode 120000 (symlink)
index 0000000..fb66daf
--- /dev/null
+++ b/config/rootfiles/core/34/filelists/smartmontools
@@ -0,0 +1 @@
+../../../common/smartmontools
\ No newline at end of file

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 70a782af3ed7593fc7592a55a6b824ebb13b07c4..5780ff6ca6c2b3eda9d4a5d2a279cf3db7d6d03f 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -304,7 +304,7 @@
 * setuptools-0.6c8
 * shadow-4.0.15
 * slang-1.4.9
-* smartmontools-5.39-svn_r2877
+* smartmontools-5.39
 * snort-2.8.4
 * sox-12.18.1
 * spandsp-0.0.6pre12

diff --git a/lfs/smartmontools b/lfs/smartmontools
index 34cf5659b97f783af3e443a91fe8a22cc784218b..7d82079ce54e82fccfd3c369229e5d6590864147 100644 (file)
--- a/lfs/smartmontools
+++ b/lfs/smartmontools
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 5.39-svn_r2877
+VER        = 5.39
 
 THISAPP    = smartmontools-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 62fd73429d5e5295ae42a9dd8a834ddc
+$(DL_FILE)_MD5 = 63c1b5373a9ef91e9c9becb16e147571
 
 install : $(TARGET)
 
@@ -69,8 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/smartmontools-5.39-error_throw_int.patch
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./autogen.sh
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make BUILD_INFO='"($(NAME) $(VERSION))"' $(MAKETUNING)

diff --git a/src/patches/smartmontools-5.39-error_throw_int.patch b/src/patches/smartmontools-5.39-error_throw_int.patch
deleted file mode 100644 (file)
index 5ed4b10..0000000
--- a/src/patches/smartmontools-5.39-error_throw_int.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 @@
- 
- // 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)); }
- 
- 
- #ifdef OLD_INTERFACE