[ptxdist] [PATCH v3 1/2] paho-mqtt-c.make: add missing libraries

[ptxdist] [PATCH v3 1/2] paho-mqtt-c.make: add missing libraries

[Robert Schwebel]

The build system creates a client library (c) and an async library (a),
both in a non-SSL and SSL variant. Let's install all of them, as we
don't know which ones are needed.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/paho-mqtt-c.make | 7 +++++++
 1 file changed, 7 insertions(+)

Changes since v2:
- none

Changes since implicit v1 (thanks to mol):
- use make comments, not shell comments

diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
index 8e229cfe2..fdd81ebb1 100644
--- a/rules/paho-mqtt-c.make
+++ b/rules/paho-mqtt-c.make
@@ -51,7 +51,14 @@ $(STATEDIR)/paho-mqtt-c.targetinstall:
 	@$(call install_fixup, paho-mqtt-c,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, paho-mqtt-c,DESCRIPTION,missing)
 
+#	# async library without ssh
+	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3a)
+#	# async library with ssh
 	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3as)
+#	# client library without ssl
+	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3c)
+#	# client library with ssl
+	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3cs)
 
 	@$(call install_finish, paho-mqtt-c)
 
-- 
2.30.2

[ptxdist] [PATCH v3 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12

[Robert Schwebel]

The license has changed from EPL-1.0 to EPL-2.0.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/paho-mqtt-c.make | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Changes since v2:
- fix MD5sum for tarball

Changes since implicit v1 (thanks to mol):
- specify EPL-2.0

diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
index fdd81ebb1..fae94307d 100644
--- a/rules/paho-mqtt-c.make
+++ b/rules/paho-mqtt-c.make
@@ -14,18 +14,18 @@ PACKAGES-$(PTXCONF_PAHO_MQTT_C) += paho-mqtt-c
 #
 # Paths and names
 #
-PAHO_MQTT_C_VERSION	:= 1.3.0
-PAHO_MQTT_C_MD5		:= 8fac1bff9b0d5a74fa1caf8db0501fca
+PAHO_MQTT_C_VERSION	:= 1.3.12
+PAHO_MQTT_C_MD5		:= cc71dd5243d9fd2db6b0369be661a5c9
 PAHO_MQTT_C		:= paho.mqtt.c-$(PAHO_MQTT_C_VERSION)
 PAHO_MQTT_C_SUFFIX	:= tar.gz
 PAHO_MQTT_C_URL		:= https://github.com/eclipse/paho.mqtt.c/archive/v$(PAHO_MQTT_C_VERSION).$(PAHO_MQTT_C_SUFFIX)
 PAHO_MQTT_C_SOURCE	:= $(SRCDIR)/$(PAHO_MQTT_C).$(PAHO_MQTT_C_SUFFIX)
 PAHO_MQTT_C_DIR		:= $(BUILDDIR)/$(PAHO_MQTT_C)
 # "Eclipse Distribution License - v 1.0" is in fact BSD-3-Clause
-PAHO_MQTT_C_LICENSE	:= EPL-1.0 AND BSD-3-Clause
+PAHO_MQTT_C_LICENSE	:= EPL-2.0 AND BSD-3-Clause
 PAHO_MQTT_C_LICENSE_FILES := \
-	file://LICENSE;md5=f2001efbb1450daa099206651f80d39c \
-	file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \
+	file://LICENSE;md5=fd3b896dadaeec3410d753ffaeadcfac \
+	file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
 	file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3
 
 # ----------------------------------------------------------------------------
-- 
2.30.2

Re: [ptxdist] [APPLIED] paho-mqtt-c: version bump 1.3.0 -> 1.3.12

[Michael Olbrich]

Thanks, applied as 36514223a56e41348b06a9de1be716d5a9102726.

Michael

[sent from post-receive hook]

On Fri, 06 Jan 2023 17:01:36 +0100, Robert Schwebel <r.schwebel@pengutronix.de> wrote:
> The license has changed from EPL-1.0 to EPL-2.0.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> Message-Id: <20230106112834.171774-2-r.schwebel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
> index fdd81ebb1878..4eaaa413460a 100644
> --- a/rules/paho-mqtt-c.make
> +++ b/rules/paho-mqtt-c.make
> @@ -14,18 +14,18 @@ PACKAGES-$(PTXCONF_PAHO_MQTT_C) += paho-mqtt-c
>  #
>  # Paths and names
>  #
> -PAHO_MQTT_C_VERSION	:= 1.3.0
> -PAHO_MQTT_C_MD5		:= 8fac1bff9b0d5a74fa1caf8db0501fca
> +PAHO_MQTT_C_VERSION	:= 1.3.12
> +PAHO_MQTT_C_MD5		:= cc71dd5243d9fd2db6b0369be661a5c9
>  PAHO_MQTT_C		:= paho.mqtt.c-$(PAHO_MQTT_C_VERSION)
>  PAHO_MQTT_C_SUFFIX	:= tar.gz
>  PAHO_MQTT_C_URL		:= https://github.com/eclipse/paho.mqtt.c/archive/v$(PAHO_MQTT_C_VERSION).$(PAHO_MQTT_C_SUFFIX)
>  PAHO_MQTT_C_SOURCE	:= $(SRCDIR)/$(PAHO_MQTT_C).$(PAHO_MQTT_C_SUFFIX)
>  PAHO_MQTT_C_DIR		:= $(BUILDDIR)/$(PAHO_MQTT_C)
>  # "Eclipse Distribution License - v 1.0" is in fact BSD-3-Clause
> -PAHO_MQTT_C_LICENSE	:= EPL-1.0 AND BSD-3-Clause
> +PAHO_MQTT_C_LICENSE	:= EPL-2.0 AND BSD-3-Clause
>  PAHO_MQTT_C_LICENSE_FILES := \
> -	file://LICENSE;md5=f2001efbb1450daa099206651f80d39c \
> -	file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \
> +	file://LICENSE;md5=fd3b896dadaeec3410d753ffaeadcfac \
> +	file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
>  	file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3
>  
>  # ----------------------------------------------------------------------------

Re: [ptxdist] [APPLIED] paho-mqtt-c.make: add missing libraries

[Michael Olbrich]

Thanks, applied as 02075b0d7946541262cdcceaf35282d736bd1355.

Michael

[sent from post-receive hook]

On Fri, 17 Feb 2023 18:20:31 +0100, Robert Schwebel <r.schwebel@pengutronix.de> wrote:
> The build system creates a client library (c) and an async library (a),
> both in a non-SSL and SSL variant. Let's install all of them, as we
> don't know which ones are needed.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> Message-Id: <20230106112834.171774-1-r.schwebel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
> index 8e229cfe2cc9..fdd81ebb1878 100644
> --- a/rules/paho-mqtt-c.make
> +++ b/rules/paho-mqtt-c.make
> @@ -51,7 +51,14 @@ $(STATEDIR)/paho-mqtt-c.targetinstall:
>  	@$(call install_fixup, paho-mqtt-c,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
>  	@$(call install_fixup, paho-mqtt-c,DESCRIPTION,missing)
>  
> +#	# async library without ssh
> +	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3a)
> +#	# async library with ssh
>  	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3as)
> +#	# client library without ssl
> +	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3c)
> +#	# client library with ssl
> +	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3cs)
>  
>  	@$(call install_finish, paho-mqtt-c)
>