package/libwebsock: remove package
The upstream Github repository payden/libwebsock is no longer available, and its URL now redirects to some completely unrelated software. We don't know for sure what happened, but at least the package does not build anymore, because its source code has vanished. Since no other buildroot package depends on libwebsock, and it hasn't received any update; let's simply remove it from here. Signed-off-by: Titouan Christophe <titouan.christophe@mind.be> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Titouan Christophe
committed by
Julien Olivain
Julien Olivain
parent
fba60c7732
commit
9f2dbf1486
@@ -719,9 +719,6 @@ package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch lib_patch.Upstrea
|
||||
package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch lib_patch.Upstream
|
||||
package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch lib_patch.Upstream
|
||||
package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch lib_patch.Upstream
|
||||
package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch lib_patch.Upstream
|
||||
package/libwebsock/0002-fix-ssl.patch lib_patch.Upstream
|
||||
package/libwebsock/0003-fix-incorrect-inline.patch lib_patch.Upstream
|
||||
package/libyuv/0001-i386-sse2.patch lib_patch.Upstream
|
||||
package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch lib_patch.Upstream
|
||||
package/lighttpd/S50lighttpd Shellcheck lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables
|
||||
|
||||
@@ -146,6 +146,13 @@ endif
|
||||
|
||||
comment "Legacy options removed in 2025.08"
|
||||
|
||||
config BR2_PACKAGE_LIBWEBSOCK
|
||||
bool "libwebsock has been removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
The upstream Github repository payden/libwebsock is no
|
||||
longer available, and has been removed from Buildroot.
|
||||
|
||||
config BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX
|
||||
bool "EDK2 Socionext DeveloperBox support has been removed"
|
||||
select BR2_LEGACY
|
||||
|
||||
@@ -1345,7 +1345,6 @@ F: package/gengetopt/
|
||||
F: package/janus-gateway/
|
||||
F: package/libnice/
|
||||
F: package/libsrtp/
|
||||
F: package/libwebsock/
|
||||
F: package/sofia-sip/
|
||||
|
||||
N: Grzegorz Blach <grzegorz@blach.pl>
|
||||
|
||||
@@ -2117,7 +2117,6 @@ menu "Networking"
|
||||
source "package/libutp/Config.in"
|
||||
source "package/libuwsc/Config.in"
|
||||
source "package/libvncserver/Config.in"
|
||||
source "package/libwebsock/Config.in"
|
||||
source "package/libwebsockets/Config.in"
|
||||
source "package/libyang/Config.in"
|
||||
source "package/libzenoh-c/Config.in"
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
From a6c35dbab5a2a75c176e031122ee64152e50e5d3 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 1 Jan 2015 12:23:43 +0100
|
||||
Subject: [PATCH] Switch to use pkg-config to detect libevent and openssl
|
||||
|
||||
Switching to pkg-config fixes a number of problems when detecting the
|
||||
libraries. For example the detection of libpthread was failing,
|
||||
because libevent_threads was added to LIBS before libevent itself,
|
||||
causing the libpthread test to fail due to missing symbols. pkg-config
|
||||
is anyway nowadays the preferred way for detecting libraries. It also
|
||||
has the benefit of working properly in static library situations.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
configure.ac | 36 ++++++++++++------------------------
|
||||
1 file changed, 12 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d4109ce..fc1cadc 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -27,35 +27,20 @@ AC_FUNC_MALLOC
|
||||
AC_FUNC_REALLOC
|
||||
AC_CHECK_FUNCS([memset socket strstr])
|
||||
|
||||
-AC_CHECK_HEADERS([event2/thread.h], [
|
||||
- LIBS="-levent_pthreads ${LIBS}"
|
||||
- ], [
|
||||
- echo "libevent_pthreads required, failing"
|
||||
- exit -1
|
||||
- ])
|
||||
-AC_CHECK_LIB(pthread, pthread_create, [LIBS="-lpthread ${LIBS}"], [
|
||||
+AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIBS="-lpthread"], [
|
||||
echo "pthreads required, failing"
|
||||
exit -1
|
||||
])
|
||||
-AC_CHECK_LIB(event, event_base_dispatch, [], [
|
||||
- echo "libevent required, failing"
|
||||
- exit -1
|
||||
- ])
|
||||
+
|
||||
+PKG_CHECK_MODULES([EVENT], [libevent])
|
||||
+PKG_CHECK_MODULES([EVENT_PTHREAD], [libevent_pthreads])
|
||||
|
||||
AS_IF([test "x$with_ssl" != "xno"],
|
||||
[
|
||||
- AC_CHECK_LIB([ssl], [SSL_CTX_new],
|
||||
- [
|
||||
- LIBS="-lssl ${LIBS}"
|
||||
- AC_CHECK_LIB([event_openssl], [bufferevent_openssl_socket_new], [
|
||||
- LIBS="-levent_openssl ${LIBS}"
|
||||
- have_ssl=yes
|
||||
- ], [have_ssl=no])
|
||||
- ],
|
||||
- [have_ssl=no])
|
||||
- ],
|
||||
- [have_ssl=no])
|
||||
-
|
||||
+ PKG_CHECK_MODULES([SSL], [openssl], [have_ssl=yes], [have_ssl=no])
|
||||
+ AS_IF([test "x${have_ssl}" = "xyes"],
|
||||
+ [PKG_CHECK_MODULES([EVENT_OPENSSL], [libevent_openssl], [have_ssl=yes], [have_ssl=no])])])
|
||||
+
|
||||
AS_IF([test "x$have_ssl" = "xyes"],
|
||||
[
|
||||
AC_DEFINE([WEBSOCK_HAVE_SSL], [1], [Define if building SSL support])
|
||||
@@ -63,8 +48,11 @@ AS_IF([test "x$have_ssl" = "xyes"],
|
||||
[AS_IF([test "x$with_ssl" = "xyes"],
|
||||
[AC_MSG_ERROR([SSL support requested but not found])
|
||||
])])
|
||||
-
|
||||
+
|
||||
AM_CONDITIONAL([HAVE_SSL], [test "x$have_ssl" = "xyes"])
|
||||
+
|
||||
+LIBS="${EVENT_LIBS} ${EVENT_PTHREAD_LIBS} ${PTHREAD_LIBS} ${SSL_LIBS} ${EVENT_OPENSSL_LIBS}"
|
||||
+
|
||||
AC_DEFINE_UNQUOTED([WEBSOCK_PACKAGE_VERSION], ["$PACKAGE_VERSION"], [libwebsock version])
|
||||
AC_DEFINE_UNQUOTED([WEBSOCK_PACKAGE_STRING], ["$PACKAGE_STRING"], [libwebsock package string])
|
||||
AC_DEFINE_UNQUOTED([WEBSOCK_PACKAGE_NAME], ["$PACKAGE_NAME"], [libwebsock package name])
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
config: fix SSL detection
|
||||
|
||||
The @WEBSOCK_HAVE_SSL@ is replaced at configure time with either a 1 or 0.
|
||||
The rest of the code is simply checking to see if WEBSOCK_HAVE_SSL is
|
||||
defined at all. Using a #undef WEBSOCK_HAVE_SSL will cause configure
|
||||
to either comment it out or change the line to
|
||||
"#define WEBSOCK_HAVE_SSL 1".
|
||||
|
||||
Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
|
||||
|
||||
diff -durN a/src/websock_config.h.in b/src/websock_config.h.in
|
||||
--- a/src/websock_config.h.in
|
||||
+++ b/src/websock_config.h.in
|
||||
@@ -4,6 +4,6 @@
|
||||
#define WEBSOCK_PACKAGE_STRING @WEBSOCK_PACKAGE_STRING@
|
||||
#define WEBSOCK_PACKAGE_VERSION @WEBSOCK_PACKAGE_VERSION@
|
||||
#define WEBSOCK_PACKAGE_NAME @WEBSOCK_PACKAGE_NAME@
|
||||
-#define WEBSOCK_HAVE_SSL @WEBSOCK_HAVE_SSL@
|
||||
+#undef WEBSOCK_HAVE_SSL
|
||||
|
||||
#endif
|
||||
@@ -1,66 +0,0 @@
|
||||
utf: do not define decode() to be inline
|
||||
|
||||
Currently, decode() is prototyped in utf.h, its body is in utf.c and it
|
||||
is called from util.c.
|
||||
|
||||
However, decode() is defined to be inline, which can not work since,
|
||||
when compiling util.c, the body of decode() is out-of-scope for that
|
||||
compilation unit.
|
||||
|
||||
Furthermore, decode() uses a utf8d, which is a static defined in utf.c .
|
||||
So utf8d is not visible when compiling util.c either.
|
||||
|
||||
This means that the definition of decode() along with utf8d is basically
|
||||
wrong, and is now failing with gcc-5.x, with warnings like so:
|
||||
|
||||
libtool: compile: /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gcc -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c utf.c -fPIC -DPIC -o .libs/libwebsock_la-utf.o
|
||||
utf.c:36:12: warning: ‘utf8d’ is static but used in inline function ‘decode’ which is not static
|
||||
*state = utf8d[256 + *state*16 + type];
|
||||
^
|
||||
utf.c:30:19: warning: ‘utf8d’ is static but used in inline function ‘decode’ which is not static
|
||||
uint32_t type = utf8d[byte];
|
||||
^
|
||||
libtool: compile: /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gcc -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c util.c -fPIC -DPIC -o .libs/libwebsock_la-util.o
|
||||
In file included from websock.h:73:0,
|
||||
from util.c:20:
|
||||
utf.h:25:17: warning: inline function ‘decode’ declared but never defined
|
||||
uint32_t inline decode(uint32_t *state, uint32_t *codep, uint32_t byte);
|
||||
^
|
||||
|
||||
This results in decode() to be omitted from libwebsock.so, and thus link
|
||||
failures when another program wants to link with -lwebsock.
|
||||
|
||||
The simplest solution is to not inline decode() at all.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
---
|
||||
Note: an alternative would be to move both decode() and utf8d into
|
||||
decode.h nad ditch decode.c if decode really must be inline. This is
|
||||
left as an execise for an interested party. But since upstream hasn't
|
||||
seen a single commit in more than a year now... :-(
|
||||
|
||||
diff -durN a/src/utf.c b/src/utf.c
|
||||
--- a/src/utf.c 2014-07-15 01:43:20.000000000 +0200
|
||||
+++ b/src/utf.c 2015-08-22 22:29:38.667393786 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8
|
||||
};
|
||||
|
||||
-uint32_t inline
|
||||
+uint32_t
|
||||
decode(uint32_t* state, uint32_t* codep, uint32_t byte)
|
||||
{
|
||||
uint32_t type = utf8d[byte];
|
||||
diff -durN a/src/utf.h b/src/utf.h
|
||||
--- a/src/utf.h 2014-07-15 01:43:20.000000000 +0200
|
||||
+++ b/src/utf.h 2015-08-22 22:29:10.439227396 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
-uint32_t inline decode(uint32_t *state, uint32_t *codep, uint32_t byte);
|
||||
+uint32_t decode(uint32_t *state, uint32_t *codep, uint32_t byte);
|
||||
|
||||
|
||||
#endif /* UTF_H_ */
|
||||
@@ -1,16 +0,0 @@
|
||||
config BR2_PACKAGE_LIBWEBSOCK
|
||||
bool "libwebsock"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_LIBEVENT
|
||||
help
|
||||
C library for easy WebSockets servers.
|
||||
|
||||
This library allows a developer to quickly develop WebSocket
|
||||
servers by focusing on the actual logic of your WebSocket
|
||||
implementation instead of the details of the WebSocket
|
||||
protocol or even specifics of C sockets.
|
||||
|
||||
https://github.com/payden/libwebsock
|
||||
|
||||
comment "libwebsock needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
@@ -1,3 +0,0 @@
|
||||
# Locally calculated
|
||||
sha256 34cf8376446e2371c9af47394043a30dc16af7ed5437d56bc6135c5dfda9ed22 libwebsock-3c1615eeadb0b582b63851073bfe3e5132f31ebc.tar.gz
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.lesser
|
||||
@@ -1,22 +0,0 @@
|
||||
################################################################################
|
||||
#
|
||||
# libwebsock
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBWEBSOCK_VERSION = 3c1615eeadb0b582b63851073bfe3e5132f31ebc
|
||||
LIBWEBSOCK_SITE = $(call github,payden,libwebsock,$(LIBWEBSOCK_VERSION))
|
||||
LIBWEBSOCK_DEPENDENCIES = libevent host-pkgconf
|
||||
LIBWEBSOCK_AUTORECONF = YES
|
||||
LIBWEBSOCK_INSTALL_STAGING = YES
|
||||
LIBWEBSOCK_LICENSE = LGPL-3.0
|
||||
LIBWEBSOCK_LICENSE_FILES = COPYING.lesser
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LIBWEBSOCK_DEPENDENCIES += openssl
|
||||
LIBWEBSOCK_CONF_OPTS += --with-ssl
|
||||
else
|
||||
LIBWEBSOCK_CONF_OPTS += --without-ssl
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user