From phk at phk.freebsd.dk  Wed Nov  7 11:00:55 2018
From: phk at phk.freebsd.dk (Poul-Henning Kamp)
Date: Wed, 07 Nov 2018 11:00:55 +0000
Subject: [6.1] 2f2387038 Fix gensequences for BusyBox awk
In-Reply-To: <20181107091318.F3356ACEF1@lists.varnish-cache.org>
References: <20181107091318.F3356ACEF1@lists.varnish-cache.org>
Message-ID: <85238.1541588455@critter.freebsd.dk>

--------

Why is this fix not in -trunk ?

Poul-Henning

In message <20181107091318.F3356ACEF1 at lists.varnish-cache.org>, P?l Hermunn Johanse
n writes:
>
>commit 2f2387038a7b9aca4c31c0f839cda3b7ab3391c0
>Author: Guillaume Quintard <guillaume at varnish-software.com>
>Date:   Thu Apr 26 21:59:41 2018 +0200
>
>    Fix gensequences for BusyBox awk
>    
>    I never thought that I'd have to fix a string concatenation problem in
>    a BusyBox awk program to generate VT100 code in a container, but here we
>    are:
>    
>    echo | awk 'END {print "foo" "" ++a, "foo" ++a}'
>    
>    should output "foo0 foo1", and for all the ?awk I tested, it does,
>    except for BusyBox awk who thought funny to output "0 foo1", breaking the
>    teken_state.h file.
>
>diff --git a/bin/varnishtest/gensequences b/bin/varnishtest/gensequences
>index 4337186b8..18a68b43b 100644
>--- a/bin/varnishtest/gensequences
>+++ b/bin/varnishtest/gensequences
>@@ -70,7 +70,7 @@ while (getline > 0) {
> 		l_prefix_parent[n] = prefix;
> 		l_prefix_suffix[n] = sequence[i];
> 		if (!l_prefix_name[n])
>-			l_prefix_name[n] = "teken_state_" ++npr;
>+			l_prefix_name[n] = "teken_state_" "" ++npr;
> 		prefix = n;
> 	}
> 
>_______________________________________________
>varnish-commit mailing list
>varnish-commit at varnish-cache.org
>https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
>

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk at FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.

From dridi at varni.sh  Wed Nov  7 11:43:33 2018
From: dridi at varni.sh (Dridi Boukelmoune)
Date: Wed, 7 Nov 2018 12:43:33 +0100
Subject: [6.1] 2f2387038 Fix gensequences for BusyBox awk
In-Reply-To: <85238.1541588455@critter.freebsd.dk>
References: <20181107091318.F3356ACEF1@lists.varnish-cache.org>
 <85238.1541588455@critter.freebsd.dk>
Message-ID: <CABoVN9D-PPiuSEpWPb+ktmZuX=j7bd0Bpmkx6w14BYu+HtcH2g@mail.gmail.com>

On Wed, Nov 7, 2018 at 12:01 PM Poul-Henning Kamp <phk at phk.freebsd.dk> wrote:
>
> --------
>
> Why is this fix not in -trunk ?

It is:

    $ git branch --contains 9f50c4bd12303674890ca742ce6b9592a29e3ba9
      6.1
    * master

But it was lost during backports. It was accidentally lost in both my
6.0 and P?l's 6.1 backports.

Dridi

From dridi at varni.sh  Wed Nov  7 11:47:30 2018
From: dridi at varni.sh (Dridi Boukelmoune)
Date: Wed, 7 Nov 2018 12:47:30 +0100
Subject: [6.1] 2f2387038 Fix gensequences for BusyBox awk
In-Reply-To: <CABoVN9D-PPiuSEpWPb+ktmZuX=j7bd0Bpmkx6w14BYu+HtcH2g@mail.gmail.com>
References: <20181107091318.F3356ACEF1@lists.varnish-cache.org>
 <85238.1541588455@critter.freebsd.dk>
 <CABoVN9D-PPiuSEpWPb+ktmZuX=j7bd0Bpmkx6w14BYu+HtcH2g@mail.gmail.com>
Message-ID: <CABoVN9CxF9wQ79CC8tZcdacO4ZFB5G7bvGX_GY=+ZKz=4Cjy9w@mail.gmail.com>

> But it was lost during backports. It was accidentally lost in both my
> 6.0 and P?l's 6.1 backports.

I guess both P?l and I lost it because it was also lost in the mater branch:

    $ git grep l_prefix_name -- bin/varnishtest/gensequences
    <snip>
    bin/varnishtest/gensequences:                   l_prefix_name[n] =
"teken_state_" ++npr;
    <snip>

The change was overwritten in this commit:

commit f2abaf8698a34a44d8a80d80756b0f843560e31d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 24 07:31:46 2018 +0000

    Update Teken from FreeBSD source tree

phk, maybe you should upstream the fix to avoid running into the same
situation with the next teken update?

Dridi

From slink at schokola.de  Mon Nov 19 14:51:26 2018
From: slink at schokola.de (Nils Goroll)
Date: Mon, 19 Nov 2018 15:51:26 +0100
Subject: will be away Dec 11 - Jan 11
Message-ID: <04313569-1497-6243-7008-04b70024ef63@schokola.de>

before I forget again to mention this during bugwash:

I will be away for a month to experience Christmas during summer. There are
enough people in the varnish team who know my mobile# and the rest of the UPLEX
team will continue being available in the Hamburg office, just in case.

So before I forget, happy xmas and happy new year to everyone.

Nils

From phk at phk.freebsd.dk  Mon Nov 19 20:13:24 2018
From: phk at phk.freebsd.dk (Poul-Henning Kamp)
Date: Mon, 19 Nov 2018 20:13:24 +0000
Subject: will be away Dec 11 - Jan 11
In-Reply-To: <04313569-1497-6243-7008-04b70024ef63@schokola.de>
References: <04313569-1497-6243-7008-04b70024ef63@schokola.de>
Message-ID: <1693.1542658404@critter.freebsd.dk>

--------
In message <04313569-1497-6243-7008-04b70024ef63 at schokola.de>, Nils Goroll writ
es:
>before I forget again to mention this during bugwash:
>
>I will be away for a month to experience Christmas during summer.

.AU ?

.NZ ?

.ZA ?

.AR ?

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk at FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.