From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] smartmontools: Update to 6.5 Date: Sat, 20 Aug 2016 23:51:20 +0200 Message-ID: <20160820215120.5824-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2161714410957030421==" List-Id: --===============2161714410957030421== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable For details, see: https://www.smartmontools.org/browser/tags/RELEASE_6_5/smartmontools/NEWS Best, Matthias Signed-off-by: Matthias Fischer --- lfs/smartmontools | 6 +++--- ..._segfault.patch =3D> smartmontools-6.5-exit_segfault.patch} | 12 ++++++--= ---- 2 files changed, 9 insertions(+), 9 deletions(-) rename src/patches/{smartmontools-5.39-exit_segfault.patch =3D> smartmontool= s-6.5-exit_segfault.patch} (50%) diff --git a/lfs/smartmontools b/lfs/smartmontools index c3ba635..6c6d7db 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 6.3 +VER =3D 6.5 =20 THISAPP =3D smartmontools-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 2ea0c62206e110192a97b59291b17f54 +$(DL_FILE)_MD5 =3D 093aeec3f8f39fa9a37593c4012d3156 =20 install : $(TARGET) =20 @@ -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-exi= t_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=3D/usr cd $(DIR_APP) && make BUILD_INFO=3D'"($(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 5ed4b10..6c5df8a 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_r28= 77.new/utility.h ---- smartmontools-5.39-svn_r2877/utility.h 2009-08-24 12:48:50.000000000 +02= 00 -+++ 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 @@ =20 // Replacement for exit(status) // (exit is not compatible with C++ destructors) @@ -12,5 +11,6 @@ diff -Naur smartmontools-5.39-svn_r2877/utility.h smartmont= ools-5.39-svn_r2877.n +//tried to use exit and found no problems yet +#define EXIT(status) { exit ((int)(status)); } =20 -=20 - #ifdef OLD_INTERFACE + // Compile time check of byte ordering + // (inline const function allows compiler to remove dead code) + --=20 2.9.3 --===============2161714410957030421==--