Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Json license is non free
Date: Fri, 02 Oct 2020 01:48:13 +0200	[thread overview]
Message-ID: <20201001234813.X9Jjv6zsZNRo5FY4x-kStenhjr13yyljhn9IwqB3qJ0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25235@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages JSON-license-is-non-free
https://github.com/void-linux/void-packages/pull/25235

Json license is non free
- JSON license is non-free license
- Auditing those code base, I don't think we ship any JSON licensed software.

A patch file from https://github.com/void-linux/void-packages/pull/25235.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-JSON-license-is-non-free-25235.patch --]
[-- Type: text/x-diff, Size: 4174 bytes --]

From 1ad35b70998f62c3b0877f4a303e0780d06ff9fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 1 Oct 2020 23:01:02 +0700
Subject: [PATCH 1/3] numlockx: released under MIT not JSON

JSON is non-free-license.
---
 srcpkgs/numlockx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/numlockx/template b/srcpkgs/numlockx/template
index c219eb2e32a..12669f492c4 100644
--- a/srcpkgs/numlockx/template
+++ b/srcpkgs/numlockx/template
@@ -1,12 +1,12 @@
 # Template file for 'numlockx'
 pkgname=numlockx
 version=1.2
-revision=4
+revision=5
 build_style=gnu-configure
 makedepends="libX11-devel libSM-devel libXext-devel libXtst-devel"
 short_desc="Activate NumLock at startup"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
-license="JSON"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+license="MIT"
 homepage="http://www.mike-devlin.com/linux/README-numlockx.htm"
 distfiles="${DEBIAN_SITE}/main/n/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=e468eb9121c94c9089dc6a287eeb347e900ce04a14be37da29d7696cbce772e4

From a29769553fb978c703098028fe83eb0d92af3b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 1 Oct 2020 23:07:45 +0700
Subject: [PATCH 2/3] rapidjson: clear all JSON licensed code

---
 srcpkgs/rapidjson/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/rapidjson/template b/srcpkgs/rapidjson/template
index 6bc0b221f88..84a5e608777 100644
--- a/srcpkgs/rapidjson/template
+++ b/srcpkgs/rapidjson/template
@@ -1,18 +1,25 @@
-# Template build file for 'rapidjson'.
+# Template file for 'rapidjson'
 pkgname=rapidjson
 version=1.1.0
-revision=2
+revision=3
 build_style=cmake
-archs=noarch
-short_desc="A fast JSON parser/generator for C++ with both SAX/DOM style API"
+short_desc="Fast JSON parser/generator for C++ with both SAX/DOM style API"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
-license="BSD, MIT"
+license="BSD-3-Clause, MIT"
 homepage="https://github.com/miloyip/rapidjson"
 distfiles="https://github.com/miloyip/${pkgname}/archive/v${version}.tar.gz"
 checksum=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
 
 CXXFLAGS="-Wno-type-limits"
 
+post_patch() {
+	# Remove bin/jsonchecker, which is the JSON licensed files
+	rm -rf bin/jsonchecker
+	vsed -i license.txt \
+		-e 's/To avoid the problematic JSON.*//' \
+		-e '/Under the JSON License/,/OTHER DEALINGS IN THE SOFTWARE/d'
+}
+
 post_install() {
 	vlicense license.txt
 }

From 11de32a59094d844595ef6649c5f7bc48c5eea87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 1 Oct 2020 23:18:37 +0700
Subject: [PATCH 3/3] rlottie: clear JSON license mention

The tarball never contains any non-free JSON licensed code.
---
 srcpkgs/rlottie/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rlottie/template b/srcpkgs/rlottie/template
index c4c9b65ff1e..8902680b215 100644
--- a/srcpkgs/rlottie/template
+++ b/srcpkgs/rlottie/template
@@ -2,19 +2,23 @@
 pkgname=rlottie
 _commit=f6fc61f214945ac9961ba49fdfc9a3d3336e999b
 version=0.0.20200110
-revision=1
+revision=2
 wrksrc="rlottie-${_commit}"
 build_style=cmake
 configure_args="-DLOTTIE_CACHE=OFF"
 short_desc="Platform independent standalone library that plays Lottie Animation"
 maintainer="John <me@johnnynator.dev>"
-license="LGPL-2.1-or-later, FTL, MIT, JSON, BSD-3-Clause"
+license="LGPL-2.1-or-later, FTL, MIT, BSD-3-Clause"
 homepage="https://github.com/Samsung/rlottie"
 distfiles="https://github.com/Samsung/rlottie/archive/${_commit}.tar.gz"
 checksum=399bb06d8d2120f794eff8bc3e4cbbee13b9f22abcfd9f3f746f595d43ea0b42
 
 post_patch() {
 	vsed -e 's/c++14/c++17/g' -i CMakeLists.txt
+	# No JSON licensed source code included
+	vsed -i licenses/COPYING.RPD \
+		-e 's/To avoid the problematic JSON.*//' \
+		-e '/Under the JSON License/,/OTHER DEALINGS IN THE SOFTWARE/d'
 }
 
 post_install() {

  parent reply	other threads:[~2020-10-01 23:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-01 16:21 [PR PATCH] " sgn
2020-10-01 16:21 ` [PR PATCH] [Updated] " sgn
2020-10-01 23:48 ` sgn [this message]
2020-10-02 10:46 ` [PR PATCH] [Merged]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201001234813.X9Jjv6zsZNRo5FY4x-kStenhjr13yyljhn9IwqB3qJ0@z \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).