From nobody Sun Mar 31 20:22:34 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V75Dx0fs0z5GLwN for ; Sun, 31 Mar 2024 20:23:13 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V75Dx06lFz4YMK for ; Sun, 31 Mar 2024 20:23:13 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711916593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DSsxfjp4Mg00Leyb9JpFwwmB7tknCMoL2KEr/eDEB8w=; b=bxYywD0sh7ohVwtlSEf89bvIpw69PDshcNBNhbXfhz7N3+gSByIcom7wvFYnQ84LDqqfpr ckPXZ/O7RTy2ZrSFTkcSn91xnOLov9PlUjygVPcU7RFUUWw6nYEw5IdtrAspAJ5hCgBMXY G62YeKX7ryyELCMTIx02niu4o+cGe9cY6cZoGiFF2Sp+jzpuVFNS1WrE4+NFzfTbJ9yIM1 e73eVXdSlAIC8mR1zBCMuSzY93PXdzZiMUCrsfHUXcFkR1Q1+pLf1gPjbQeWca3/7V0RV/ d1CdrZlCgZAs1QFFuFT+W6KrrBg2AFHEdhBrHVOVnQ5OJOWt+l3hahYxsnHaaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711916593; a=rsa-sha256; cv=none; b=JJZIJEZKVcN8fHGBKYki/Zp9pNqBMgK54ezN18RT+IJvfr29i/fvGhEtD+s74DdCEdNi+R Esnxvr3wwsXpreR0g0hbr8f8ns13Sbtjr/b/qlETwn7o3LlJXXi10zXYIRj7XqRKHShhVX CS0u4s1o+pGHjJMItZFo+AU4mlrxfcBOCox2kqZ1GCSc/ENfOc2HHtOwMkO8szXuaIlRDM qfTleKmZ2KU+Z0AKkZzNdTYhb8NG+Q/A9edKOVbuDFoXXIY3KhuTUg/l+NFkdMrVWEfYRM za1NDCleJgTeLSfkxU15Ei+maJ61DLNKtEicwve5kQ48T7Ur1vRzfIb1y8O4Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711916593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DSsxfjp4Mg00Leyb9JpFwwmB7tknCMoL2KEr/eDEB8w=; b=p6cctHij1c0TJXCd35mA64CCzEvxbZGbmpsIJQ8u4tBe6BOl2p1pMG2vWxf+Af9PLOdTD1 nq7d44iGBffP6iIJkepZN8rzzkcI9zW6QoOCx2OB2u5oR59hPh/CR+44xSUaQQaQnF08iO EbZFbH6r5acgvtyQ8B4DT6elbpctLHq6k83H2eNCCRpdo4rH/nCB0CUQVI21qAr9ATQ7wn 112FcinFGttTYUgFKD7YU5ilewPkt5hFZ97C7broP7Pr6OIAF8uMwQypmOwoh0vqA/3xRI NrV7KpJIk+YT6cu2QR4Bkd0dFERkQ69pbpc4xPJ+l7+/hey5l2IojsrfgUroHw== Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 4V75Dw6hfczZcB for ; Sun, 31 Mar 2024 20:23:12 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-56be32b9775so4458537a12.1 for ; Sun, 31 Mar 2024 13:23:12 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCVK47hJOJsSwAzQd5RZWkR/aGgAEGUOWP6MtF8N10IfXY0vulpEpUMbKjWMm9Jb+O8b5MnpvGN3EUoElmLeSCtsJXMtQwjLzGrYq8PVSd2+9zB2 X-Gm-Message-State: AOJu0YzuM9zDeSaUrvTcAkoMxjD2PzltTykJJR8M9QvZ+s5+PMMTfUuD mIOIvWxf58b+7W33DM74LCFX4wqKdWGO0oRuc+vmpET/sOJ3SkSGNxeVDuRoohbAzUKAZITXih2 8+fpmLKFrelS+esjwtvQsCQn4REBDIFQ4/8N8Dg== X-Google-Smtp-Source: AGHT+IH9rfN3b8ZCsM4cQPSWWjz5KckjNo0QIIU+wXpl5yPqgdca92mWiXstAY0cFe2cfQE6Z/F+/IP4Px/BacaTTRE= X-Received: by 2002:a50:d601:0:b0:56b:f2d2:eb8c with SMTP id x1-20020a50d601000000b0056bf2d2eb8cmr2813488edi.40.1711916591941; Sun, 31 Mar 2024 13:23:11 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202402211519.41LFJmRK018112@gitrepo.freebsd.org> In-Reply-To: From: Po-Chuan Hsieh Date: Mon, 1 Apr 2024 04:22:34 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 3a3b0e9e12ef - main - security/wolfssh: Update to 1.4.15 To: Daniel Engberg Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000592a1a0614faa411" --000000000000592a1a0614faa411 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Feb 22, 2024 at 1:29=E2=80=AFAM Daniel Engberg < daniel.engberg.lists@pyret.net> wrote: > On 2024-02-21T16:19:48.000+01:00, Po-Chuan Hsieh > wrote: > > The branch main has been updated by sunpoet: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D3a3b0e9e12efe4f7e860ded9= 6962cb5681305202 > > commit 3a3b0e9e12efe4f7e860ded96962cb5681305202 > Author: Po-Chuan Hsieh > AuthorDate: 2024-02-21 14:28:31 +0000 > Commit: Po-Chuan Hsieh > 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=3D wolfssh > -DISTVERSION=3D 1.4.15 > +PORTVERSION=3D 1.4.15 > CATEGORIES=3D security > MASTER_SITES=3D https://www.wolfssl.com/ > > @@ -12,12 +12,7 @@ LICENSE=3D GPLv3 > > LIB_DEPENDS=3D libwolfssl.so:security/wolfssl > > -USES=3D libtool localbase zip > -USE_LDCONFIG=3D yes > - > -GNU_CONFIGURE=3D yes > - > -INSTALL_TARGET=3D install-strip > +USES=3D libtool localbase > > CONFIGURE_ARGS=3D --disable-examples \ > --enable-fwd \ > @@ -27,5 +22,9 @@ CONFIGURE_ARGS=3D --disable-examples \ > --enable-shared=3Dyes \ > --enable-shell \ > --enable-static=3Dyes > +GNU_CONFIGURE=3D yes > +INSTALL_TARGET=3D install-strip > +TEST_TARGET=3D check > +USE_LDCONFIG=3D yes > > .include ; > 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 =3D 1707686084 > -SHA256 (wolfssh-1.4.15.zip) =3D a16816e7c651f4e7d959945637bce8012a9b2f7a= af41c6ad27c39f4f75769b8f > -SIZE (wolfssh-1.4.15.zip) =3D 960475 > +TIMESTAMP =3D 1708448958 > +SHA256 (wolfssh-1.4.15.tar.gz) =3D d6fb396b671afa14e15a8c092f0f453471c4f= 0b42bb83106ca6cab274bd82b2d > +SIZE (wolfssh-1.4.15.tar.gz) =3D 840402 > diff --git a/security/wolfssh/files/patch-SIGWINCH b/security/wolfssh/fil= es/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 > ++#include > + #include > + > + #ifdef WOLFSSH_SHELL > +--- examples/client/client.c.orig 2023-12-23 00:40:00 UTC > ++++ examples/client/client.c > +@@ -44,6 +44,8 @@ > + #include > + #endif > + > ++#include > ++ > + #ifdef WOLFSSH_SHELL > + #ifdef HAVE_PTY_H > + #include > > > Hi, > > Did you test this change? > Regarding 'make test', it was done elsewhere to check the built binary is OK. As you can see, examples/client/client.c is patched in patch-SIGWINCH to build the binary for testing. I've cleaned up the Makefile (previously used for local testing) and committed in ports 5e391da971e223b30fd18c2d9c5105385c653025. Multiple unit tests fails because of missing binaries > > https://www.wolfssl.com/download/ links to the zip archive > I've checked the content. Both tarballs are identical. And .tar.gz is smaller than .zip. > > 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 > > --000000000000592a1a0614faa411 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, Feb 22, 2024 at 1:29=E2=80=AFAM D= aniel Engberg <daniel.engberg.lists@pyret.net> wrote:
O= n 2024-02-21T16:19:48.000+01:00, Po-Chuan Hsieh <sunpoet@FreeBSD.org>= wrote:
Th=
e branch main has been updated by sunpoet:


commit 3a3b0e9e12efe4f7e860ded96962cb=
5681305202
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
=

AuthorDate: 2024-02-21 14:28:31 +0000
Commit:     Po-Chu=
an Hsieh <sunpo=
et@FreeBSD.org>
CommitDate: 2024-02-21 15:06:42 +0000<=
br>

    security/wolfssh: Update to 1.4.15
    
---
 security/wolfssh/Makefile             | 13 ++++++-------
=
 security/wolfssh/distinfo             |  6 +++---
 security/=
wolfssh/files/patch-SIGWINCH | 21 +++++++++++++++++++++
 3 fi=
les 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=3D wolfssh
-DISTVE= RSION=3D 1.4.15
+PORTVERSION=3D 1.4.15
CATEGOR= IES=3D security

@@ -12,12 +12,7 @@ LICENSE=3D GPLv3<= br>


-USES=3D libtool = localbase zip
-USE_LDCONFIG=3D yes
-
<= div>-GNU_CONFIGURE=3D yes
-
-INSTALL_TARGET=3D = install-strip
+USES=3D libtool localbase

=
CONFIGURE_ARGS=3D --disable-examples \
--enabl= e-fwd \
@@ -27,5 +22,9 @@ CONFIGURE_ARGS=3D --disable-example= s \
--enable-shared=3Dyes \
--enable-shel= l \
--enable-static=3Dyes
+GNU_CONFIGURE=3D = yes
+INSTALL_TARGET=3D install-strip
+TEST_TARG= ET=3D check
+USE_LDCONFIG=3D yes

.include <bsd.port.mk>;
diff --git a/security/wolfssh/distinfo b/security/wolfssh/distinfo
index ef1ffbefc3d6..338a09e8a1a3 100644
--- a/se= curity/wolfssh/distinfo
+++ b/security/wolfssh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP =3D 1707686084
<= div>-SHA256 (wolfssh-1.4.15.zip) =3D a16816e7c651f4e7d95994563= 7bce8012a9b2f7aaf41c6ad27c39f4f75769b8f
-SIZE (wolfs= sh-1.4.15.zip) =3D 960475
+TIMESTAMP =3D 1708448958
+SHA256 (wolfssh-1.4.15.tar.gz) =3D d6fb396b671afa14e15a8c092f0f45= 3471c4f0b42bb83106ca6cab274bd82b2d
+SIZE (wolfssh-1.4.15.tar.= gz) =3D 840402
diff --git a/security/wolfssh/files/patch-SIGW= INCH b/security/wolfssh/files/patch-SIGWINCH
new file mode 10= 0644
index 000000000000..f397f4db6529
--- /dev/= null
+++ b/security/wolfssh/files/patch-SIGWINCH
@@ -0,0 +1,21 @@
+--- apps/wolfssh/wolfssh.c.orig 2023-12-2= 3 00:40:00 UTC
++++ apps/wolfssh/wolfssh.c
+@@ = -45,6 +45,7 @@
+ #endif
+
+ #inc= lude <sys/param.h>
++#include <sys/signal.h>
<= /div>
+ #include <libgen.h>
+
+ #ifd= ef WOLFSSH_SHELL
+--- examples/client/client.c.orig 2023-12-2= 3 00:40:00 UTC
++++ examples/client/client.c
+@= @ -44,6 +44,8 @@
+ #include <termios.h>
+ #endif
+
++#include <sys/signal.h><= br>
++
+ #ifdef WOLFSSH_SHELL
+ #= ifdef HAVE_PTY_H
+ #include <pty.h>

Hi,

Did you test this change?

Regard= ing 'make test', it was done elsewhere to=C2=A0check the=C2=A0built= =C2=A0binary is=C2=A0OK.
As you can see,=C2=A0examples/client= /client.c is patched in=C2=A0patch-SIGWINCH to build the binary for=C2=A0te= sting.
I've cleaned up the Makefile (previously used for loca= l testing) and committed in ports=C2=A05e391da971e223b30fd18c2d9c5105385c65= 3025.

Multiple unit tests fails because of missing binaries
<= /div>

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

I&= #39;ve checked the=C2=A0content. Both tarballs are identical.
And= .tar.gz is smaller than .zip.



Use= of PORTVERSION is discouraged over DISTVERSION except in specific scenario= s, see Porters Handbook:


Best regards,
Daniel

--000000000000592a1a0614faa411--