Re: [update] shells/fish to 3.6.3

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 -0000 1.42
> +++ Makefile 10 Dec 2023 15:13:08 -0000
> @@ -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 -0000 1.15
> +++ distinfo 10 Dec 2023 15:13:08 -0000
> @@ -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