* [meta-oe][PATCH 2/2] libwebsockets: update 2.1.0 -> 3.0.0
2018-05-13 12:28 [meta-oe][PATCH 1/2] libwebsockets: switch away from github archive Trevor Woerner
@ 2018-05-13 12:28 ` Trevor Woerner
0 siblings, 0 replies; 2+ messages in thread
From: Trevor Woerner @ 2018-05-13 12:28 UTC (permalink / raw)
To: openembedded-devel
The LICENSE checksum update was required because the LICENSE file added an
initial clause, and the locations of the third-party sources changed.
Here is a diff of the old and new licenses:
--- LICENSE.old 2018-05-11 14:36:05.053031281 -0400
+++ LICENSE.new 2018-05-11 14:35:40.364931066 -0400
@@ -1,7 +1,13 @@
Libwebsockets and included programs are provided under the terms of the GNU
Library General Public License (LGPL) 2.1, with the following exceptions:
-1) Static linking of programs with the libwebsockets library does not
+1) Any reference, whether in these modifications or in the GNU
+Library General Public License 2.1, to this License, these terms, the
+GNU Lesser Public License, GNU Library General Public License, LGPL, or
+any similar reference shall refer to the GNU Library General Public
+License 2.1 as modified by these paragraphs 1) through 4).
+
+2) Static linking of programs with the libwebsockets library does not
constitute a derivative work and does not require the author to provide
source code for the program, use the shared libwebsockets libraries, or
link their program against a user-supplied version of libwebsockets.
@@ -10,7 +16,7 @@
changes to libwebsockets must be provided under the terms of the LGPL in
sections 1, 2, and 4.
-2) You do not have to provide a copy of the libwebsockets license with
+3) You do not have to provide a copy of the libwebsockets license with
programs that are linked to the libwebsockets library, nor do you have to
identify the libwebsockets license in your program or documentation as
required by section 6 of the LGPL.
@@ -22,26 +28,30 @@
"[program] is based in part on the work of the libwebsockets project
(https://libwebsockets.org)"
-3) Some sources included have their own, more liberal licenses, or options
+4) Some sources included have their own, more liberal licenses, or options
to get original sources with the liberal terms.
Original liberal license retained
- - lib/sha-1.c - 3-clause BSD license retained, link to original
+ - lib/misc/sha-1.c - 3-clause BSD license retained, link to original
- win32port/zlib - ZLIB license (see zlib.h)
+ - lib/tls/mbedtls/wrapper - Apache 2.0 (only built if linked against mbedtls)
Relicensed to libwebsocket license
- - lib/base64-decode.c - relicensed to LGPL2.1+SLE, link to original
- - lib/daemonize.c - relicensed from Public Domain to LGPL2.1+SLE,
- link to original Public Domain version
+ - lib/misc/base64-decode.c - relicensed to LGPL2.1+SLE, link to original
+ - lib/misc/daemonize.c - relicensed from Public Domain to LGPL2.1+SLE,
+ link to original Public Domain version
Public Domain (CC-zero) to simplify reuse
- - test-server/*.c
- - test-server/*.h
+ - test-apps/*.c
+ - test-apps/*.h
+ - minimal-examples/*
- lwsws/*
-
+
+------ end of exceptions
+
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
.../{libwebsockets_2.1.0.bb => libwebsockets_3.0.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-connectivity/libwebsockets/{libwebsockets_2.1.0.bb => libwebsockets_3.0.0.bb} (88%)
diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_2.1.0.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
similarity index 88%
rename from meta-oe/recipes-connectivity/libwebsockets/libwebsockets_2.1.0.bb
rename to meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
index 100f3a3541..ea262f855b 100644
--- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_2.1.0.bb
+++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
@@ -1,12 +1,12 @@
SUMMARY = "Canonical libwebsockets.org websocket library"
HOMEPAGE = "https://libwebsockets.org/"
LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3393a657830d4a118c5a6ed35ba53d0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4ce87f3facb6f911c142c8bef9bfb380"
DEPENDS = "zlib"
S = "${WORKDIR}/git"
-SRCREV = "73557509bd15f95a1ad081a6f4fab48ff7743215"
+SRCREV = "eaa935a80adb38b5cc4d09ce06ec987b87dcddfa"
SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;"
inherit cmake pkgconfig
--
2.17.0.rc2.3.gc2a499e6c
^ permalink raw reply related [flat|nested] 2+ messages in thread