From: Roland Hieber <rhi@pengutronix.de>
To: Alexander Dahl <ada@thorsis.com>
Cc: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 07/34] figlet: Fix license and add license file hashes
Date: Mon, 13 May 2019 11:41:12 +0200 [thread overview]
Message-ID: <20190513094112.pcoszwtgnus3eq5c@pengutronix.de> (raw)
In-Reply-To: <20190510092434.15019-8-ada@thorsis.com>
[-- Attachment #1: Type: text/plain, Size: 1861 bytes --]
On Fri, May 10, 2019 at 11:24:07AM +0200, Alexander Dahl wrote:
> Added information based on what the Debian project found out.
>
> https://metadata.ftp-master.debian.org/changelogs//main/f/figlet/figlet_2.2.5-2_copyright
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
> rules/figlet.make | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/rules/figlet.make b/rules/figlet.make
> index b22d22e17..8886beab3 100644
> --- a/rules/figlet.make
> +++ b/rules/figlet.make
> @@ -25,7 +25,13 @@ FIGLET_SUFFIX := tar.gz
> FIGLET_URL := ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
> FIGLET_SOURCE := $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
> FIGLET_DIR := $(BUILDDIR)/$(FIGLET)
> -FIGLET_LICENSE := figlet
> +FIGLET_LICENSE := BSD-3-Clause AND MIT-CMU AND ISC AND Unicode-DFS-2016 AND WTFPL
> +FIGLET_LICENSE_FILES := \
> + file://LICENSE;md5=1688bcd97b27704f1afcac7336409857 \
> + file://inflate.c;startline=7;endline=27;md5=74ed6158b8244dbc4d91afaf8a39bec2 \
> + file://utf8.c;startline=2;endline=16;md5=eb9cc57cf60ac24044670bf8dc475579 \
> + file://fonts/8859-2.flc;startline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34 \
> + file://tests/emboss.tlf;startline=3;endline=10;md5=8e317e9236ffade21fedc39e3496eac2
I was trying to reproduce these, but I got a better match for HPND
instead of MIT-CMU for inflate.c. And I cannot reprocude the match from
fonts/8859-2.flc, which apparently should be Unicode-DFS-2016? It seems
to me this is a bug in the Debian package you referenced above.
See attachments.
- Roland
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: 8859-2.flc-unicode-dfs-2016.wdiff --]
[-- Type: text/plain, Size: 4142 bytes --]
.../figlet-2.2.5 $ sed -n '9,23p' fonts/8859-2.flc | cut -b3- | spdx-license-match -g Unicode-DFS-2016
Match: 6% Unicode-DFS-2016
Note: match for Unicode-DFS-2016 is pretty bad. Maybe try a better --guess.
Diff:
--- Unicode-DFS-2016.txt
+++ input
@@ -1,54 +1,13 @@
[-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
Unicode Data Files include all data files under the directories
http://www.unicode.org/Public/, http://www.unicode.org/reports/,
http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
and http://www.unicode.org/utility/trac/browser/.
Unicode Data Files do not include PDF online code charts under the directory
http://www.unicode.org/Public/.
Software includes any source code published in the Unicode Standard or under
the directories http://www.unicode.org/Public/,
http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/,
http://source.icu-project.org/repos/icu/, and
http://www.unicode.org/utility/trac/browser/.
NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,
INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA
FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO
BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT
AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR
SOFTWARE.
COPYRIGHT AND PERMISSION NOTICE-] Copyright [-© 1991-2016-] {+(c) 1991-1999+}
Unicode, Inc. All [-rights-] {+Rights+} reserved. [-Distributed under the
Terms of Use in http://www.unicode.org/copyright.html.
Permission-]
{+This file+} is [-hereby granted, free of charge,-] {+provided as-is by
Unicode, Inc. (The Unicode Consortium). No claims are made as+} to {+fitness
for+} any [-person obtaining a copy-] {+particular purpose. No warranties+} of
[-the Unicode data files and-] any [-associated documentation (the "Data
Files")-] {+kind are expressed+} or [-Unicode software and-] {+implied. The
recipient agrees to determine applicability of information provided. If this
file has been provided on optical media by Unicode, Inc., the sole remedy
for+} any [-associated documentation (the "Software")-] {+claim will be
exchange of defective media within 90 days of receipt.
Unicode, Inc. hereby grants the right+} to [-deal in-] {+freely use+} the
[-Data Files or Software without restriction, including without limitation-]
{+information supplied in this file in+} the [-rights to use, copy, modify,
merge, publish, distribute, and/or sell copies-] {+creation+} of {+products
supporting+} the [-Data Files or Software,-] {+Unicode Standard,+} and to
[-permit persons to whom the Data Files or Software are furnished to do so,
provided that either
(a) this copyright and permission notice appear with all-] {+make+} copies
of [-the Data Files or Software, or (b)-] this [-copyright and
permission notice appear-] {+file+} in [-associated Documentation.
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE
DATA FILES OR SOFTWARE.
Except-] {+any form for internal or external distribution as long+} as
[-contained in-] this [-notice, the name of a copyright holder shall not be
used in advertising or otherwise to promote the sale, use or other dealings in
these Data Files or Software without prior written authorization of the
copyright holder.-] {+notice remains attached.+}
[-- Attachment #3: inflate-hpnd.wdiff --]
[-- Type: text/plain, Size: 1756 bytes --]
.../figlet-2.2.5 $ sed -n '8,26p' inflate.c | cut -b 3- | spdx-license-match -g HPND
Match: 83% HPND
Diff:
--- HPND.txt
+++ input
@@ -1,21 +1,19 @@
[-Historical Permission Notice and Disclaimer
<copyright notice>-] {+Copyright (C) 1995, Edward B. Hamrick+}
Permission to use, copy, [-modify-] {+modify,+} and distribute this software
and its documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all [-copies[,] [and]-]
{+copies and+} that both [-[that] [the]-] {+that+} copyright notice and this
permission notice appear in supporting [-documentation[,-]
{+documentation,+} and that the name [-[of] <copyright holder> [or <related
entities>]-] {+of the copyright holders+} not be used in advertising or
publicity pertaining to distribution of the software without specific,
written prior [-permission]. [<copyright holder>-] {+permission. The copyright
holders+} makes no representations about the suitability of this software
for any purpose. It is provided "as is" without express or implied [-warranty.]
[<copyright holder> DISCLAIMS-] {+warranty.
THE COPYRIGHT HOLDERS DISCLAIM+} ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND [-FITNESS[,][.]-]
{+FITNESS,+} IN NO EVENT SHALL [-<copyright holder>-] {+THE COPYRIGHT
HOLDERS+} BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS [-SOFTWARE.]-] {+SOFTWARE.+}
[-- Attachment #4: Type: text/plain, Size: 91 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2019-05-13 9:41 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-10 9:24 [ptxdist] [PATCH 00/34] License updates Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 01/34] at: Add license identifiers and hashes Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 02/34] at91bootstrap: Add license information Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 03/34] boost: Add license file hash Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 04/34] busybox: " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 05/34] libnl3: Fix license and add license hash Alexander Dahl
2019-05-28 21:43 ` Roland Hieber
2019-05-29 7:12 ` Michael Olbrich
2019-06-06 13:40 ` Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 06/34] dropbear: Add license information Alexander Dahl
2019-05-13 9:42 ` Roland Hieber
2019-05-29 7:49 ` Michael Olbrich
2019-05-29 8:00 ` Alexander Dahl
2019-05-29 9:12 ` Michael Olbrich
2019-05-29 9:31 ` Roland Hieber
2019-05-29 9:40 ` Michael Olbrich
2020-03-10 14:23 ` Alexander Dahl
2020-03-10 14:31 ` Roland Hieber
2019-05-10 9:24 ` [ptxdist] [PATCH 07/34] figlet: Fix license and add license file hashes Alexander Dahl
2019-05-13 9:41 ` Roland Hieber [this message]
2019-05-13 10:20 ` Alexander Dahl
2019-05-22 11:56 ` Roland Hieber
2019-05-29 7:29 ` Michael Olbrich
2019-05-10 9:24 ` [ptxdist] [PATCH 08/34] flex: Fix license and add license file hash Alexander Dahl
2019-05-28 21:07 ` Roland Hieber
2019-05-29 7:03 ` Michael Olbrich
2019-05-29 9:35 ` Roland Hieber
2019-05-10 9:24 ` [ptxdist] [PATCH 09/34] json-c: Add " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 10/34] coreutils: " Alexander Dahl
2019-05-29 7:53 ` Michael Olbrich
2019-05-10 9:24 ` [ptxdist] [PATCH 11/34] libarchive: " Alexander Dahl
2019-05-29 7:56 ` Michael Olbrich
2019-05-10 9:24 ` [ptxdist] [PATCH 12/34] libfaketime: " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 13/34] libgmp: Fix license Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 14/34] libgmp: Add license file hashes Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 15/34] libmnl: Fix license and add " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 16/34] libmodbus3: " Alexander Dahl
2019-05-29 8:04 ` Michael Olbrich
2019-05-29 8:13 ` Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 17/34] libnet: Add license information Alexander Dahl
2019-05-29 8:10 ` Michael Olbrich
2019-05-10 9:24 ` [ptxdist] [PATCH 18/34] libnftnl: Fix license and add license file hash Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 19/34] libpcap: " Alexander Dahl
2019-05-29 8:22 ` Michael Olbrich
2019-05-10 9:24 ` [ptxdist] [PATCH 20/34] libpopt: Add " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 21/34] libxml2: Fix license and add " Alexander Dahl
2019-05-29 8:28 ` Michael Olbrich
2019-05-10 9:24 ` [ptxdist] [PATCH 22/34] lighttpd: Fix licenses and add more license file hashes Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 23/34] lm_sensors: Add " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 24/34] log4cplus: Fix licenses and add license file hash Alexander Dahl
2019-05-29 9:09 ` Michael Olbrich
2019-05-10 9:24 ` [ptxdist] [PATCH 25/34] mtd-utils: Add " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 26/34] ncurses: Use 'COPYING' for " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 27/34] net-snmp: Fix licenses and add " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 28/34] nftables: Add " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 29/34] opkg: " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 30/34] readline: " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 31/34] rt-tests: Fix licenses and add " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 32/34] sudo: " Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 33/34] tree: Fix licenses and add license file hashes Alexander Dahl
2019-05-10 9:24 ` [ptxdist] [PATCH 34/34] u-boot-tools: " Alexander Dahl
2019-05-29 9:38 ` [ptxdist] [PATCH 00/34] License updates Michael Olbrich
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=20190513094112.pcoszwtgnus3eq5c@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/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