tmux: Update to 3.1

Message ID 20200425050033.14586-1-matthias.fischer@ipfire.org
State Accepted
Commit 79c88f563558f61e7d9b1e02794fb9ba4f4c8372
Headers
Series tmux: Update to 3.1 |

Commit Message

Matthias Fischer April 25, 2020, 5 a.m. UTC
  For details see:
https://raw.githubusercontent.com/tmux/tmux/3.1/CHANGES

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 lfs/tmux | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
  

Comments

Michael Tremer April 25, 2020, 8:07 a.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

Thank you!

-Michael

> On 25 Apr 2020, at 06:00, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
> 
> For details see:
> https://raw.githubusercontent.com/tmux/tmux/3.1/CHANGES
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
> lfs/tmux | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/lfs/tmux b/lfs/tmux
> index 40f19dfea..aae90dab1 100644
> --- a/lfs/tmux
> +++ b/lfs/tmux
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2020  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,7 +24,7 @@
> 
> include Config
> 
> -VER        = 3.0a
> +VER        = 3.1
> 
> 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    = 7
> +PAK_VER    = 8
> 
> DEPS       =
> 
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 003b7df5b12ba2553710492b89850ce5
> +$(DL_FILE)_MD5 = 76c3ef9d40d2c1ade7a6cd7993b549ac
> 
> install : $(TARGET)
> 
> @@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
> 
> md5 : $(subst %,%_MD5,$(objects))
> 
> -dist:
> +dist: 
> 	@$(PAK)
> 
> ###############################################################################
> @@ -78,8 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	@$(PREBUILD)
> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> 
> -	cd $(DIR_APP) && ./autogen.sh
> -
> 	cd $(DIR_APP) && ./configure \
> 		--prefix=/usr
> 
> -- 
> 2.18.0
>
  
Michael Tremer April 27, 2020, 12:13 p.m. UTC | #2
Hi,

> On 25 Apr 2020, at 12:26, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
> 
> Hi Michael,
> 
> On 25.04.2020 10:07, Michael Tremer wrote:
>> Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
>> 
>> Thank you!
>> 
>> -Michael
>> 
>>> ...
> 
> No problem - it just came my way... ;-)
> 
> Besides: I'm thinking about the (8?) update patches for 'vnstatn 2.6'.
> 
> These are quite a few, because - as you know - it took me some time to
> get the initscript right. And one commit
> (https://patchwork.ipfire.org/patch/2936/) even has the wrong subject.
> 
> Nevertheless, its running without problems since then. Today I deleted
> the no longer needed files from '/var/log/vnstat/' ('.blue0', '.green0',
> '.red0'). The new file, 'vnstat.db' takes about 250KB at the moment and
> is staying there.

It is best if you write these things as a response to the original patch, because they will then appear in the history of patchwork.

But in general, I would recommend that this is being merged into next and we test it with more users.

> But: should I send a new patch series for this update?

Why? To clean up the mess? I would leave this for Arne. If he can work it out then not. Otherwise, a new patch series is probably the easier.

Best,
-Michael

> 
> Best,
> 
> Matthias
  
Matthias Fischer April 29, 2020, 6:06 p.m. UTC | #3
Hi,

On 27.04.2020 14:13, Michael Tremer wrote:
> Hi,
> 
>> ...
>> 
>> Besides: I'm thinking about the (8?) update patches for 'vnstatn 2.6'.
>> 
>> These are quite a few, because - as you know - it took me some time to
>> get the initscript right. And one commit
>> (https://patchwork.ipfire.org/patch/2936/) even has the wrong subject.
>> 
>> Nevertheless, its running without problems since then. Today I deleted
>> the no longer needed files from '/var/log/vnstat/' ('.blue0', '.green0',
>> '.red0'). The new file, 'vnstat.db' takes about 250KB at the moment and
>> is staying there.
> 
> It is best if you write these things as a response to the original patch, because they will then appear in the history of patchwork.
> 
> But in general, I would recommend that this is being merged into next and we test it with more users.
> 
>> But: should I send a new patch series for this update?
> 
> Why? To clean up the mess? I would leave this for Arne. If he can work it out then not. Otherwise, a new patch series is probably the easier.
> 
> Best,
> -Michael
> ...

Ok, I'll let Arne decide.

Best,
Matthias
  
Arne Fitzenreiter April 30, 2020, 7:10 a.m. UTC | #4
I will merge the current patches next days but i want to test the media 
libs first and wait for the i586 build...

Arne



Am 2020-04-29 20:06, schrieb Matthias Fischer:
> Hi,
> 
> On 27.04.2020 14:13, Michael Tremer wrote:
>> Hi,
>> 
>>> ...
>>> 
>>> Besides: I'm thinking about the (8?) update patches for 'vnstatn 
>>> 2.6'.
>>> 
>>> These are quite a few, because - as you know - it took me some time 
>>> to
>>> get the initscript right. And one commit
>>> (https://patchwork.ipfire.org/patch/2936/) even has the wrong 
>>> subject.
>>> 
>>> Nevertheless, its running without problems since then. Today I 
>>> deleted
>>> the no longer needed files from '/var/log/vnstat/' ('.blue0', 
>>> '.green0',
>>> '.red0'). The new file, 'vnstat.db' takes about 250KB at the moment 
>>> and
>>> is staying there.
>> 
>> It is best if you write these things as a response to the original 
>> patch, because they will then appear in the history of patchwork.
>> 
>> But in general, I would recommend that this is being merged into next 
>> and we test it with more users.
>> 
>>> But: should I send a new patch series for this update?
>> 
>> Why? To clean up the mess? I would leave this for Arne. If he can work 
>> it out then not. Otherwise, a new patch series is probably the easier.
>> 
>> Best,
>> -Michael
>> ...
> 
> Ok, I'll let Arne decide.
> 
> Best,
> Matthias
  

Patch

diff --git a/lfs/tmux b/lfs/tmux
index 40f19dfea..aae90dab1 100644
--- a/lfs/tmux
+++ b/lfs/tmux
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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,7 +24,7 @@ 
 
 include Config
 
-VER        = 3.0a
+VER        = 3.1
 
 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    = 7
+PAK_VER    = 8
 
 DEPS       =
 
@@ -44,7 +44,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 003b7df5b12ba2553710492b89850ce5
+$(DL_FILE)_MD5 = 76c3ef9d40d2c1ade7a6cd7993b549ac
 
 install : $(TARGET)
 
@@ -54,7 +54,7 @@  download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist:
+dist: 
 	@$(PAK)
 
 ###############################################################################
@@ -78,8 +78,6 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && ./autogen.sh
-
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr