Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libwebsocket: fix compile with mbedtls and update to 4.3.3 #24071

Merged
merged 2 commits into from
May 15, 2024
Merged

libwebsocket: fix compile with mbedtls and update to 4.3.3 #24071

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7157d5a
Libwebsockets: update version to 4.3.3
orangepizza May 3, 2024
be18b37
Libwebsockets: temp fix for mbedtls 3.6+
orangepizza May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions libs/libwebsockets/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=libwebsockets
PKG_VERSION:=4.3.2
PKG_RELEASE:=3
PKG_VERSION:=4.3.3
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1
PKG_HASH:=6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90

PKG_SOURCE_VERSION:=v$(PKG_VERSION)

Expand Down Expand Up @@ -61,7 +61,7 @@ endef
define Package/libwebsockets-mbedtls
$(call Package/$(PKG_NAME)/Default)
TITLE += (mbedTLS)
DEPENDS += +libmbedtls
DEPENDS += +libmbedtls @MBEDTLS_VERSION_C
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably activate this option in the main repository by default. Could you create a PR for that too please.

VARIANT:=mbedtls
PROVIDES:=libwebsockets
CONFLICTS:=libwebsockets-openssl
Expand Down
26 changes: 0 additions & 26 deletions libs/libwebsockets/patches/010-fix-enum-int-mismatch-openssl.patch
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions libs/libwebsockets/patches/011-fix-enum-int-mismatch-mbedtls.patch
View file
Open in desktop

This file was deleted.