public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/obfs4proxy/
Date: Sat, 18 Jul 2020 11:56:14 +0000 (UTC)	[thread overview]
Message-ID: <1595073354.f39d204778c8766a8788ef3e85aa60db4ed2b317.marecki@gentoo> (raw)

commit:     f39d204778c8766a8788ef3e85aa60db4ed2b317
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 11:36:59 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 11:55:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39d2047

net-proxy/obfs4proxy: clarify the licence

No official statement on this from upstream for almost 10 months now -
but since out of the two possibilities (BSD-2 and GPL-3+) only one is
actually legal, it is quite clear which one we should stand by.

Closes: https://bugs.gentoo.org/695296
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
index d53da0a313c..4ef397fb9ec 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
@@ -39,13 +39,13 @@ go-module_set_globals
 SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz
 	${EGO_SUM_SRC_URI}"
 
-LICENSE="BSD BSD-2 CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
+LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 
 S="${WORKDIR}/obfs4-${P}"
 
-DOCS=( README.md ChangeLog doc/obfs4-spec.txt )
+DOCS=( README.md ChangeLog LICENSE-GPL3.txt doc/obfs4-spec.txt )
 
 src_compile() {
 	go build -o ${PN}/${PN} ./${PN} || die


             reply	other threads:[~2020-07-18 11:56 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-18 11:56 Marek Szuba [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-11-12  0:56 [gentoo-commits] repo/gentoo:master commit in: net-proxy/obfs4proxy/ Marek Szuba
2022-11-11  3:50 Sam James
2022-11-11  3:50 Sam James
2022-11-10 18:18 Arthur Zamarin
2022-09-05  9:40 Marek Szuba
2022-04-11 11:16 Marek Szuba
2022-04-11  6:35 Jakov Smolić
2022-04-10 17:47 Arthur Zamarin
2022-04-10  9:05 Agostino Sarubbo
2022-03-01 16:47 Marek Szuba
2022-02-04 14:07 Marek Szuba
2022-01-12 21:52 Marek Szuba
2022-01-03 23:14 Marek Szuba
2021-05-13 16:50 Marek Szuba
2020-05-11 11:38 Agostino Sarubbo
2020-05-08  6:38 Agostino Sarubbo
2020-03-25 15:15 Marek Szuba
2020-03-25 15:15 Marek Szuba
2020-03-04 16:04 Marek Szuba
2019-09-23 13:39 Marek Szuba
2019-09-23 13:39 Marek Szuba
2019-07-15 11:46 Marek Szuba
2019-07-15 11:46 Marek Szuba
2019-06-10 15:51 Marek Szuba
2019-03-28 10:51 Marek Szuba
2019-03-28 10:51 Marek Szuba
2019-03-28 10:51 Marek Szuba
2016-11-28 16:27 Marek Szuba
2016-09-21 14:37 Marek Szuba
2016-08-30 20:25 Markus Meier
2016-07-29 14:17 Marek Szuba
2016-05-25  9:04 Ian Delaney
2016-04-23  6:50 Anthony G. Basile
2016-04-23  6:50 Anthony G. Basile

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=1595073354.f39d204778c8766a8788ef3e85aa60db4ed2b317.marecki@gentoo \
    --to=marecki@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.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