[ptxdist] [PATCH] rauc: version bump 1.10.1 -> 1.11.1

[ptxdist] [PATCH] rauc: version bump 1.10.1 -> 1.11.1

[Roland Hieber]

Until recently, RAUC's license was only given implicitly in the
meson.build file, but v1.11 explicitly mentions LGPL-2.1-or-later in the
README [1]. The license identifier in PTXdist was previously ported from
"LGPL-2.1" to "LGPL-2.1-only" in PTXdist commit 4850f7aac30aebf4ef64
(2018-02-12, Michael Olbrich: "update all spdx license identifier to the
new version") without adding any license file checksum as source, which
turned out to be slightly incorrect. Fix the identifier based on the
newly added patch, and pin down the checksum.

Other than that, upstream dropped autotools support, so there is no need
to have an '-meson' in the archive name; drop that.

[1]: https://github.com/rauc/rauc/commit/b20002582f6c754a9161

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/rauc.make | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/rules/rauc.make b/rules/rauc.make
index 660b5e52684f..50b1ec35d57c 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -14,15 +14,16 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
 #
 # Paths and names
 #
-RAUC_VERSION		:= 1.10.1
-RAUC_MD5		:= 610621cc062d2fba41754335c7faee35
+RAUC_VERSION		:= 1.11.1
+RAUC_MD5		:= 16e193e5e396a419a7ceee5777e7c077
 RAUC			:= rauc-$(RAUC_VERSION)
 RAUC_SUFFIX		:= tar.xz
 RAUC_URL		:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
-RAUC_SOURCE		:= $(SRCDIR)/$(RAUC)-meson.$(RAUC_SUFFIX)
+RAUC_SOURCE		:= $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
 RAUC_DIR		:= $(BUILDDIR)/$(RAUC)
-RAUC_LICENSE		:= LGPL-2.1-only
+RAUC_LICENSE		:= LGPL-2.1-or-later
 RAUC_LICENSE_FILES	:= \
+	file://README.rst;startline=281;endline=294;md5=d98e15259a1a004b59d4701b3d49cf44 \
 	file://COPYING;md5=4fbd65380cdd255951079008b364516c
 
 # ----------------------------------------------------------------------------
@@ -39,7 +40,9 @@ RAUC_CONF_OPT	:= \
 	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
 	-Ddbuspolicydir=/usr/share/dbus-1/system.d \
 	-Ddbussystemservicedir=/usr/share/dbus-1/system-services \
+	-Dfuzzing=false \
 	-Dgpt=$(call ptx/endis,PTXCONF_RAUC_GPT)d \
+	-Dhtmldocs=false \
 	-Djson=$(call ptx/endis,PTXCONF_RAUC_JSON)d \
 	-Dnetwork=$(call ptx/truefalse,PTXCONF_RAUC_NETWORK) \
 	-Dservice=$(call ptx/truefalse,PTXCONF_RAUC_SERVICE) \
-- 
2.39.2

Re: [ptxdist] [APPLIED] rauc: version bump 1.10.1 -> 1.11.1

[Michael Olbrich]

Thanks, applied as f6a135620071a856617c50f59ee260a60aaa8e05.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:12 +0100, Roland Hieber <rhi@pengutronix.de> wrote:
> Until recently, RAUC's license was only given implicitly in the
> meson.build file, but v1.11 explicitly mentions LGPL-2.1-or-later in the
> README [1]. The license identifier in PTXdist was previously ported from
> "LGPL-2.1" to "LGPL-2.1-only" in PTXdist commit 4850f7aac30aebf4ef64
> (2018-02-12, Michael Olbrich: "update all spdx license identifier to the
> new version") without adding any license file checksum as source, which
> turned out to be slightly incorrect. Fix the identifier based on the
> newly added patch, and pin down the checksum.
> 
> Other than that, upstream dropped autotools support, so there is no need
> to have an '-meson' in the archive name; drop that.
> 
> [1]: https://github.com/rauc/rauc/commit/b20002582f6c754a9161
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20240220101554.1074123-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 660b5e52684f..50b1ec35d57c 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -14,15 +14,16 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
>  #
>  # Paths and names
>  #
> -RAUC_VERSION		:= 1.10.1
> -RAUC_MD5		:= 610621cc062d2fba41754335c7faee35
> +RAUC_VERSION		:= 1.11.1
> +RAUC_MD5		:= 16e193e5e396a419a7ceee5777e7c077
>  RAUC			:= rauc-$(RAUC_VERSION)
>  RAUC_SUFFIX		:= tar.xz
>  RAUC_URL		:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
> -RAUC_SOURCE		:= $(SRCDIR)/$(RAUC)-meson.$(RAUC_SUFFIX)
> +RAUC_SOURCE		:= $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
>  RAUC_DIR		:= $(BUILDDIR)/$(RAUC)
> -RAUC_LICENSE		:= LGPL-2.1-only
> +RAUC_LICENSE		:= LGPL-2.1-or-later
>  RAUC_LICENSE_FILES	:= \
> +	file://README.rst;startline=281;endline=294;md5=d98e15259a1a004b59d4701b3d49cf44 \
>  	file://COPYING;md5=4fbd65380cdd255951079008b364516c
>  
>  # ----------------------------------------------------------------------------
> @@ -39,7 +40,9 @@ RAUC_CONF_OPT	:= \
>  	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
>  	-Ddbuspolicydir=/usr/share/dbus-1/system.d \
>  	-Ddbussystemservicedir=/usr/share/dbus-1/system-services \
> +	-Dfuzzing=false \
>  	-Dgpt=$(call ptx/endis,PTXCONF_RAUC_GPT)d \
> +	-Dhtmldocs=false \
>  	-Djson=$(call ptx/endis,PTXCONF_RAUC_JSON)d \
>  	-Dnetwork=$(call ptx/truefalse,PTXCONF_RAUC_NETWORK) \
>  	-Dservice=$(call ptx/truefalse,PTXCONF_RAUC_SERVICE) \