Re: git: 3a3b0e9e12ef - main - security/wolfssh: Update to 1.4.15

On 2024-02-21T16:19:48.000+01:00, Po-Chuan Hsieh <sunpoet@FreeBSD.org>
wrote:

> The branch main has been updated by sunpoet:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=3a3b0e9e12efe4f7e860ded96962cb5681305202
> 
> commit 3a3b0e9e12efe4f7e860ded96962cb5681305202
> 
> Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> 
> AuthorDate: 2024-02-21 14:28:31 +0000
> 
> Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> 
> CommitDate: 2024-02-21 15:06:42 +0000
> 
>     security/wolfssh: Update to 1.4.15
> 
>     
> 
>     Changes:        https://github.com/wolfSSL/wolfssh/releases
> 
> ---
> 
>  security/wolfssh/Makefile             | 13 ++++++-------
> 
>  security/wolfssh/distinfo             |  6 +++---
> 
>  security/wolfssh/files/patch-SIGWINCH | 21 +++++++++++++++++++++
> 
>  3 files changed, 30 insertions(+), 10 deletions(-)
> 
> diff --git a/security/wolfssh/Makefile b/security/wolfssh/Makefile
> 
> index 77dd5d2cdc01..bf995ce37aec 100644
> 
> --- a/security/wolfssh/Makefile
> 
> +++ b/security/wolfssh/Makefile
> 
> @@ -1,5 +1,5 @@
> 
>  PORTNAME=    wolfssh
> 
> -DISTVERSION=    1.4.15
> 
> +PORTVERSION=    1.4.15
> 
>  CATEGORIES=    security
> 
>  MASTER_SITES=    https://www.wolfssl.com/
> 
>  
> 
> @@ -12,12 +12,7 @@ LICENSE=    GPLv3
> 
>  
> 
>  LIB_DEPENDS=    libwolfssl.so:security/wolfssl [http://libwolfssl.so:security/wolfssl]
> 
>  
> 
> -USES=        libtool localbase zip
> 
> -USE_LDCONFIG=    yes
> 
> -
> 
> -GNU_CONFIGURE=    yes
> 
> -
> 
> -INSTALL_TARGET=    install-strip
> 
> +USES=        libtool localbase
> 
>  
> 
>  CONFIGURE_ARGS=    --disable-examples \
> 
>          --enable-fwd \
> 
> @@ -27,5 +22,9 @@ CONFIGURE_ARGS=    --disable-examples \
> 
>          --enable-shared=yes \
> 
>          --enable-shell \
> 
>          --enable-static=yes
> 
> +GNU_CONFIGURE=    yes
> 
> +INSTALL_TARGET=    install-strip
> 
> +TEST_TARGET=    check
> 
> +USE_LDCONFIG=    yes
> 
>  
> 
>  .include <bsd.port.mk> [http://bsd.port.mk>];
> 
> diff --git a/security/wolfssh/distinfo b/security/wolfssh/distinfo
> 
> index ef1ffbefc3d6..338a09e8a1a3 100644
> 
> --- a/security/wolfssh/distinfo
> 
> +++ b/security/wolfssh/distinfo
> 
> @@ -1,3 +1,3 @@
> 
> -TIMESTAMP = 1707686084
> 
> -SHA256 (wolfssh-1.4.15.zip [http://wolfssh-1.4.15.zip]) = a16816e7c651f4e7d959945637bce8012a9b2f7aaf41c6ad27c39f4f75769b8f
> 
> -SIZE (wolfssh-1.4.15.zip [http://wolfssh-1.4.15.zip]) = 960475
> 
> +TIMESTAMP = 1708448958
> 
> +SHA256 (wolfssh-1.4.15.tar.gz) = d6fb396b671afa14e15a8c092f0f453471c4f0b42bb83106ca6cab274bd82b2d
> 
> +SIZE (wolfssh-1.4.15.tar.gz) = 840402
> 
> diff --git a/security/wolfssh/files/patch-SIGWINCH b/security/wolfssh/files/patch-SIGWINCH
> 
> new file mode 100644
> 
> index 000000000000..f397f4db6529
> 
> --- /dev/null
> 
> +++ b/security/wolfssh/files/patch-SIGWINCH
> 
> @@ -0,0 +1,21 @@
> 
> +--- apps/wolfssh/wolfssh.c.orig    2023-12-23 00:40:00 UTC
> 
> ++++ apps/wolfssh/wolfssh.c
> 
> +@@ -45,6 +45,7 @@
> 
> + #endif
> 
> + 
> 
> + #include <sys/param.h>
> 
> ++#include <sys/signal.h>
> 
> + #include <libgen.h>
> 
> + 
> 
> + #ifdef WOLFSSH_SHELL
> 
> +--- examples/client/client.c.orig    2023-12-23 00:40:00 UTC
> 
> ++++ examples/client/client.c
> 
> +@@ -44,6 +44,8 @@
> 
> +     #include <termios.h>
> 
> + #endif
> 
> + 
> 
> ++#include <sys/signal.h>
> 
> ++
> 
> + #ifdef WOLFSSH_SHELL
> 
> +     #ifdef HAVE_PTY_H
> 
> +         #include <pty.h>

Hi,

Did you test this change?

Multiple unit tests fails because of missing binaries

https://www.wolfssl.com/download/ links to the zip archive

Use of PORTVERSION is discouraged over DISTVERSION except in specific
scenarios, see Porters Handbook:

https://docs.freebsd.org/en/books/porters-handbook/book/#porting-makefile

https://docs.freebsd.org/en/books/porters-handbook/book/#porting-pkgname
- Table #2

Best regards,

Daniel