X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmemtest;h=4914baed54cf47d8b86c2c693a592830a3fa7d9a;hb=ad4ce45ae29bfa931ba5fb88bc99dccaccc48303;hp=820b4aec54db0bb48b18c29ea796261d3c3d867d;hpb=fcc535236fe6178d68007ece7793746320549b61;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/memtest b/lfs/memtest
index 820b4aec5..4914baed5 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,13 +24,14 @@
 
 include Config
 
-VER        = 1.65
+VER        = 4.20
 
 THISAPP    = memtest86+-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b3a18166532ae84aea20425c83626651
+$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3
 
 install : $(TARGET)
 
@@ -70,6 +71,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) && sed -i -e "s| -fno-stack-protector||g" Makefile
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	-mkdir -p /usr/lib/memtest86+
 	cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+