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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Thu, Feb 22, 2024 at 1:29 AM 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=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 > > -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>; > 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) = a16816e7c651f4e7d959945637bce8012a9b2f7aaf41c6ad27c39f4f75769b8f > -SIZE (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? > 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 > > [-- Attachment #2 --] <div dir="ltr"><div dir="ltr">On Thu, Feb 22, 2024 at 1:29 AM Daniel Engberg <<a href="mailto:daniel.engberg.lists@pyret.net" target="_blank">daniel.engberg.lists@pyret.net</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div>On 2024-02-21T16:19:48.000+01:00, Po-Chuan Hsieh <sunpoet@FreeBSD.org> wrote:<br></div><div><blockquote><pre style="white-space:normal"><div>The branch main has been updated by sunpoet:<br></div><div><br></div><div>URL: <a rel="noopener noreferrer" href="https://cgit.FreeBSD.org/ports/commit/?id=3a3b0e9e12efe4f7e860ded96962cb5681305202" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=3a3b0e9e12efe4f7e860ded96962cb5681305202</a><br></div><div><br></div><div>commit 3a3b0e9e12efe4f7e860ded96962cb5681305202<br></div><div>Author: Po-Chuan Hsieh <<a href="mailto:sunpoet@FreeBSD.org" target="_blank">sunpoet@FreeBSD.org</a>><br></div><div>AuthorDate: 2024-02-21 14:28:31 +0000<br></div><div>Commit: Po-Chuan Hsieh <<a href="mailto:sunpoet@FreeBSD.org" target="_blank">sunpoet@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></div><div> <br></div><div> Changes: <a rel="noopener noreferrer" href="https://github.com/wolfSSL/wolfssh/releases" target="_blank">https://github.com/wolfSSL/wolfssh/releases</a><br></div><div>---<br></div><div>; security/wolfssh/Makefile | 13 ++++++-------<br></div><div> security/wolfssh/distinfo | 6 +++---<br></div><div> security/wolfssh/files/patch-SIGWINCH | 21 +++++++++++++++++++++<br></div><div> 3 files changed, 30 insertions(+), 10 deletions(-)<br></div><div><br></div><div>diff --git a/security/wolfssh/Makefile b/security/wolfssh/Makefile<br></div><div>index 77dd5d2cdc01..bf995ce37aec 100644<br></div><div>--- a/security/wolfssh/Makefile<br></div><div>+++ b/security/wolfssh/Makefile<br></div><div>@@ -1,5 +1,5 @@<br></div><div> PORTNAME= wolfssh<br></div><div>-DISTVERSION= 1.4.15<br></div><div>+PORTVERSION= 1.4.15<br></div><div> CATEGORIES= security<br></div><div> MASTER_SITES= <a rel="noopener noreferrer" href="https://www.wolfssl.com/" target="_blank">https://www.wolfssl.com/</a><br></div><div>; <br></div><div>@@ -12,12 +12,7 @@ LICENSE= GPLv3<br></div><div> <br></div><div> LIB_DEPENDS= <a rel="noopener noreferrer" href="http://libwolfssl.so:security/wolfssl" target="_blank">libwolfssl.so:security/wolfssl</a><br></div><div> <br></div><div>-USES= libtool localbase zip<br></div><div>-USE_LDCONFIG= yes<br></div><div>-<br></div><div>-GNU_CONFIGURE= yes<br></div><div>-<br></div><div>-INSTALL_TARGET= install-strip<br></div><div>+USES= libtool localbase<br></div><div> <br></div><div> CONFIGURE_ARGS= --disable-examples \<br></div><div> --enable-fwd \<br></div><div>@@ -27,5 +22,9 @@ CONFIGURE_ARGS= --disable-examples \<br></div><div> --enable-shared=yes \<br></div><div> --enable-shell \<br></div><div> --enable-static=yes<br></div><div>+GNU_CONFIGURE= yes<br></div><div>+INSTALL_TARGET= install-strip<br></div><div>+TEST_TARGET= check<br></div><div>+USE_LDCONFIG= yes<br></div><div> <br></div><div> .include <<a rel="noopener noreferrer">bsd.port.mk></a>;<br></div><div>diff --git a/security/wolfssh/distinfo b/security/wolfssh/distinfo<br></div><div>index ef1ffbefc3d6..338a09e8a1a3 100644<br></div><div>--- a/security/wolfssh/distinfo<br></div><div>+++ b/security/wolfssh/distinfo<br></div><div>@@ -1,3 +1,3 @@<br></div><div>-TIMESTAMP = 1707686084<br></div><div>-SHA256 (<a rel="noopener noreferrer" href="http://wolfssh-1.4.15.zip" target="_blank">wolfssh-1.4.15.zip</a>) = a16816e7c651f4e7d959945637bce8012a9b2f7aaf41c6ad27c39f4f75769b8f<br></div><div>-SIZE (<a rel="noopener noreferrer" href="http://wolfssh-1.4.15.zip" target="_blank">wolfssh-1.4.15.zip</a>) = 960475<br></div><div>+TIMESTAMP = 1708448958<br></div><div>+SHA256 (wolfssh-1.4.15.tar.gz) = d6fb396b671afa14e15a8c092f0f453471c4f0b42bb83106ca6cab274bd82b2d<br></div><div>+SIZE (wolfssh-1.4.15.tar.gz) = 840402<br></div><div>diff --git a/security/wolfssh/files/patch-SIGWINCH b/security/wolfssh/files/patch-SIGWINCH<br></div><div>new file mode 100644<br></div><div>index 000000000000..f397f4db6529<br></div><div>--- /dev/null<br></div><div>+++ b/security/wolfssh/files/patch-SIGWINCH<br></div><div>@@ -0,0 +1,21 @@<br></div><div>+--- apps/wolfssh/wolfssh.c.orig 2023-12-23 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>+ #include <sys/param.h><br></div><div>++#include <sys/signal.h><br></div><div>+ #include <libgen.h><br></div><div>+ <br></div><div>+ #ifdef WOLFSSH_SHELL<br></div><div>+--- examples/client/client.c.orig 2023-12-23 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><div>+ #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>Regarding 'make test', it was done elsewhere to check the built binary is OK.<br></div><div>As you can see, examples/client/client.c is patched in patch-SIGWINCH to build the binary for testing.</div><div>I've cleaned up the Makefile (previously used for local testing) and committed in ports 5e391da971e223b30fd18c2d9c5105385c653025.</div><div><br></div><blockquote class="gmail_quote" style="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="https://www.wolfssl.com/download/" rel="noopener noreferrer" target="_blank">https://www.wolfssl.com/download/</a>; links to the zip archive<br></div></blockquote><div><br></div><div>I've checked the content. Both tarballs are identical.</div><div>And .tar.gz is smaller than .zip.</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div></div><div><br></div><div><br></div><div>Use of PORTVERSION is discouraged over DISTVERSION except in specific scenarios, see Porters Handbook:<br></div><div><br></div><div><a href="https://docs.freebsd.org/en/books/porters-handbook/book/#porting-makefile" rel="noopener noreferrer" target="_blank">https://docs.freebsd.org/en/books/porters-handbook/book/#porting-makefile</a><br></div><div><a href="https://docs.freebsd.org/en/books/porters-handbook/book/#porting-pkgname" rel="noopener noreferrer" target="_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>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58TsNkfNw%2BkreVai%2Btn7kgNdm6X7_r5aWfzhunDMOvaV2Q>