openvpn-2fa: Import a prototype of an authenticator

[people/pmueller/ipfire-2.x.git] / lfs / memtest

diff --git a/lfs/memtest b/lfs/memtest
index 4914baed54cf47d8b86c2c693a592830a3fa7d9a..7e5ac895fb8442a08dfa5fc996ac4b79a8836aaf 100644 (file)
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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,14 +24,14 @@
 
 include Config
 
-VER        = 4.20
+VER        = 5.01
 
 THISAPP    = memtest86+-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
+SUP_ARCH   = x86_64
 
 ###############################################################################
 # Top-level Rules
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3
+$(DL_FILE)_BLAKE2 = ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050
 
 install : $(TARGET)
 
@@ -49,10 +49,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -61,8 +61,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -71,9 +71,11 @@ $(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+
+
+       # 64bit only systems cannot link mentest without 32bit gcc libs
+       # so we use the precompiled binary from memtest author
+       cd $(DIR_APP) && cp -f precomp.bin /usr/lib/memtest86+/memtest.bin
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)