Re: [update] shells/fish to 3.6.3

2023-12-11 Thread Florian Viehweger
Am Mon, 11 Dec 2023 20:26:08 +
schrieb Stuart Henderson :

> On 2023/12/10 16:35, Florian Viehweger wrote:
> > Hello Justin, hello Stuart,
> > 
> > thank you both for looking at fish and giving valuable tips.
> > Additionally op@ helped me digging into the tests. Thank you!
> > 
> > Only one test is still failing because it tests for 'synclient'
> > which fails itself on systems without the 'synaptics' driver loaded.
> > 
> > Fish 3.6.2 mentions a security advisory [2] for which I think this
> > diff should be backported to 7.4 stable.
> 
> agreed, committed to both branches.

Thanks!

> > Some testing done on amd64 and no errors found.
> > 
> > Comments?
> > 
> > Thanks!
> > 
> > [1] https://github.com/fish-shell/fish-shell/releases
> > [2]
> > https://github.com/fish-shell/fish-shell/security/advisories/GHSA-2j9r-pm96-wp4f
> > 
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file:
> > /daten/openbsdmirror/cvs/mirror/ports/shells/fish/Makefile,v
> > retrieving revision 1.42 diff -u -p -u -p -r1.42 Makefile
> > --- Makefile27 Sep 2023 16:41:31 -  1.42
> > +++ Makefile10 Dec 2023 15:13:08 -
> > @@ -1,6 +1,6 @@
> >  COMMENT =  friendly interactive shell
> >  
> > -V =3.6.1
> > +V =3.6.4
> >  
> >  DISTNAME = fish-$V
> >  
> > @@ -45,7 +45,14 @@ CONFIGURE_ENV =
> > CPPFLAGS="-I${LOCALBASE 
> >  PORTHOME = ${WRKDIR}
> >  
> > +# Test #96: check-completions.fish fails on systems without
> > synaptics +# driver loaded.
> > +
> > +TEST_DEPENDS = sysutils/coreutils \
> > +   ${PKGPATH}=${V}
> > +
> >  do-test:
> > +   ln -fs ${LOCALBASE}/bin/ghead ${WRKDIR}/bin/head
> > ${MODCMAKE_BUILD_TARGET} -t ${TEST_TARGET}
> >  
> >  post-install:
> > Index: distinfo
> > ===
> > RCS file:
> > /daten/openbsdmirror/cvs/mirror/ports/shells/fish/distinfo,v
> > retrieving revision 1.15 diff -u -p -u -p -r1.15 distinfo
> > --- distinfo1 May 2023 08:57:15 -   1.15
> > +++ distinfo10 Dec 2023 15:13:08 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (fish-3.6.1.tar.xz) =
> > VUArtHymc52KuiXkF4CQW1zhvOCl4N0X3KkItbwLSbI= -SIZE
> > (fish-3.6.1.tar.xz) = 2866100 +SHA256 (fish-3.6.4.tar.xz) =
> > Dz9hDlgN4JL76ILIqnZiPs+Ruxb98FQyQebpDV1Lw5M= +SIZE
> > (fish-3.6.4.tar.xz) = 2911364
> > 
> > 
> > -- 
> > greetings,
> > 
> > Florian Viehweger
> 



-- 
greetings,

Florian Viehweger



Re: [update] shells/fish to 3.6.3

2023-12-11 Thread Stuart Henderson
On 2023/12/10 16:35, Florian Viehweger wrote:
> Hello Justin, hello Stuart,
> 
> thank you both for looking at fish and giving valuable tips.
> Additionally op@ helped me digging into the tests. Thank you!
> 
> Only one test is still failing because it tests for 'synclient' which
> fails itself on systems without the 'synaptics' driver loaded.
> 
> Fish 3.6.2 mentions a security advisory [2] for which I think this diff
> should be backported to 7.4 stable.

agreed, committed to both branches.

> Some testing done on amd64 and no errors found.
> 
> Comments?
> 
> Thanks!
> 
> [1] https://github.com/fish-shell/fish-shell/releases
> [2]
> https://github.com/fish-shell/fish-shell/security/advisories/GHSA-2j9r-pm96-wp4f
> 
> 
> 
> Index: Makefile
> ===
> RCS file: /daten/openbsdmirror/cvs/mirror/ports/shells/fish/Makefile,v
> retrieving revision 1.42
> diff -u -p -u -p -r1.42 Makefile
> --- Makefile  27 Sep 2023 16:41:31 -  1.42
> +++ Makefile  10 Dec 2023 15:13:08 -
> @@ -1,6 +1,6 @@
>  COMMENT =friendly interactive shell
>  
> -V =  3.6.1
> +V =  3.6.4
>  
>  DISTNAME =   fish-$V
>  
> @@ -45,7 +45,14 @@ CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE
>  
>  PORTHOME =   ${WRKDIR}
>  
> +# Test #96: check-completions.fish fails on systems without synaptics
> +# driver loaded.
> +
> +TEST_DEPENDS =   sysutils/coreutils \
> + ${PKGPATH}=${V}
> +
>  do-test:
> + ln -fs ${LOCALBASE}/bin/ghead ${WRKDIR}/bin/head
>   ${MODCMAKE_BUILD_TARGET} -t ${TEST_TARGET}
>  
>  post-install:
> Index: distinfo
> ===
> RCS file: /daten/openbsdmirror/cvs/mirror/ports/shells/fish/distinfo,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 distinfo
> --- distinfo  1 May 2023 08:57:15 -   1.15
> +++ distinfo  10 Dec 2023 15:13:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (fish-3.6.1.tar.xz) = VUArtHymc52KuiXkF4CQW1zhvOCl4N0X3KkItbwLSbI=
> -SIZE (fish-3.6.1.tar.xz) = 2866100
> +SHA256 (fish-3.6.4.tar.xz) = Dz9hDlgN4JL76ILIqnZiPs+Ruxb98FQyQebpDV1Lw5M=
> +SIZE (fish-3.6.4.tar.xz) = 2911364
> 
> 
> -- 
> greetings,
> 
> Florian Viehweger



Re: [update] shells/fish to 3.6.3

2023-12-10 Thread Florian Viehweger
Hello Justin, hello Stuart,

thank you both for looking at fish and giving valuable tips.
Additionally op@ helped me digging into the tests. Thank you!

Only one test is still failing because it tests for 'synclient' which
fails itself on systems without the 'synaptics' driver loaded.

Fish 3.6.2 mentions a security advisory [2] for which I think this diff
should be backported to 7.4 stable.

Some testing done on amd64 and no errors found.

Comments?

Thanks!

[1] https://github.com/fish-shell/fish-shell/releases
[2]
https://github.com/fish-shell/fish-shell/security/advisories/GHSA-2j9r-pm96-wp4f



Index: Makefile
===
RCS file: /daten/openbsdmirror/cvs/mirror/ports/shells/fish/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile27 Sep 2023 16:41:31 -  1.42
+++ Makefile10 Dec 2023 15:13:08 -
@@ -1,6 +1,6 @@
 COMMENT =  friendly interactive shell
 
-V =3.6.1
+V =3.6.4
 
 DISTNAME = fish-$V
 
@@ -45,7 +45,14 @@ CONFIGURE_ENV =  CPPFLAGS="-I${LOCALBASE
 
 PORTHOME = ${WRKDIR}
 
+# Test #96: check-completions.fish fails on systems without synaptics
+# driver loaded.
+
+TEST_DEPENDS = sysutils/coreutils \
+   ${PKGPATH}=${V}
+
 do-test:
+   ln -fs ${LOCALBASE}/bin/ghead ${WRKDIR}/bin/head
${MODCMAKE_BUILD_TARGET} -t ${TEST_TARGET}
 
 post-install:
Index: distinfo
===
RCS file: /daten/openbsdmirror/cvs/mirror/ports/shells/fish/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo1 May 2023 08:57:15 -   1.15
+++ distinfo10 Dec 2023 15:13:08 -
@@ -1,2 +1,2 @@
-SHA256 (fish-3.6.1.tar.xz) = VUArtHymc52KuiXkF4CQW1zhvOCl4N0X3KkItbwLSbI=
-SIZE (fish-3.6.1.tar.xz) = 2866100
+SHA256 (fish-3.6.4.tar.xz) = Dz9hDlgN4JL76ILIqnZiPs+Ruxb98FQyQebpDV1Lw5M=
+SIZE (fish-3.6.4.tar.xz) = 2911364


-- 
greetings,

Florian Viehweger



Re: [update] shells/fish to 3.6.3

2023-12-07 Thread Stuart Henderson
On 2023/12/07 08:23, Justin Berthault wrote:
> Hi Florian
> 
> Everything is fine here with 3.6.4 however there are some test
> failures.
> 
> The following tests FAILED:
> 82 - abbr.fish (Failed)
> 136 - git.fish (Failed)
> 168 - read.fish (Failed)
> 193 - tmux-abbr.fish (Failed)
> 194 - tmux-bind.fish (Failed)
> 195 - tmux-complete.fish (Failed)
> 196 - tmux-history-search.fish (Failed)
> 197 - tmux-prompt.fish (Failed
> 
> Best regards.
> -- 
> ~Justin
> 

It doesn't find the fish binary properly (same in 3.6.1).
Can be worked-around with a TEST_DEPENDS on itself, i.e.
${FULLPKGNAME}:${BUILD_PKGPATH}, 

With that, I see two remaining failures:

- read.fish is using a gnu extension to head(1):

|   1/246 Test #168: read.fish ***Failed
0.47 sec
| Testing file checks/read.fish ... Failure:
| 
|   The CHECK on line 252 wants:
| $a: set in global scope, unexported, with 1 elements
| 
|   which failed to match line stdout:51:
| reading too much data did not terminate with failure status
| 
|   additional output on stderr:3:12:
| head: unknown option -- c
| usage: head [-count | -n count] [file ...]
| head: unknown option -- c
| usage: head [-count | -n count] [file ...]
| read: status: cannot overwrite read-only variable
| checks/read.fish (line 384):
| echo foo | read status
| ^

This one can be fixed by depending on sysutils/coreutils and "ln -fs
${LOCALBASE}/bin/ghead ${WRKDIR}/bin/head" before the main test in
do-test.


- check-completions.fish is trying to do something with X and failing:

|   9/246 Test  #96: check-completions.fish ...***Failed
3.26 sec
| Testing file checks/check-completions.fish ... Failure:
| 
|   There were no remaining checks left to match stderr:1:
| Failed to connect to X Server.
| 
|   Context:
| Failed to connect to X Server. <= no more checks
| 
|   when running command:
| ../test/root/bin/fish -C 'set -l fish ../test/root/bin/fish' 
checks/check-completions.fish

Not sure what this is doing (and not interested enough in fish to
spend more time diagnosing).



Re: [update] shells/fish to 3.6.3

2023-12-06 Thread Justin Berthault
Hi Florian

Everything is fine here with 3.6.4 however there are some test
failures.

The following tests FAILED:
82 - abbr.fish (Failed)
136 - git.fish (Failed)
168 - read.fish (Failed)
193 - tmux-abbr.fish (Failed)
194 - tmux-bind.fish (Failed)
195 - tmux-complete.fish (Failed)
196 - tmux-history-search.fish (Failed)
197 - tmux-prompt.fish (Failed

Best regards.
-- 
~Justin



Re: [update] shells/fish to 3.6.3

2023-12-06 Thread Florian Viehweger
Hi Justin,

> quick update to latest version:

thank you for looking at the port. I appreciate it.

In the meantime a new version of fish was released (3.6.4) for which I
already have a update in the works. I kindly invite you to join the
effort testing it.

Thanks again!

-- 
greetings,

Florian Viehweger



Re: [update] shells/fish to 3.6.3

2023-12-06 Thread Stuart Henderson
On 2023/12/06 09:33, Justin Berthault wrote:
> Hi ports@
> 
> quick update to latest version:
> 
>   - Using DIST_TUPLE now

Don't do this. Upstream has proper uploaded tarballs (/releases/ URL),
use those instead.

(Also that changed the package stem from "fish" to "fish-shell",
breaking updates. That will be fixed by using the proper tarball
anyway but mentioning this so you are aware for any other diffs).