From fc8eec6d394e11358637af15406da3f7644c11b6 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 3 Feb 2020 10:26:35 +0100 Subject: [PATCH 1/4] Add relicense from zoobab --- RELICENSE/zoobab.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 RELICENSE/zoobab.md diff --git a/RELICENSE/zoobab.md b/RELICENSE/zoobab.md new file mode 100644 index 00000000..216ce976 --- /dev/null +++ b/RELICENSE/zoobab.md @@ -0,0 +1,15 @@ +# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL + +This is a statement by Benjamin HENRION +that grants permission to relicense its copyrights in the libzmq C++ +library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other +Open Source Initiative approved license chosen by the current ZeroMQ +BDFL (Benevolent Dictator for Life). + +A portion of the commits made by the Github handle "zoobab", with +commit author "Benjamin HENRION", are copyright of Benjamin HENRION . +This document hereby grants the libzmq project team to relicense libzmq, +including all past, present and future contributions of the author listed above. + +Benjamin HENRION (zoobab) +Done in Brussels on the 2020/02/03 From 2a6cc306da2e33ebdb6d2c40ffcae35c84b63c8f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 3 Feb 2020 11:56:11 +0100 Subject: [PATCH 2/4] Grant by acsearle --- RELICENSE/acsearle.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 RELICENSE/acsearle.md diff --git a/RELICENSE/acsearle.md b/RELICENSE/acsearle.md new file mode 100644 index 00000000..1b6be68f --- /dev/null +++ b/RELICENSE/acsearle.md @@ -0,0 +1,14 @@ +# Permission to Relicense under MPLv2 + +This is a statement by Liquid Instruments +that grants permission to relicense its copyrights in the libzmq C++ +library (ZeroMQ) under the Mozilla Public License v2 (MPLv2). + +A portion of the commits made by the Github handle "acsearle", with +commit author "Antony Searle", are copyright of Liquid Instruments . +This document hereby grants the libzmq project team to relicense +libzmq, including all past, present and future contributions of the author +listed above. + +Antony Searle +2020/02/03 From d2a8be8da72f893d23a611bff0ba09e3ee9872e1 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 3 Feb 2020 12:22:47 +0100 Subject: [PATCH 3/4] Problem: nuget internal metadata not maintained, no relicense Solution: remove it for now --- builds/Makefile.am | 2 -- builds/nuget/libzmq.autopkg | 52 ------------------------------------- builds/nuget/readme.nuget | 20 -------------- 3 files changed, 74 deletions(-) delete mode 100644 builds/nuget/libzmq.autopkg delete mode 100644 builds/nuget/readme.nuget diff --git a/builds/Makefile.am b/builds/Makefile.am index e7fe5e09..af94301c 100644 --- a/builds/Makefile.am +++ b/builds/Makefile.am @@ -25,8 +25,6 @@ EXTRA_DIST = \ valgrind/ci_build.sh \ valgrind/valgrind.supp \ valgrind/vg \ - nuget/readme.nuget \ - nuget/libzmq.autopkg \ android/Dockerfile \ android/README.md \ android/android_build_helper.sh \ diff --git a/builds/nuget/libzmq.autopkg b/builds/nuget/libzmq.autopkg deleted file mode 100644 index 8b8b3657..00000000 --- a/builds/nuget/libzmq.autopkg +++ /dev/null @@ -1,52 +0,0 @@ -nuget{ - nuspec{ - id = libzmq; - version : 4.1.0-alpha; - title: ZMQ - Code Connected; - authors: { zeromq }; - owners: { phreed, jgoz }; - licenseUrl: "https://www.gnu.org/licenses/lgpl.html"; - projectUrl: "http://www.zeromq.org/"; - iconUrl: "http://www.zeromq.org/local--files/admin:css/logo.gif"; - requireLicenseAcceptance: false; - summary: Code Connected; - description: @" -ZeroMQ \zeromq\: -- Connect your code in any language, on any platform. -- Carries messages across inproc, IPC, TCP, TPIC, multicast. -- Smart patterns like pub-sub, push-pull, and router-dealer. -- High-speed asynchronous I/O engines, in a tiny library. -- Backed by a large and active open source community. -- Supports every modern language and platform. -- Build any architecture: centralized, distributed, small, or large. -- Free software with full commercial support."; - releaseNotes: "Made a NuGet package."; - copyright: Copyright 2012 iMatix Corporation and Contributors; - tags: {0mq, zeromq, nuget, native; } - } - - files{ - #defines { - SDK_ROOT = ..\..\; - SDK_2010 = ..\msvc\; - } - include: { "${SDK_ROOT}include\*" }; - docs: { "${SDK_ROOT}doc\*.txt" }; - - [x64,v100,debug] { - lib: ${SDK_2010}Debug\libzmq.lib; - symbols: ${SDK_2010}Debug\libzmq.pdb; - } - - [x64,v100,release] { - lib: ${SDK_2010}Release\libzmq.lib; - bin: ${SDK_2010}..\..\lib\libzmq.dll; - } - - targets{ - Defines += HAS_CPP_ZMQ_SDK; - } - } -} - - diff --git a/builds/nuget/readme.nuget b/builds/nuget/readme.nuget deleted file mode 100644 index 633743a9..00000000 --- a/builds/nuget/readme.nuget +++ /dev/null @@ -1,20 +0,0 @@ - -NuGet is a package management system for MS-Windows. -It is similar in spirit to tools like Maven or Gradle. - -It was originaly for .Net only packages but it has -recently been augmented to working with native packages. -http://docs.nuget.org/docs/reference/support-for-native-projects - -The instructions for building a NuGet package can be found here: -http://coapp.org/pages/tutorials.html - - -The basic procedure is to first build all -the artifacts and then run ... - Write-NuGetPackage .\libzmq.autopkg - -The *.nuget files thus produced can then be installed -in a local repository or uploaded to one of the nuget servers. - - From d69f4dc855ba1469b0b33eeaa863b278efb62bfb Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 3 Feb 2020 13:01:58 +0100 Subject: [PATCH 4/4] Problem: commented out code in CMakeLists.txt Solution: remove it, never used --- CMakeLists.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4d8b0dc..537cb7d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1488,16 +1488,6 @@ elseif(BUILD_SHARED OR BUILD_STATIC) PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) endif() -# install(FILES ${public_headers} -# DESTINATION include -# COMPONENT SDK) - -#if(NOT ZMQ_BUILD_FRAMEWORK) -# file(GLOB private_headers "${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp") -# install(FILES ${sources} ${private_headers} DESTINATION src/zmq -# COMPONENT SourceCode) -#endif() - foreach(readme ${readme-docs}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${readme} ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt)