[ptxdist] [PATCH 1/2] ptxd_make_world_license: handle PDFs in _LICENSE_FILES

[ptxdist] [PATCH 1/2] ptxd_make_world_license: handle PDFs in _LICENSE_FILES

[Roland Hieber]

If PDF files are found in the _LICENSE_FILES variable, include them as
literal pages in license-report.pdf with the 'pdfpages' package, which
nowadays comes preinstalled with most LaTeX distributions.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 scripts/lib/ptxd_make_license_report.sh |  2 ++
 scripts/lib/ptxd_make_world_license.sh  | 41 ++++++++++++++++---------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/scripts/lib/ptxd_make_license_report.sh b/scripts/lib/ptxd_make_license_report.sh
index c92dc725d1f7..bed5bd1d43c5 100644
--- a/scripts/lib/ptxd_make_license_report.sh
+++ b/scripts/lib/ptxd_make_license_report.sh
@@ -18,6 +18,7 @@ ptxd_make_license_report_header() {
 	\usepackage{tikz}
 	\usepackage{adjustbox}
 	\usepackage{spverbatim}
+	\usepackage{pdfpages}
 	\hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue}
 
 	%% Something like this may be needed depending on the package list
@@ -209,6 +210,7 @@ ptxd_make_license_compliance_header() {
 	\usepackage{tikz}
 	\usepackage{adjustbox}
 	\usepackage{spverbatim}
+	\usepackage{pdfpages}
 	\hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue}
 
 	%% Something like this may be needed depending on the package list
diff --git a/scripts/lib/ptxd_make_world_license.sh b/scripts/lib/ptxd_make_world_license.sh
index f68b75339cb2..785254603765 100644
--- a/scripts/lib/ptxd_make_world_license.sh
+++ b/scripts/lib/ptxd_make_world_license.sh
@@ -188,21 +188,32 @@ ptxd_make_world_license_write() {
 	    continue
 	fi
 	title="$(basename "${license}")"
-	cat <<- EOF
-		\section{$(ptxd_make_latex_escape "${title}")${guess}}
-		\begin{small}
-		\begin{spverbatim}
-	EOF
-	if [ -f "${license}.utf-8" ]; then
-	    cat "${license}.utf-8"
-	else
-	    cat "${license}"
-	fi | sed -e 's/\f/\n/g'
-	check_pipe_status || return
-	cat <<- EOF
-		\end{spverbatim}
-		\end{small}
-	EOF
+	case "${license}" in
+	    *.pdf)
+		cat <<- EOF
+			\section{$(ptxd_make_latex_escape "${title}")${guess}}
+			\includepdf[pages=-]{${license}}
+		EOF
+		;;
+	    *)
+		cat <<- EOF
+			\section{$(ptxd_make_latex_escape "${title}")${guess}}
+			\begin{small}
+			\begin{spverbatim}
+		EOF
+
+		if [ -f "${license}.utf-8" ]; then
+		    cat "${license}.utf-8"
+		else
+		    cat "${license}"
+		fi | sed -e 's/\f/\n/g'
+		check_pipe_status || return
+		cat <<- EOF
+			\end{spverbatim}
+			\end{small}
+		EOF
+		;;
+	esac
     done
 }
 export -f ptxd_make_world_license_write
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/2] python3-pycryptodomex: fix license identifier

[Roland Hieber]

LICENSE.rst includes an Unlicense and a BSD-2-Clause, and refers to
additional licenses for the OCB code, which contains a restriction for
"military purposes", and is not compatible with the Open Source
Definition.

Fixes: b8958ad388ba104527e2 (2021-07-02, "python3-pycryptodomex: new package")
Cc: Lars Pedersen <lapeddk@gmail.com>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/python3-pycryptodomex.make | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rules/python3-pycryptodomex.make b/rules/python3-pycryptodomex.make
index 59dadfbd0d29..9409bb414e88 100644
--- a/rules/python3-pycryptodomex.make
+++ b/rules/python3-pycryptodomex.make
@@ -21,9 +21,12 @@ PYTHON3_PYCRYPTODOMEX_SUFFIX	:= tar.gz
 PYTHON3_PYCRYPTODOMEX_URL	:= $(call ptx/mirror-pypi, pycryptodomex, $(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX))
 PYTHON3_PYCRYPTODOMEX_SOURCE	:= $(SRCDIR)/$(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX)
 PYTHON3_PYCRYPTODOMEX_DIR	:= $(BUILDDIR)/$(PYTHON3_PYCRYPTODOMEX)
-PYTHON3_PYCRYPTODOMEX_LICENSE	:= BSD-2
+PYTHON3_PYCRYPTODOMEX_LICENSE	:= Unlicense AND BSD-2-Clause and proprietary
 PYTHON3_PYCRYPTODOMEX_LICENSE_FILES := \
-	file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c
+	file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c \
+	file://Doc/ocb/license1.pdf;md5=e33fa8dcf4d10e5c0d9a9e9291714d3d \
+	file://Doc/ocb/license2.pdf;md5=68cfc4690fbbaa0d89d3ea3abcc60b0f \
+	file://Doc/ocb/license3.pdf;md5=2124679d48d559681738985e040ae388
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/2] python3-pycryptodomex: fix license identifier

[Michael Olbrich]

On Wed, Jul 07, 2021 at 03:53:06PM +0200, Roland Hieber wrote:
> LICENSE.rst includes an Unlicense and a BSD-2-Clause, and refers to
> additional licenses for the OCB code, which contains a restriction for
> "military purposes", and is not compatible with the Open Source
> Definition.
> 
> Fixes: b8958ad388ba104527e2 (2021-07-02, "python3-pycryptodomex: new package")
> Cc: Lars Pedersen <lapeddk@gmail.com>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  rules/python3-pycryptodomex.make | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/python3-pycryptodomex.make b/rules/python3-pycryptodomex.make
> index 59dadfbd0d29..9409bb414e88 100644
> --- a/rules/python3-pycryptodomex.make
> +++ b/rules/python3-pycryptodomex.make
> @@ -21,9 +21,12 @@ PYTHON3_PYCRYPTODOMEX_SUFFIX	:= tar.gz
>  PYTHON3_PYCRYPTODOMEX_URL	:= $(call ptx/mirror-pypi, pycryptodomex, $(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX))
>  PYTHON3_PYCRYPTODOMEX_SOURCE	:= $(SRCDIR)/$(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX)
>  PYTHON3_PYCRYPTODOMEX_DIR	:= $(BUILDDIR)/$(PYTHON3_PYCRYPTODOMEX)
> -PYTHON3_PYCRYPTODOMEX_LICENSE	:= BSD-2
> +PYTHON3_PYCRYPTODOMEX_LICENSE	:= Unlicense AND BSD-2-Clause and proprietary

I think this should be 'custom' not 'proprietary'. If 'proprietary' then we
assume that the code is closed source. That's not the case here.

Michael

>  PYTHON3_PYCRYPTODOMEX_LICENSE_FILES := \
> -	file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c
> +	file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c \
> +	file://Doc/ocb/license1.pdf;md5=e33fa8dcf4d10e5c0d9a9e9291714d3d \
> +	file://Doc/ocb/license2.pdf;md5=68cfc4690fbbaa0d89d3ea3abcc60b0f \
> +	file://Doc/ocb/license3.pdf;md5=2124679d48d559681738985e040ae388
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH] fixup! ptxd_make_world_license: handle PDFs in _LICENSE_FILES

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
On Wed, Jul 07, 2021 at 04:38:20PM +0200, Michael Olbrich wrote:
> > +PYTHON3_PYCRYPTODOMEX_LICENSE	:= Unlicense AND BSD-2-Clause and proprietary
> 
> I think this should be 'custom' not 'proprietary'. If 'proprietary' then we
> assume that the code is closed source. That's not the case here.
> 
> Michael

OK, sounds fine to me.

 - Roland

 rules/python3-pycryptodomex.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/python3-pycryptodomex.make b/rules/python3-pycryptodomex.make
index 9409bb414e88..69fcd1f3a5e8 100644
--- a/rules/python3-pycryptodomex.make
+++ b/rules/python3-pycryptodomex.make
@@ -21,7 +21,7 @@ PYTHON3_PYCRYPTODOMEX_SUFFIX	:= tar.gz
 PYTHON3_PYCRYPTODOMEX_URL	:= $(call ptx/mirror-pypi, pycryptodomex, $(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX))
 PYTHON3_PYCRYPTODOMEX_SOURCE	:= $(SRCDIR)/$(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX)
 PYTHON3_PYCRYPTODOMEX_DIR	:= $(BUILDDIR)/$(PYTHON3_PYCRYPTODOMEX)
-PYTHON3_PYCRYPTODOMEX_LICENSE	:= Unlicense AND BSD-2-Clause and proprietary
+PYTHON3_PYCRYPTODOMEX_LICENSE	:= Unlicense AND BSD-2-Clause and custom
 PYTHON3_PYCRYPTODOMEX_LICENSE_FILES := \
 	file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c \
 	file://Doc/ocb/license1.pdf;md5=e33fa8dcf4d10e5c0d9a9e9291714d3d \
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH] fixup! ptxd_make_world_license: handle PDFs in _LICENSE_FILES

[Roland Hieber]

OK, why did I break the subject… v2 then.

 - Roland

On Thu, Jul 08, 2021 at 08:46:26PM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> On Wed, Jul 07, 2021 at 04:38:20PM +0200, Michael Olbrich wrote:
> > > +PYTHON3_PYCRYPTODOMEX_LICENSE	:= Unlicense AND BSD-2-Clause and proprietary
> > 
> > I think this should be 'custom' not 'proprietary'. If 'proprietary' then we
> > assume that the code is closed source. That's not the case here.
> > 
> > Michael
> 
> OK, sounds fine to me.
> 
>  - Roland
> 
>  rules/python3-pycryptodomex.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/python3-pycryptodomex.make b/rules/python3-pycryptodomex.make
> index 9409bb414e88..69fcd1f3a5e8 100644
> --- a/rules/python3-pycryptodomex.make
> +++ b/rules/python3-pycryptodomex.make
> @@ -21,7 +21,7 @@ PYTHON3_PYCRYPTODOMEX_SUFFIX	:= tar.gz
>  PYTHON3_PYCRYPTODOMEX_URL	:= $(call ptx/mirror-pypi, pycryptodomex, $(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX))
>  PYTHON3_PYCRYPTODOMEX_SOURCE	:= $(SRCDIR)/$(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX)
>  PYTHON3_PYCRYPTODOMEX_DIR	:= $(BUILDDIR)/$(PYTHON3_PYCRYPTODOMEX)
> -PYTHON3_PYCRYPTODOMEX_LICENSE	:= Unlicense AND BSD-2-Clause and proprietary
> +PYTHON3_PYCRYPTODOMEX_LICENSE	:= Unlicense AND BSD-2-Clause and custom
>  PYTHON3_PYCRYPTODOMEX_LICENSE_FILES := \
>  	file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c \
>  	file://Doc/ocb/license1.pdf;md5=e33fa8dcf4d10e5c0d9a9e9291714d3d \
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de