This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, core34 has been updated via e55b3c45640720dd436e2596bd3913b56e265487 (commit) from 8d5df05a6fbe4034199d2110d603aaf0cebf647b (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit e55b3c45640720dd436e2596bd3913b56e265487 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jan 3 21:51:04 2010 +0100

Updated smartmontools 5.39 stable.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/34/filelists/smartmontools | 1 + doc/packages-list.txt | 2 +- lfs/smartmontools | 9 ++++----- .../smartmontools-5.39-error_throw_int.patch | 16 ---------------- 4 files changed, 6 insertions(+), 22 deletions(-) create mode 120000 config/rootfiles/core/34/filelists/smartmontools delete mode 100644 src/patches/smartmontools-5.39-error_throw_int.patch

Difference in files: diff --git a/config/rootfiles/core/34/filelists/smartmontools b/config/rootfiles/core/34/filelists/smartmontools new file mode 120000 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 fe7ec1f..1749195 100644 --- 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 34cf565..7d82079 100644 --- 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 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

hooks/post-receive -- IPFire 2.x development tree