From: Omar Polo <op@omarpolo.com>
Subject: Re: gotwebd.conf fcgi port syntax change
To: Stefan Sperling <stsp@stsp.name>
Cc: gameoftrees@openbsd.org
Date: Mon, 29 Aug 2022 17:52:08 +0200

On 2022/08/29 17:20:05 +0200, Stefan Sperling <stsp@stsp.name> wrote:
> On Mon, Aug 29, 2022 at 03:43:46PM +0200, Omar Polo wrote:
> > > @@ -360,9 +369,6 @@ serveropts1	: REPOS_PATH STRING { | FCGI_SOCKET boolean {
> > 
> > this hunk is wrong.  it says that there are 9 context lines of the old
> > file and 6 of the new file, but they're 8 and 5 respectively, so
> > 
> > >  			new_srv->fcgi_socket = $2;
> > >  		}
> > > -		| FCGI_SOCKET boolean  {
> > > -			new_srv->fcgi_socket = $2;
> > > -		} '{' optnl socketopts2 '}'
> > >  		| UNIX_SOCKET boolean {
> > >  			new_srv->unix_socket = $2;
> > >  		}
> > > @@ -386,54 +392,6 @@ serveropts2	: serveropts2 serveropts1 nl
> > 
> > both got patch and patch(1) fails when finding a line starting with
> > '@' when they expect one context line still.
> > 
> > If i manually fix it then the patch applies
> 
> There was a line-wrap, a context line moved up into the hunk header.
> Trying again:

Ah, yep, i should have seen it, sorry

-@@ -360,8 +369,5 @@ serveropts1        : REPOS_PATH STRING { | FCGI_SOCKET boolean {
+@@ -360,9 +369,6 @@ serveropts1        : REPOS_PATH STRING {


anyway, still ok for me :)