commit: 5eed156da5c7cb4fd3c1bd99e4180b770b00a683
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 03:06:00 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 03:09:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eed156d
net-libs/libwebsockets: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
net-libs/libwebsockets/Manifest | 5 --
.../files/libwebsockets-2.1.1-x86-build.patch | 22 ------
.../libwebsockets-3.2.0-string_assignment.patch | 11 ---
net-libs/libwebsockets/libwebsockets-1.7.9.ebuild | 45 -------------
net-libs/libwebsockets/libwebsockets-2.0.2.ebuild | 45 -------------
net-libs/libwebsockets/libwebsockets-2.1.1.ebuild | 63 -----------------
net-libs/libwebsockets/libwebsockets-2.4.2.ebuild | 70 -------------------
net-libs/libwebsockets/libwebsockets-3.2.0.ebuild | 78 ----------------------
8 files changed, 339 deletions(-)
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index f06c54ce059..35312141b04 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,6 +1 @@
-DIST libwebsockets-1.7.9.tar.gz 2915358 BLAKE2B
07aad4ab716212924177aa76233d743d6258d261f6cccb286e478f51bfeac609284cf2e43004bd99c271786a7e30357895c8687c11e1c3d7589ed13dbce4fbe8
SHA512
d5bd6171d58b5d5439af48d6cc1e92623e9bf21e059a2d25d362ef81b1bff62e759fe265261dbee0ac4ceb0d0a2490dc1e030dfee2b36eb8ac74df112da1db56
-DIST libwebsockets-2.0.2.tar.gz 2998585 BLAKE2B
0eaf2301abf9a0e47bd865b6e653f3ea23f3b00d4c6da785a8bd871f3ca729dc43152cad10aeaa9a3cd360aeecd0be87e434102e91e0eeaa6b1865031310a362
SHA512
6cd0cfe14ab9aa2ce26624d41290ed3bd0ae4167e93d5db738883dbbe2db851bd75037929a417922c2ef78eae3ff00583134d42da575d961c777e4a1ad0fef4a
-DIST libwebsockets-2.1.1.tar.gz 3769593 BLAKE2B
8d3aaa0a844925fb927fffaf0d11ba1bdbd013db8a680ce4b85cd5d951219598288fa0f2b97ec22bc00ef879586cb5c2c076b774f3411cb6d8ca553e66fb90e2
SHA512
429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683
-DIST libwebsockets-2.4.2.tar.gz 3777160 BLAKE2B
6aedc0d340e9e03745309cd1a9674b6c7e84ebdbd5232a265c7a4e0deb612665982353c3ba973b58a835b1747448d415a3625ed044973212b5a897b221d73106
SHA512
7bee49f6763ff3ab7861fcda25af8d80f6757c56e197ea42be53e0b2480969eee73de3aee5198f5ff06fd1cb8ab2be4c6495243e83cd0acc235b0da83b2353d1
-DIST libwebsockets-3.2.0.tar.gz 9848976 BLAKE2B
3ad82281c854ad6ca4183f104a0d0eaa6f6e6e6084e3a98b29d8425d335f02a2d3e4f7e7a1b350e87d4ff975c44a5ed6635e3166219d9294bbf5a56ed1357e75
SHA512
afc1c9e259d6d48000b09da111af4129680d50474cdfedbad197ee22260d57a837b67cc6a3f8e6b1aa7ce7dc5d3fd900569783631540501709868125c6d1e4da
DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B
d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350
SHA512
a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
diff --git a/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch
b/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch
deleted file mode 100644
index 9fe9489297f..00000000000
--- a/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f9f5a5760782b68fba190fb46d306f7c08f027c0 Mon Sep 17 00:00:00 2001
-From: Silas Parker <skyhisi@users.github.invalid>
-Date: Tue, 14 Feb 2017 17:55:13 +0800
-Subject: [PATCH] gcc-format-strings: ipv6
-
----
- lib/libwebsockets.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
-index 770cb24..8ee906a 100755
---- a/lib/libwebsockets.c
-+++ b/lib/libwebsockets.c
-@@ -670,7 +670,7 @@ lws_get_addresses(struct lws_vhost *vh, void *ads, char
*name,
- #ifdef LWS_USE_IPV6
- if (LWS_IPV6_ENABLED(vh)) {
- if (!lws_plat_inet_ntop(AF_INET6, &((struct sockaddr_in6
*)ads)->sin6_addr, rip, rip_len)) {
-- lwsl_err("inet_ntop", strerror(LWS_ERRNO));
-+ lwsl_err("inet_ntop: %s", strerror(LWS_ERRNO));
- return -1;
- }
-
diff --git
a/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch
b/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch
deleted file mode 100644
index 86010aafd61..00000000000
--- a/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwebsockets-3.2.0.o/lib/roles/http/client/client.c 2019-08-14
10:22:50.000000000 +0200
-+++ libwebsockets-3.2.0/lib/roles/http/client/client.c 2019-11-07
19:59:52.959534874 +0200
-@@ -214,7 +214,7 @@
- lwsl_client("SOCKS password OK, sending connect\n");
- if (socks_generate_msg(wsi, SOCKS_MSG_CONNECT, &len)) {
- socks_send_msg_fail:
-- *cce = "socks gen msg fail";
-+ cce = "socks gen msg fail";
- goto bail3;
- }
- conn_mode = LRS_WAITING_SOCKS_CONNECT_REPLY;
diff --git a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
b/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
deleted file mode 100644
index b9bba7e9a99..00000000000
--- a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="canonical libwebsockets.org websocket library"
-HOMEPAGE="https://libwebsockets.org/";
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs"
-
-RDEPEND="
- sys-libs/zlib
- libev? ( dev-libs/libev )
- libuv? ( dev-libs/libuv )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-src_configure() {
- local mycmakeargs=(
- -DLWS_IPV6=$(usex ipv6 ON OFF)
- -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
- -DLWS_WITH_HTTP2=$(usex http2 ON OFF)
- -DLWS_WITH_STATIC=$(usex static-libs ON OFF)
- -DLWS_WITH_LIBEV=$(usex libev ON OFF)
- -DLWS_WITH_LIBUV=$(usex libuv ON OFF)
- -DLWS_WITH_SSL=$(usex ssl ON OFF)
- -DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
- -DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
b/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
deleted file mode 100644
index b9bba7e9a99..00000000000
--- a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="canonical libwebsockets.org websocket library"
-HOMEPAGE="https://libwebsockets.org/";
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs"
-
-RDEPEND="
- sys-libs/zlib
- libev? ( dev-libs/libev )
- libuv? ( dev-libs/libuv )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-src_configure() {
- local mycmakeargs=(
- -DLWS_IPV6=$(usex ipv6 ON OFF)
- -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
- -DLWS_WITH_HTTP2=$(usex http2 ON OFF)
- -DLWS_WITH_STATIC=$(usex static-libs ON OFF)
- -DLWS_WITH_LIBEV=$(usex libev ON OFF)
- -DLWS_WITH_LIBUV=$(usex libuv ON OFF)
- -DLWS_WITH_SSL=$(usex ssl ON OFF)
- -DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
- -DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
deleted file mode 100644
index 3dcea8a7346..00000000000
--- a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="canonical libwebsockets.org websocket library"
-HOMEPAGE="https://libwebsockets.org/";
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm x86"
-IUSE="+http2 +ssl access-log cgi client generic-sessions http-proxy ipv6 lejp
libev libressl libuv server-status smtp sqlite3 static-libs"
-
-REQUIRED_USE="
- http-proxy? ( client )
- generic-sessions? ( sqlite3 )
- generic-sessions? ( smtp )
- smtp? ( libuv )
-"
-
-RDEPEND="
- sys-libs/zlib
- http-proxy? ( net-libs/libhubbub )
- libev? ( dev-libs/libev )
- libuv? ( dev-libs/libuv )
- sqlite3? ( dev-db/sqlite )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-PATCHES=( "${FILESDIR}/${P}-x86-build.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DLWS_IPV6=$(usex ipv6 ON OFF)
- -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
- -DLWS_WITH_HTTP2=$(usex http2 ON OFF)
- -DLWS_WITH_STATIC=$(usex static-libs ON OFF)
- -DLWS_WITH_LIBEV=$(usex libev ON OFF)
- -DLWS_WITH_LIBUV=$(usex libuv ON OFF)
- -DLWS_WITH_SSL=$(usex ssl ON OFF)
- -DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
- -DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
- -DLWS_WITH_CGI=$(usex cgi ON OFF)
- -DLWS_WITH_HTTP_PROXY=$(usex http-proxy ON OFF)
- -DLWS_WITH_ACCESS_LOG=$(usex access-log ON OFF)
- -DLWS_WITH_SERVER_STATUS=$(usex server-status ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
- -DLWS_WITH_LEJP=$(usex lejp ON OFF)
- -DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions ON OFF)
- -DLWS_WITH_SQLITE3=$(usex sqlite3 ON OFF)
- -DLWS_WITH_SMTP=$(usex smtp ON OFF)
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
b/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
deleted file mode 100644
index 38798f5926c..00000000000
--- a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="canonical libwebsockets.org websocket library"
-HOMEPAGE="https://libwebsockets.org/";
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+http2 +ssl access-log caps cgi client generic-sessions http-proxy ipv6
lejp libev
- libevent libressl libuv peer-limits server-status socks5 smtp sqlite3
static-libs +zip"
-
-REQUIRED_USE="
- http-proxy? ( client )
- generic-sessions? ( sqlite3 )
- generic-sessions? ( smtp )
- smtp? ( libuv )
-"
-
-RDEPEND="
- sys-libs/zlib
- http-proxy? ( net-libs/libhubbub )
- caps? ( sys-libs/libcap )
- libev? ( dev-libs/libev )
- libevent? ( dev-libs/libevent )
- libuv? ( dev-libs/libuv )
- sqlite3? ( dev-db/sqlite )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-src_configure() {
- local mycmakeargs=(
- -DLWS_IPV6=$(usex ipv6 ON OFF)
- -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
- -DLWS_WITH_HTTP2=$(usex http2 ON OFF)
- -DLWS_WITH_STATIC=$(usex static-libs ON OFF)
- -DLWS_HAVE_LIBCAP=$(usex caps ON OFF)
- -DLWS_WITH_LIBEV=$(usex libev ON OFF)
- -DLWS_WITH_LIBEVENT=$(usex libevent ON OFF)
- -DLWS_WITH_LIBUV=$(usex libuv ON OFF)
- -DLWS_WITH_PEER_LIMITS=$(usex peer-limits ON OFF)
- -DLWS_WITH_SSL=$(usex ssl ON OFF)
- -DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
- -DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
- -DLWS_WITH_CGI=$(usex cgi ON OFF)
- -DLWS_WITH_HTTP_PROXY=$(usex http-proxy ON OFF)
- -DLWS_WITH_ACCESS_LOG=$(usex access-log ON OFF)
- -DLWS_WITH_SERVER_STATUS=$(usex server-status ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
- -DLWS_WITH_LEJP=$(usex lejp ON OFF)
- -DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions ON OFF)
- -DLWS_WITH_SQLITE3=$(usex sqlite3 ON OFF)
- -DLWS_WITH_SMTP=$(usex smtp ON OFF)
- -DLWS_WITH_SOCKS5=$(usex socks5 ON OFF)
- -DLWS_WITH_ZIP_FOPS=$(usex zip ON OFF)
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild
b/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild
deleted file mode 100644
index 587991e9177..00000000000
--- a/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A flexible pure-C library for implementing network protocols"
-HOMEPAGE="https://libwebsockets.org/";
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
- lejp libev libevent libressl libuv peer-limits server-status smtp socks5
- sqlite3 ssl static-libs threads zip"
-
-REQUIRED_USE="
- generic-sessions? ( smtp sqlite3 )
- http-proxy? ( client )
- smtp? ( libuv )
- ?? ( libev libevent )
-"
-
-RDEPEND="
- sys-libs/zlib
- caps? ( sys-libs/libcap )
- http-proxy? ( net-libs/libhubbub )
- libev? ( dev-libs/libev )
- libevent? ( dev-libs/libevent:= )
- libuv? ( dev-libs/libuv:= )
- sqlite3? ( dev-db/sqlite:= )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-PATCHES=(
- "${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
- "${FILESDIR}/libwebsockets-3.2.0-string_assignment.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
- -DLWS_HAVE_LIBCAP=$(usex caps)
- -DLWS_IPV6=$(usex ipv6)
- -DLWS_ROLE_DBUS=$(usex dbus)
- -DLWS_WITHOUT_CLIENT=$(usex !client)
- -DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
- -DLWS_WITH_ACCESS_LOG=$(usex access-log)
- -DLWS_WITH_CGI=$(usex cgi)
- -DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
- -DLWS_WITH_HTTP2=$(usex http2)
- -DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
- -DLWS_WITH_HUBBUB=$(usex http-proxy)
- -DLWS_WITH_LEJP=$(usex lejp)
- -DLWS_WITH_LIBEV=$(usex libev)
- -DLWS_WITH_LIBEVENT=$(usex libevent)
- -DLWS_WITH_LIBUV=$(usex libuv)
- -DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
- -DLWS_WITH_SERVER_STATUS=$(usex server-status)
- -DLWS_WITH_SMTP=$(usex smtp)
- -DLWS_WITH_SOCKS5=$(usex socks5)
- -DLWS_WITH_SQLITE3=$(usex sqlite3)
- -DLWS_WITH_SSL=$(usex ssl)
- -DLWS_WITH_STATIC=$(usex static-libs)
- -DLWS_WITH_THREADPOOL=$(usex threads)
- -DLWS_WITH_ZIP_FOPS=$(usex zip)
- -DLWS_WITHOUT_TESTAPPS=ON
- )
-
- cmake_src_configure
-}
