Date: Mon, 1 Apr 2024 04:22:34 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Daniel Engberg <daniel.engberg.lists@pyret.net> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 3a3b0e9e12ef - main - security/wolfssh: Update to 1.4.15 Message-ID: <CAMHz58TsNkfNw%2BkreVai%2Btn7kgNdm6X7_r5aWfzhunDMOvaV2Q@mail.gmail.com> In-Reply-To: <c969c6ed42030f7b9d5eaa4bf0002af6@mail.infomaniak.com> References: <202402211519.41LFJmRK018112@gitrepo.freebsd.org> <c969c6ed42030f7b9d5eaa4bf0002af6@mail.infomaniak.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <sunpoet@FreeBSD.org> > 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 <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=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 <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 =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 <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? > 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 <div dir=3D"ltr"><div dir=3D"ltr">On Thu, Feb 22, 2024 at 1:29=E2=80=AFAM D= aniel Engberg <<a href=3D"mailto:daniel.engberg.lists@pyret.net" target= =3D"_blank">daniel.engberg.lists@pyret.net</a>> wrote:<br></div><div cla= ss=3D"gmail_quote"><blockquote class=3D"gmail_quote" style=3D"margin:0px 0p= x 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div>O= n 2024-02-21T16:19:48.000+01:00, Po-Chuan Hsieh <sunpoet@FreeBSD.org>= wrote:<br></div><div><blockquote><pre style=3D"white-space:normal"><div>Th= e branch main has been updated by sunpoet:<br></div><div><br></div><div>URL= : <a rel=3D"noopener noreferrer" href=3D"https://cgit.FreeBSD.org/ports/com= mit/?id=3D3a3b0e9e12efe4f7e860ded96962cb5681305202" target=3D"_blank">https= ://cgit.FreeBSD.org/ports/commit/?id=3D3a3b0e9e12efe4f7e860ded96962cb568130= 5202</a><br></div><div><br></div><div>commit 3a3b0e9e12efe4f7e860ded96962cb= 5681305202<br></div><div>Author: Po-Chuan Hsieh <<a href=3D"mailto:s= unpoet@FreeBSD.org" target=3D"_blank">sunpoet@FreeBSD.org</a>><br></div>= <div>AuthorDate: 2024-02-21 14:28:31 +0000<br></div><div>Commit: Po-Chu= an Hsieh <<a href=3D"mailto:sunpoet@FreeBSD.org" target=3D"_blank">sunpo= et@FreeBSD.org</a>><br></div><div>CommitDate: 2024-02-21 15:06:42 +0000<= br></div><div><br></div><div> security/wolfssh: Update to 1.4.15<br></di= v><div> <br></div><div> Changes: <a rel=3D"noopener noreferrer= " href=3D"https://github.com/wolfSSL/wolfssh/releases" target=3D"_blank">ht= tps://github.com/wolfSSL/wolfssh/releases</a><br></div><div>---<br></div><d= iv> security/wolfssh/Makefile | 13 ++++++-------<br></div><div>= security/wolfssh/distinfo | 6 +++---<br></div><div> security/= wolfssh/files/patch-SIGWINCH | 21 +++++++++++++++++++++<br></div><div> 3 fi= les changed, 30 insertions(+), 10 deletions(-)<br></div><div><br></div><div= >diff --git a/security/wolfssh/Makefile b/security/wolfssh/Makefile<br></di= v><div>index 77dd5d2cdc01..bf995ce37aec 100644<br></div><div>--- a/security= /wolfssh/Makefile<br></div><div>+++ b/security/wolfssh/Makefile<br></div><d= iv>@@ -1,5 +1,5 @@<br></div><div> PORTNAME=3D wolfssh<br></div><div>-DISTVE= RSION=3D 1.4.15<br></div><div>+PORTVERSION=3D 1.4.15<br></div><div> CATEGOR= IES=3D security<br></div><div> MASTER_SITES=3D <a rel=3D"noopener noreferre= r" href=3D"https://www.wolfssl.com/" target=3D"_blank">https://www.wolfssl.= com/</a><br></div><div> <br></div><div>@@ -12,12 +12,7 @@ LICENSE=3D GPLv3<= br></div><div> <br></div><div> LIB_DEPENDS=3D <a rel=3D"noopener noreferrer= " href=3D"http://libwolfssl.so:security/wolfssl" target=3D"_blank">libwolfs= sl.so:security/wolfssl</a><br></div><div> <br></div><div>-USES=3D libtool = localbase zip<br></div><div>-USE_LDCONFIG=3D yes<br></div><div>-<br></div><= div>-GNU_CONFIGURE=3D yes<br></div><div>-<br></div><div>-INSTALL_TARGET=3D = install-strip<br></div><div>+USES=3D libtool localbase<br></div><div> <br>= </div><div> CONFIGURE_ARGS=3D --disable-examples \<br></div><div> --enabl= e-fwd \<br></div><div>@@ -27,5 +22,9 @@ CONFIGURE_ARGS=3D --disable-example= s \<br></div><div> --enable-shared=3Dyes \<br></div><div> --enable-shel= l \<br></div><div> --enable-static=3Dyes<br></div><div>+GNU_CONFIGURE=3D = yes<br></div><div>+INSTALL_TARGET=3D install-strip<br></div><div>+TEST_TARG= ET=3D check<br></div><div>+USE_LDCONFIG=3D yes<br></div><div> <br></div><di= v> .include <<a rel=3D"noopener noreferrer">bsd.port.mk></a>;<br></di= v><div>diff --git a/security/wolfssh/distinfo b/security/wolfssh/distinfo<b= r></div><div>index ef1ffbefc3d6..338a09e8a1a3 100644<br></div><div>--- a/se= curity/wolfssh/distinfo<br></div><div>+++ b/security/wolfssh/distinfo<br></= div><div>@@ -1,3 +1,3 @@<br></div><div>-TIMESTAMP =3D 1707686084<br></div><= div>-SHA256 (<a rel=3D"noopener noreferrer" href=3D"http://wolfssh-1.4.15.z= ip" target=3D"_blank">wolfssh-1.4.15.zip</a>) =3D a16816e7c651f4e7d95994563= 7bce8012a9b2f7aaf41c6ad27c39f4f75769b8f<br></div><div>-SIZE (<a rel=3D"noop= ener noreferrer" href=3D"http://wolfssh-1.4.15.zip" target=3D"_blank">wolfs= sh-1.4.15.zip</a>) =3D 960475<br></div><div>+TIMESTAMP =3D 1708448958<br></= div><div>+SHA256 (wolfssh-1.4.15.tar.gz) =3D d6fb396b671afa14e15a8c092f0f45= 3471c4f0b42bb83106ca6cab274bd82b2d<br></div><div>+SIZE (wolfssh-1.4.15.tar.= gz) =3D 840402<br></div><div>diff --git a/security/wolfssh/files/patch-SIGW= INCH b/security/wolfssh/files/patch-SIGWINCH<br></div><div>new file mode 10= 0644<br></div><div>index 000000000000..f397f4db6529<br></div><div>--- /dev/= null<br></div><div>+++ b/security/wolfssh/files/patch-SIGWINCH<br></div><di= v>@@ -0,0 +1,21 @@<br></div><div>+--- apps/wolfssh/wolfssh.c.orig 2023-12-2= 3 00:40:00 UTC<br></div><div>++++ apps/wolfssh/wolfssh.c<br></div><div>+@@ = -45,6 +45,7 @@<br></div><div>+ #endif<br></div><div>+ <br></div><div>+ #inc= lude <sys/param.h><br></div><div>++#include <sys/signal.h><br><= /div><div>+ #include <libgen.h><br></div><div>+ <br></div><div>+ #ifd= ef WOLFSSH_SHELL<br></div><div>+--- examples/client/client.c.orig 2023-12-2= 3 00:40:00 UTC<br></div><div>++++ examples/client/client.c<br></div><div>+@= @ -44,6 +44,8 @@<br></div><div>+ #include <termios.h><br></div><d= iv>+ #endif<br></div><div>+ <br></div><div>++#include <sys/signal.h><= br></div><div>++<br></div><div>+ #ifdef WOLFSSH_SHELL<br></div><div>+ #= ifdef HAVE_PTY_H<br></div><div>+ #include <pty.h><br></div></= pre></blockquote></div><div><br></div><div>Hi,<br></div><div><br></div><div= >Did you test this change?<br></div></blockquote><div><br></div><div>Regard= ing 'make test', it was done elsewhere to=C2=A0check the=C2=A0built= =C2=A0binary is=C2=A0OK.<br></div><div>As you can see,=C2=A0examples/client= /client.c is patched in=C2=A0patch-SIGWINCH to build the binary for=C2=A0te= sting.</div><div>I've cleaned up the Makefile (previously used for loca= l testing) and committed in ports=C2=A05e391da971e223b30fd18c2d9c5105385c65= 3025.</div><div><br></div><blockquote class=3D"gmail_quote" style=3D"margin= :0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"= ><div></div><div>Multiple unit tests fails because of missing binaries<br><= /div><div><br></div><div><a href=3D"https://www.wolfssl.com/download/" rel= =3D"noopener noreferrer" target=3D"_blank">https://www.wolfssl.com/download= /</a> links to the zip archive<br></div></blockquote><div><br></div><div>I&= #39;ve checked the=C2=A0content. Both tarballs are identical.</div><div>And= .tar.gz is smaller than .zip.</div><div><br></div><blockquote class=3D"gma= il_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,2= 04,204);padding-left:1ex"><div></div><div><br></div><div><br></div><div>Use= of PORTVERSION is discouraged over DISTVERSION except in specific scenario= s, see Porters Handbook:<br></div><div><br></div><div><a href=3D"https://do= cs.freebsd.org/en/books/porters-handbook/book/#porting-makefile" rel=3D"noo= pener noreferrer" target=3D"_blank">https://docs.freebsd.org/en/books/porte= rs-handbook/book/#porting-makefile</a><br></div><div><a href=3D"https://doc= s.freebsd.org/en/books/porters-handbook/book/#porting-pkgname" rel=3D"noope= ner noreferrer" target=3D"_blank">https://docs.freebsd.org/en/books/porters= -handbook/book/#porting-pkgname</a> - Table #2<br></div><div><br></div><div= >Best regards,<br></div><div>Daniel<br></div><div><div><br></div></div> </blockquote></div></div> --000000000000592a1a0614faa411--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58TsNkfNw%2BkreVai%2Btn7kgNdm6X7_r5aWfzhunDMOvaV2Q>