Updated patch with todays release.
Aisha
On 9/5/20 11:08 AM, Aisha Tammy wrote:
> Weekly bump.
> Would like to get this into 6.8.
>
> Aisha
>
>
> On 8/29/20 4:34 PM, Aisha Tammy wrote:
>> And another one.
>>
>> Aisha
>>
>>
>> -------- Forwarded Message --------
>> Subject: Fwd: UPDATE: usockets, uwebsockets
>> Date: Fri, 21 Aug 2020 08:24:54 -0400
>> From: Aisha Tammy <openbsd.po...@aisha.cc>
>> To: ports@openbsd.org <ports@openbsd.org>
>>
>> Another bump
>>
>> Aisha
>>
>>
>> -------- Forwarded Message --------
>> Subject: Re: UPDATE: usockets, uwebsockets
>> Date: Fri, 14 Aug 2020 10:32:23 -0400
>> From: Aisha Tammy <openbsd.po...@aisha.cc>
>> To: ports@openbsd.org
>>
>> On 7/30/20 6:50 AM, Aisha Tammy wrote:
>>> Hi,
>>> I am reattaching update because of a recent release
>>>
>>> usockets 0.4.1 -> 0.5.0
>>> uwebsockets 18.6.0 -> 18.10.0
>>>
>>> Aisha
>>>
>>
>> Newer update patch attached
>>
>> usockets 0.4.1 -> 0.5.0
>> uwebsockets 18.6.0 -> 18.11.0
>>
>> Thanks,
>> Aisha
>>
>>
>
diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index 7e544a0459a..f781ecdcda4 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -4,11 +4,11 @@ COMMENT = eventing, networking & crypto for async applications
PKGNAME = ${DISTNAME:L}
CATEGORIES = net
-SHARED_LIBS = usockets 0.1
+SHARED_LIBS = usockets 1.0
GH_ACCOUNT = uNetworking
GH_PROJECT = uSockets
-GH_TAGNAME = v0.4.1
+GH_TAGNAME = v0.5.0
MAINTAINER = Aisha Tammy <open...@aisha.cc>
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index d2274543c1d..5837a7f2434 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uSockets-0.4.1.tar.gz) = IPj38LIjXztH8e/zyRgZIAA/HLyN9hcg2rpsui0Toa4=
-SIZE (uSockets-0.4.1.tar.gz) = 49955
+SHA256 (uSockets-0.5.0.tar.gz) = y6wQ2b+maGIk2LDsG8wO56LYpThy73Teoq7V0NjWedw=
+SIZE (uSockets-0.5.0.tar.gz) = 50852
diff --git a/net/usockets/patches/patch-Makefile b/net/usockets/patches/patch-Makefile
index 1a54aa5a606..af77b0b1b19 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -10,7 +10,7 @@ Index: Makefile
+DESTDIR ?=
+
+prefix ?= "/usr/local"
-+exec_prefix ?= "$(prefix)"
++exec_prefix ?= "$(prefix)"
+libdir ?= "$(exec_prefix)/lib"
+includedir?= "$(exec_prefix)/include/uSockets"
+
@@ -18,31 +18,24 @@ Index: Makefile
+LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
+
+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
ifeq ($(WITH_OPENSSL),1)
override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,18 +44,38 @@ ifeq ($(WITH_ASAN),1)
+@@ -33,18 +44,32 @@ ifeq ($(WITH_ASAN),1)
endif
override CFLAGS += -std=c11 -Isrc
-override LDFLAGS += uSockets.a
-# By default we build the uSockets.a static library
--default:
-+static:
+ default:
rm -f *.o
- $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
- $(AR) rvs uSockets.a *.o
-+ $(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
-+ $(AR) rvs libusockets.a *.o
-
-+dynamic:
-+ rm -f *.o
+ $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS)
++ $(AR) rvs libusockets.a *.o
+ $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) *.o $(LDFLAGS)
-+
-+default: static dynamic
-+
+
+install:
+ # install the folders needed (making sure that the exist)
+ install -d "$(DESTDIR)$(libdir)" \
@@ -66,7 +59,7 @@ Index: Makefile
swift_examples:
swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server
-@@ -52,4 +83,5 @@ swift_examples:
+@@ -52,4 +77,5 @@ swift_examples:
clean:
rm -f *.o
rm -f *.a
diff --git a/www/uwebsockets/Makefile b/www/uwebsockets/Makefile
index eff11b90171..c4085298279 100644
--- a/www/uwebsockets/Makefile
+++ b/www/uwebsockets/Makefile
@@ -6,7 +6,7 @@ CATEGORIES = www
GH_ACCOUNT = uNetworking
GH_PROJECT = uWebSockets
-GH_TAGNAME = v18.6.0
+GH_TAGNAME = v18.13.0
MAINTAINER = Aisha Tammy <open...@aisha.cc>
diff --git a/www/uwebsockets/distinfo b/www/uwebsockets/distinfo
index 9b39396f50c..74f77a0d285 100644
--- a/www/uwebsockets/distinfo
+++ b/www/uwebsockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uWebSockets-18.6.0.tar.gz) = XwrkPmmqPFj8OgV/c4ESuOSn0h3wP5C7C0nGkN15npo=
-SIZE (uWebSockets-18.6.0.tar.gz) = 264309
+SHA256 (uWebSockets-18.13.0.tar.gz) = FpfJml/99xSoLNvhBUlC3HxB5LqyhdmX/c7a0UFRVqQ=
+SIZE (uWebSockets-18.13.0.tar.gz) = 270125
