diff mbox series

[2/3] kbd: remove non-free Agafari fonts

Message ID 20240412165714.8951-3-peter.marko@siemens.com
State New
Headers show
Series kbd: update-license | expand

Commit Message

Marko, Peter April 12, 2024, 4:57 p.m. UTC
From: Peter Marko <peter.marko@siemens.com>

Its license makes it impossible to distribute kbd
in any commercial products.
Backport commit which removes it.

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 .../0001-Remove-non-free-Agafari-fonts.patch  | 336 ++++++++++++++++++
 meta/recipes-core/kbd/kbd_2.6.4.bb            |   3 +
 2 files changed, 339 insertions(+)
 create mode 100644 meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch

Comments

Marko, Peter April 12, 2024, 5:02 p.m. UTC | #1
I know that binary patches are problematic over mailing list.
Here the patch as zipped attachment just in case.

Peter
Khem Raj April 13, 2024, 12:11 a.m. UTC | #2
ERROR: Logfile of failure stored in:
/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/kbd/2.6.4/temp/log.do_patch.613
ERROR: Task (/mnt/b/yoe/master/sources/poky/meta/recipes-core/kbd/kbd_2.6.4.bb:do_patch)
failed with exit code '1'
NOTE: Tasks Summary: Attempted 1114 tasks of which 1108 didn't need to
be rerun and 1 failed.

On Fri, Apr 12, 2024 at 9:58 AM Peter Marko via lists.openembedded.org
<peter.marko=siemens.com@lists.openembedded.org> wrote:
>
> From: Peter Marko <peter.marko@siemens.com>
>
> Its license makes it impossible to distribute kbd
> in any commercial products.
> Backport commit which removes it.
>
> Signed-off-by: Peter Marko <peter.marko@siemens.com>
> ---
>  .../0001-Remove-non-free-Agafari-fonts.patch  | 336 ++++++++++++++++++
>  meta/recipes-core/kbd/kbd_2.6.4.bb            |   3 +
>  2 files changed, 339 insertions(+)
>  create mode 100644 meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch
>
> diff --git a/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch
> new file mode 100644
> index 0000000000..99a8fec9d8
> --- /dev/null
> +++ b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch
> @@ -0,0 +1,336 @@
> +From b757e6842f9631757f0d1a6b3833aabffa9ffeee Mon Sep 17 00:00:00 2001
> +From: Alexey Gladkov <legion@kernel.org>
> +Date: Thu, 29 Feb 2024 17:38:37 +0100
> +Subject: [PATCH] Remove non-free Agafari fonts
> +
> +Based on legal analysis, we are removing non-free fonts for now. If we
> +can change the license of these fonts, we will return them back.
> +
> +From: Stanislav Brabec <sbrabec@suse.com>
> +Date: Wed, 28 Feb 2024 16:47:54 +0100
> +Subject: kbd: Legal problems of Agafari fonts
> +
> +    The data/consolefonts/README.Ethiopic contains a notice:
> +    Agafari:
> +      Donated by the Ethiopian Science and Technology Commission
> +      <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed
> +      for non-commercial use under Unix environments only.
> +
> +    According to our legal review, it makes impossible to distribute these
> +    fonts as part of any commercial products, and even makes it impossible to
> +    distribute kbd sources as part of any commercial product services.
> +
> +    Additionally, it makes the whole kbd package incompatible with GPL, so the
> +    COPYING file (created during build of the tarball) cannot declare GPL
> +    version 2. It also violates section 6 of GPL (no further restrictions).
> +
> +    That is why several GNU/Linux distributions exclude Agafari from the
> +    release. To be on a safe side, SUSE even decided to repack any source
> +    tarballs before putting it to their servers.
> +
> +    This was probably reported to the former kbd maintainer about 20 years ago,
> +    but nothing changed over years.
> +
> +    That is why I recommend removing Agafari fonts and removing the reference
> +    to them from README.Ethiopic. Alternatively, you can ask the Ethiopian
> +    Science and Technology Commission for re-licensing.
> +
> +Signed-off-by: Alexey Gladkov <legion@kernel.org>
> +
> +Upstream-Status: Backport [https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee]
> +
> +Signed-off-by: Peter Marko <peter.marko@siemens.com>
> +---
> + data/consolefonts/Agafari-12.psfu | Bin 7989 -> 0 bytes
> + data/consolefonts/Agafari-14.psfu | Bin 9013 -> 0 bytes
> + data/consolefonts/Agafari-16.psfu | Bin 10037 -> 0 bytes
> + data/consolefonts/README.Ethiopic |   5 -----
> + 4 files changed, 5 deletions(-)
> + delete mode 100644 data/consolefonts/Agafari-12.psfu
> + delete mode 100644 data/consolefonts/Agafari-14.psfu
> + delete mode 100644 data/consolefonts/Agafari-16.psfu
> +
> +diff --git a/data/consolefonts/Agafari-12.psfu b/data/consolefonts/Agafari-12.psfu
> +deleted file mode 100644
> +index 3c8e796b19e676b2d9addc540e1d9507da620c02..0000000000000000000000000000000000000000
> +GIT binary patch
> +literal 0
> +HcmV?d00001
> +
> +literal 7989
> +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
> +V!!zpj=TBiTVxnKdzK*@D{uc?@c;5g3
> +
> +diff --git a/data/consolefonts/Agafari-14.psfu b/data/consolefonts/Agafari-14.psfu
> +deleted file mode 100644
> +index fb14184855a9ae874d0bbe7f16feb4154e2f15e7..0000000000000000000000000000000000000000
> +GIT binary patch
> +literal 0
> +HcmV?d00001
> +
> +literal 9013
> +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
> +N<ohY)^T;dazX7esFwg)1
> +
> +diff --git a/data/consolefonts/Agafari-16.psfu b/data/consolefonts/Agafari-16.psfu
> +deleted file mode 100644
> +index a9f9395ac423f6887c102a1278d4be5a7657388e..0000000000000000000000000000000000000000
> +GIT binary patch
> +literal 0
> +HcmV?d00001
> +
> +literal 10037
> +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
> +
> +diff --git a/data/consolefonts/README.Ethiopic b/data/consolefonts/README.Ethiopic
> +index 7502722..2810797 100644
> +--- a/data/consolefonts/README.Ethiopic
> ++++ b/data/consolefonts/README.Ethiopic
> +@@ -14,11 +14,6 @@ Ethiopic fonts:
> +      restrictions below:
> +
> +
> +-Agafari:
> +-  Donated by the Ethiopian Science and Technology Commission
> +-  <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed
> +-  for non-commercial use under Unix environments only.
> +-
> + Goha and GohaClassic:
> +   Donated by Yitna Firdyiwek <ybf2u@virgina.edu> of GohaTibeb Associates
> +   and may be redistributed without restriction under the GNU GPL 2.0.
> +--
> +2.30.2
> +
> diff --git a/meta/recipes-core/kbd/kbd_2.6.4.bb b/meta/recipes-core/kbd/kbd_2.6.4.bb
> index 1a7b6b552b..3bc7d1c6b4 100644
> --- a/meta/recipes-core/kbd/kbd_2.6.4.bb
> +++ b/meta/recipes-core/kbd/kbd_2.6.4.bb
> @@ -14,7 +14,10 @@ RPROVIDES:${PN} = "console-tools"
>  RCONFLICTS:${PN} = "console-tools"
>
>  SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
> +           file://0001-Remove-non-free-Agafari-fonts.patch \
>             "
> +#required for binary patch 0001-Remove-non-free-Agafari-fonts.patch
> +PATCHTOOL = "git"
>
>  SRC_URI[sha256sum] = "519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926"
>
> --
> 2.30.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#198181): https://lists.openembedded.org/g/openembedded-core/message/198181
> Mute This Topic: https://lists.openembedded.org/mt/105486424/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj April 13, 2024, 12:26 a.m. UTC | #3
On Fri, Apr 12, 2024 at 10:02 AM Peter Marko via
lists.openembedded.org
<peter.marko=siemens.com@lists.openembedded.org> wrote:
>
> I know that binary patches are problematic over mailing list.
> Here the patch as zipped attachment just in case.
>

This does not help either, This patch is deleting files so why not
just do the delete operation in do_compile:prepend

rm -rf ${S}/data/consolefonts/Agafari-1*

until the mentioned patch is part of a future kbd release.

> Peter
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#198182): https://lists.openembedded.org/g/openembedded-core/message/198182
> Mute This Topic: https://lists.openembedded.org/mt/105486424/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Marko, Peter April 13, 2024, 6:31 a.m. UTC | #4
That surprises me but fine.
I'm sending a v2 moving the file removal to the recipe.
But you could also hand-craft the patch again locally.

Peter

-----Original Message-----
From: Khem Raj <raj.khem@gmail.com> 
Sent: Saturday, April 13, 2024 2:26
To: Marko, Peter (ADV D EU SK BFS1) <Peter.Marko@siemens.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core][PATCH 2/3] kbd: remove non-free Agafari fonts

> On Fri, Apr 12, 2024 at 10:02 AM Peter Marko via lists.openembedded.org <peter.marko=siemens.com@lists.openembedded.org> wrote:
> >
> > I know that binary patches are problematic over mailing list.
> > Here the patch as zipped attachment just in case.
> >
>
> This does not help either, This patch is deleting files so why not just do the delete operation in do_compile:prepend
>
> rm -rf ${S}/data/consolefonts/Agafari-1*
>
> until the mentioned patch is part of a future kbd release.
>
> > Peter
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#198182): 
> > https://lists.openembedded.org/g/openembedded-core/message/198182
> > Mute This Topic: https://lists.openembedded.org/mt/105486424/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
> > [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
Richard Purdie April 13, 2024, 10:47 a.m. UTC | #5
On Sat, 2024-04-13 at 06:31 +0000, Peter Marko via
lists.openembedded.org wrote:
> That surprises me but fine.
> I'm sending a v2 moving the file removal to the recipe.
> But you could also hand-craft the patch again locally.

Since time is against me, I did create a hybrid patch:

https://git.yoctoproject.org/poky/commit/?h=master-next&id=03b9028fe6f76da4b19c62eca102caccaf66c1b4

Let me know if anyone isn't happy with this. I'm happy to take other
patches.

Cheers,

Richard
Peter Kjellerstedt April 13, 2024, 11:59 a.m. UTC | #6
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Richard Purdie
> Sent: den 13 april 2024 12:47
> To: peter.marko@siemens.com; Khem Raj <raj.khem@gmail.com>
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core][PATCH 2/3] kbd: remove non-free Agafari fonts
> 
> On Sat, 2024-04-13 at 06:31 +0000, Peter Marko via
> lists.openembedded.org wrote:
> > That surprises me but fine.
> > I'm sending a v2 moving the file removal to the recipe.
> > But you could also hand-craft the patch again locally.
> 
> Since time is against me, I did create a hybrid patch:
> 
> https://git.yoctoproject.org/poky/commit/?h=master-next&id=03b9028fe6f76da4b19c62eca102caccaf66c1b4
> 
> Let me know if anyone isn't happy with this. I'm happy to take other
> patches.
> 
> Cheers,
> 
> Richard

The do_configure:prepend() looks wrong:

+do_configure:prepend() {
+    rm -rf ${S}/${S}/data/consolefonts/Agafari-1*
+}

I assume that should be:

+do_configure:prepend() {
+	rm -rf ${S}/data/consolefonts/Agafari-1*
+}

//Peter
diff mbox series

Patch

diff --git a/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch
new file mode 100644
index 0000000000..99a8fec9d8
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch
@@ -0,0 +1,336 @@ 
+From b757e6842f9631757f0d1a6b3833aabffa9ffeee Mon Sep 17 00:00:00 2001
+From: Alexey Gladkov <legion@kernel.org>
+Date: Thu, 29 Feb 2024 17:38:37 +0100
+Subject: [PATCH] Remove non-free Agafari fonts
+
+Based on legal analysis, we are removing non-free fonts for now. If we
+can change the license of these fonts, we will return them back.
+
+From: Stanislav Brabec <sbrabec@suse.com>
+Date: Wed, 28 Feb 2024 16:47:54 +0100
+Subject: kbd: Legal problems of Agafari fonts
+
+    The data/consolefonts/README.Ethiopic contains a notice:
+    Agafari:
+      Donated by the Ethiopian Science and Technology Commission
+      <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed
+      for non-commercial use under Unix environments only.
+
+    According to our legal review, it makes impossible to distribute these
+    fonts as part of any commercial products, and even makes it impossible to
+    distribute kbd sources as part of any commercial product services.
+
+    Additionally, it makes the whole kbd package incompatible with GPL, so the
+    COPYING file (created during build of the tarball) cannot declare GPL
+    version 2. It also violates section 6 of GPL (no further restrictions).
+
+    That is why several GNU/Linux distributions exclude Agafari from the
+    release. To be on a safe side, SUSE even decided to repack any source
+    tarballs before putting it to their servers.
+
+    This was probably reported to the former kbd maintainer about 20 years ago,
+    but nothing changed over years.
+
+    That is why I recommend removing Agafari fonts and removing the reference
+    to them from README.Ethiopic. Alternatively, you can ask the Ethiopian
+    Science and Technology Commission for re-licensing.
+
+Signed-off-by: Alexey Gladkov <legion@kernel.org>
+
+Upstream-Status: Backport [https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee]
+
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ data/consolefonts/Agafari-12.psfu | Bin 7989 -> 0 bytes
+ data/consolefonts/Agafari-14.psfu | Bin 9013 -> 0 bytes
+ data/consolefonts/Agafari-16.psfu | Bin 10037 -> 0 bytes
+ data/consolefonts/README.Ethiopic |   5 -----
+ 4 files changed, 5 deletions(-)
+ delete mode 100644 data/consolefonts/Agafari-12.psfu
+ delete mode 100644 data/consolefonts/Agafari-14.psfu
+ delete mode 100644 data/consolefonts/Agafari-16.psfu
+
+diff --git a/data/consolefonts/Agafari-12.psfu b/data/consolefonts/Agafari-12.psfu
+deleted file mode 100644
+index 3c8e796b19e676b2d9addc540e1d9507da620c02..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 7989
+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
+V!!zpj=TBiTVxnKdzK*@D{uc?@c;5g3
+
+diff --git a/data/consolefonts/Agafari-14.psfu b/data/consolefonts/Agafari-14.psfu
+deleted file mode 100644
+index fb14184855a9ae874d0bbe7f16feb4154e2f15e7..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 9013
+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
+N<ohY)^T;dazX7esFwg)1
+
+diff --git a/data/consolefonts/Agafari-16.psfu b/data/consolefonts/Agafari-16.psfu
+deleted file mode 100644
+index a9f9395ac423f6887c102a1278d4be5a7657388e..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 10037
+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
+
+diff --git a/data/consolefonts/README.Ethiopic b/data/consolefonts/README.Ethiopic
+index 7502722..2810797 100644
+--- a/data/consolefonts/README.Ethiopic
++++ b/data/consolefonts/README.Ethiopic
+@@ -14,11 +14,6 @@ Ethiopic fonts:
+      restrictions below:
+ 
+ 
+-Agafari:
+-  Donated by the Ethiopian Science and Technology Commission 
+-  <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed
+-  for non-commercial use under Unix environments only.
+-
+ Goha and GohaClassic:
+   Donated by Yitna Firdyiwek <ybf2u@virgina.edu> of GohaTibeb Associates
+   and may be redistributed without restriction under the GNU GPL 2.0.
+-- 
+2.30.2
+
diff --git a/meta/recipes-core/kbd/kbd_2.6.4.bb b/meta/recipes-core/kbd/kbd_2.6.4.bb
index 1a7b6b552b..3bc7d1c6b4 100644
--- a/meta/recipes-core/kbd/kbd_2.6.4.bb
+++ b/meta/recipes-core/kbd/kbd_2.6.4.bb
@@ -14,7 +14,10 @@  RPROVIDES:${PN} = "console-tools"
 RCONFLICTS:${PN} = "console-tools"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
+           file://0001-Remove-non-free-Agafari-fonts.patch \
            "
+#required for binary patch 0001-Remove-non-free-Agafari-fonts.patch
+PATCHTOOL = "git"
 
 SRC_URI[sha256sum] = "519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926"