[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. ad5338015f68bca7bb5987c7e44218fe21377dad

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. ad5338015f68bca7bb5987c7e44218fe21377dad

[git]

[-- Attachment #1: Type: text/plain, Size: 3309 bytes --]

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, fifteen has been updated
       via  ad5338015f68bca7bb5987c7e44218fe21377dad (commit)
       via  f93635e375efaae2c8077d467e8811128325142b (commit)
      from  7f46e14b81e701cf3c37b3dd6c058942ed83b84d (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 ad5338015f68bca7bb5987c7e44218fe21377dad
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date:   Wed Oct 2 14:39:16 2013 +0200

    stage2: rootfile update.

commit f93635e375efaae2c8077d467e8811128325142b
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date:   Wed Oct 2 14:38:39 2013 +0200

    memtest: update to 5.01.

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

Summary of changes:
 config/rootfiles/common/stage2 | 1 +
 lfs/memtest                    | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index da95512..04ef3f2 100644
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -41,6 +41,7 @@ etc/resolv.conf
 etc/securetty
 etc/sysctl.conf
 etc/syslog.conf
+etc/system-release
 #home
 home/nobody
 #lib
diff --git a/lfs/memtest b/lfs/memtest
index 4914bae..9888e53 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info(a)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,7 +24,7 @@
 
 include Config
 
-VER        = 4.20
+VER        = 5.01
 
 THISAPP    = memtest86+-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3
+$(DL_FILE)_MD5 = 43c5832baa919e1206e251e735cdee2d
 
 install : $(TARGET)
 
@@ -71,7 +71,8 @@ $(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) && sed -i -e "s| -fno-stack-protector||g" Makefile
+	cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	-mkdir -p /usr/lib/memtest86+
 	cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+


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