On Mon, Nov 27, 2017 at 05:11:28PM +0100, Rafael Sadowski wrote:
> On Sat Nov 25, 2017 at 10:28:25PM +0100, Adam Wolk wrote:
> > On Sat, Nov 25, 2017 at 10:19:32PM +0100, Adam Wolk wrote:
> > > Hi ports@
> > >
> > > bump for libwebsockets attached.
> > >
> > > Port changes:
> > > - LWS_WITHOUT_TEST_SERVER added and removing ssh
> > > test keys in post-install. This is needed to prevent
> > > the keys from being generated and installed. The
> > > issue has been reported upstream with a patch, the
> > > changes here are a workaround as I don't want to
> > > create the patches folder just for that reason.
> > >
> > > https://github.com/warmcat/libwebsockets/issues/1108
> > > https://github.com/warmcat/libwebsockets/pull/1109
> > >
> > > - regenerated PLIST
> > > - bump SO
> > >
> > > Upstream changelog:
> > > https://github.com/warmcat/libwebsockets/blob/v2.4-stable/changelog
> > >
> > > tested on a -current amd64 snapshot compiled against a
> > > closed source koparo.com product.
> > >
> > > Any feedback, OKs?
> > >
> > > Regards,
> > > Adam
> >
> > Right after sending the above I noticed there was a 2.4.1.
> > Here's a bumped diff for that patch release.
> >
>
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/www/libwebsockets/Makefile,v
> > retrieving revision 1.14
> > diff -u -p -r1.14 Makefile
> > --- Makefile 13 Sep 2017 09:04:43 -0000 1.14
> > +++ Makefile 25 Nov 2017 21:27:14 -0000
> > @@ -4,10 +4,10 @@ COMMENT = lightweight C library for fas
> >
> > GH_ACCOUNT = warmcat
> > GH_PROJECT = libwebsockets
> > -V = 2.3.0
> > +V = 2.4.1
> > GH_TAGNAME = v$V
>
> $V makes no sense to me
>
good catch, updated diff with $V gone.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/libwebsockets/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 13 Sep 2017 09:04:43 -0000 1.14
+++ Makefile 28 Nov 2017 20:17:27 -0000
@@ -4,10 +4,9 @@ COMMENT = lightweight C library for fas
GH_ACCOUNT = warmcat
GH_PROJECT = libwebsockets
-V = 2.3.0
-GH_TAGNAME = v$V
+GH_TAGNAME = v2.4.1
-SHARED_LIBS = websockets 8.0 # 11
+SHARED_LIBS = websockets 9.0 # 12
CATEGORIES = www
@@ -22,8 +21,12 @@ WANTLIB += crypto m ssl z
MODULES = devel/cmake
-CONFIGURE_ARGS += -DLWS_WITHOUT_TESTAPPS=ON
+CONFIGURE_ARGS += -DLWS_WITHOUT_TESTAPPS=ON \
+ -DLWS_WITHOUT_TEST_SERVER=ON
NO_TEST = Yes
+
+post-install:
+ @rm -r ${WRKINST}/usr/local/share/libwebsockets-test-server
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/libwebsockets/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 13 Sep 2017 09:04:43 -0000 1.12
+++ distinfo 28 Nov 2017 20:17:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (libwebsockets-2.3.0.tar.gz) =
8IqCM8oYN2QLcrF5DM50HOSw/qqmtAj+KKMDy/BAj6E=
-SIZE (libwebsockets-2.3.0.tar.gz) = 3598002
+SHA256 (libwebsockets-2.4.1.tar.gz) =
KUFL5PefarwOaq3M0JpNoPDEMeO1aR9Jas0IGuaoJAw=
+SIZE (libwebsockets-2.4.1.tar.gz) = 3773741
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/libwebsockets/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 13 Sep 2017 09:04:43 -0000 1.2
+++ pkg/PLIST 28 Nov 2017 20:17:27 -0000
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2017/09/13 09:04:43 awolk Exp $
+@comment $OpenBSD$
include/libwebsockets.h
+include/lws-plugin-ssh.h
include/lws_config.h
lib/cmake/
lib/cmake/libwebsockets/
