Skip to content

Commit

Permalink
core/libwebsockets: fix build on 32bit [align w/ Alpine]
Browse files Browse the repository at this point in the history
[ commit 0a09bc3f16e0a965c963d90011b4088237b01942 ]

ref: warmcat/libwebsockets#2907
upstream: warmcat/libwebsockets@f9d1f25

We already have this patch, here we align our version with Alpine.
  • Loading branch information
ncopa authored and konfetka1989 committed Oct 20, 2023
1 parent cacfc08 commit 45d1a0c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions core/libwebsockets/APKBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-test:_test $pkgname-evlib_uv:_ev
source="
libwebsockets-$pkgver.tar.gz::https://github.com/warmcat/libwebsockets/archive/v$pkgver.tar.gz
fix-version-string.patch
0100-openssl-server-enum-vs-int-disagreement.patch
openssl-server-enum-vs-int-disagreement.patch
"

build() {
Expand Down Expand Up @@ -60,5 +60,5 @@ _evlib() {
sha512sums="
68d18574dea0563fa4f080c5d0d1cfe21a115bffdb17c6190f6741998f1e5db0739e252ef344ffe6fa4bd6781372456b240539471dd2aa900e43759e0f2d42ad libwebsockets-4.3.2.tar.gz
9325b7cadeb2ca8fb20b4759feb49fb255b1b14c432b7c8c3a1b793a49266bb4f69b78a9c72656039e94ba4fc59ca2c5e821ba33e4f133e72cab26786feb9d60 fix-version-string.patch
12702f5ad7219be39f1b82ab32bcbf72b9f964bcd57cca6ba1416f48f83d57ebd0c41f59a5c5b6c3936d6df03924a5651e43f3c5a029a274d65fdced4444f67b 0100-openssl-server-enum-vs-int-disagreement.patch
2148f01f10292357103c7b53ec5d7e966ecc204a70acae39b5e61a1649e15d76211ce6d9d3b2c923f2c53f74a7cb016de933f787e7149abf13c028e11d616fa4 openssl-server-enum-vs-int-disagreement.patch
"
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ https://github.com/warmcat/libwebsockets/issues/2907
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tls/openssl/openssl-server.c b/lib/tls/openssl/openssl-server.c
index f2e77324..1fc81929 100644
index f2e77324f..1fc819293 100644
--- a/lib/tls/openssl/openssl-server.c
+++ b/lib/tls/openssl/openssl-server.c
@@ -699,14 +699,14 @@ lws_tls_server_new_nonblocking(struct lws *wsi, lws_sockfd_type accept_fd)
Expand All @@ -29,6 +29,3 @@ index f2e77324..1fc81929 100644
}

enum lws_ssl_capable_status
--
2.41.0

0 comments on commit 45d1a0c

Please sign in to comment.