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 aae7fc95de437ae97f17e70511a65729bc720a02 (commit) from 1bdbb8dcb432cef5702e1900ad9ed0e1c9a3f3e2 (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 aae7fc95de437ae97f17e70511a65729bc720a02 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jan 5 18:10:51 2010 +0100

Fix smartctl segfault at error exit.

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

Summary of changes: lfs/smartmontools | 1 + src/patches/smartmontools-5.39-exit_segfault.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) create mode 100644 src/patches/smartmontools-5.39-exit_segfault.patch

Difference in files: diff --git a/lfs/smartmontools b/lfs/smartmontools index 7d82079..b3dd9d8 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -70,6 +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) && ./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-exit_segfault.patch b/src/patches/smartmontools-5.39-exit_segfault.patch new file mode 100644 index 0000000..5ed4b10 --- /dev/null +++ b/src/patches/smartmontools-5.39-exit_segfault.patch @@ -0,0 +1,16 @@ +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