[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f2a309dc088a735a862052e8c77ecf1261e5ee50

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f2a309dc088a735a862052e8c77ecf1261e5ee50

[git]

[-- Attachment #1: Type: text/plain, Size: 4590 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, next has been updated
       via  f2a309dc088a735a862052e8c77ecf1261e5ee50 (commit)
       via  9a657e9b3b07ae7fbc0d953ecdf0651e14a461ee (commit)
       via  b1b6e9f396efca5552df649d04a12bdbd1c4acb5 (commit)
      from  391560854f64ad2385adb3ff25dbbcec0ff92668 (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 f2a309dc088a735a862052e8c77ecf1261e5ee50
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Tue Jan 3 20:28:22 2017 +0100

    tmux: Update to 2.3
    
    For details see:
    https://raw.githubusercontent.com/tmux/tmux/master/CHANGES
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 9a657e9b3b07ae7fbc0d953ecdf0651e14a461ee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jan 4 11:22:02 2017 +0000

    core109: Ship updated backupiso script
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b1b6e9f396efca5552df649d04a12bdbd1c4acb5
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date:   Tue Jan 3 17:49:06 2017 +0100

    Fix the backup iso script once again.
    
    In commit 391560854f64ad2385adb3ff25dbbcec0ff92668 was an error in the
    case statement. On i?586 the check fails. Removing the "" fixes the
    error.
    
    Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/109/filelists/files |  1 +
 lfs/tmux                                  | 10 +++++-----
 src/scripts/backupiso                     |  4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/109/filelists/files b/config/rootfiles/core/109/filelists/files
index 7c1cc3f..182b816 100644
--- a/config/rootfiles/core/109/filelists/files
+++ b/config/rootfiles/core/109/filelists/files
@@ -3,4 +3,5 @@ etc/issue
 lib/udev/rules.d/60-net.rules
 lib/udev/network-hotplug-bridges
 lib/udev/network-hotplug-rename
+usr/local/bin/backupiso
 usr/local/bin/syslogdctrl
diff --git a/lfs/tmux b/lfs/tmux
index 2223d13..300080d 100644
--- a/lfs/tmux
+++ b/lfs/tmux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2014 IPFire Team   <info(a)ipfire.org>                          #
+# Copyright (C) 2017 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        = 1.9a
+VER        = 2.3
 
 THISAPP    = tmux-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tmux
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b07601711f96f1d260b390513b509a2d
+$(DL_FILE)_MD5 = fcfd1611d705d8b31df3c26ebc93bd3e
 
 install : $(TARGET)
 
@@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 1a682d0..1799bc1 100644
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -2,11 +2,11 @@
 arch=$(uname -m)
 
 case $arch in
-	"i?86")
+	i?86)
 		arch="i586"
 		echo "Your arch is $arch"
 		;;
-	"x86_64")
+	x86_64)
 		arch="x86_64"
 		echo "Your arch is $arch"
 		;;


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