Skip to contentSkip to conversation

package/mosquitto: bump version to 2.0.0

PATCH New Peter Korsgaard 1 participant 2 messages Dec 6, 2020 – Dec 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/mosquitto: bump version to 2.0.0

A new major version, see the announcement for details:
https://mosquitto.org/blog/2020/12/version-2-0-0-released/

License has now changed to v2.0 of the Eclipse Public License, so update the license info and hashes to match.

There is now optional cJSON support, so handle that.

Add upstream post-2.0.0 patches fixing build with cJSON and without TLS support.

---
 ...-mosquitto_ctrl-don-t-hard-set-paths.patch |  32 ++
 .../0002-Fix-cjson-include-paths.patch        | 305 ++++++++++++++++++
 ...WITH_TLS-no-when-the-openssl-headers.patch |  47 +++
 .../0004-Drop-hard-coded-linker-flags.patch   |  48 +++
 package/mosquitto/mosquitto.hash              |   8 +-
 package/mosquitto/mosquitto.mk                |  13 +-
 6 files changed, 446 insertions(+), 7 deletions(-)
 create mode 100644 package/mosquitto/0001-apps-mosquitto_ctrl-don-t-hard-set-paths.patch
 create mode 100644 package/mosquitto/0002-Fix-cjson-include-paths.patch
 create mode 100644 package/mosquitto/0003-Fix-build-using-WITH_TLS-no-when-the-openssl-headers.patch
 create mode 100644 package/mosquitto/0004-Drop-hard-coded-linker-flags.patch
package/mosquitto/0001-apps-mosquitto_ctrl-don-t-hard-set-paths.patch new file +32 -0
new file mode 100644
index 0000000000..b69740aff2
@@ -0,0 +1,32 @@
+From 58a06f33313ad23d406514a03ab8d8f13e3cc44e Mon Sep 17 00:00:00 2001
+From: Karl Palsson <[email protected]>
+Date: Fri, 4 Dec 2020 21:33:18 +0000
+Subject: [PATCH] apps: mosquitto_ctrl: don't hard set paths
+
+In a cross compile environment, these paths will be added elsewhere, and
+in a local environment, they should already be covered by the system
+compiler.  Simply drop them.
+
+Signed-off-by: Karl Palsson <[email protected]>
+Signed-off-by: Peter Korsgaard <[email protected]>
+---
+ apps/mosquitto_ctrl/Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/apps/mosquitto_ctrl/Makefile b/apps/mosquitto_ctrl/Makefile
+index 59b23596..3a4843bf 100644
+--- a/apps/mosquitto_ctrl/Makefile
++++ b/apps/mosquitto_ctrl/Makefile
+@@ -8,8 +8,7 @@ else
+ LIBMOSQ:=../../lib/libmosquitto.a
+ endif
+ 
+-LOCAL_CPPFLAGS:=-I/usr/include/cjson -I/usr/local/include/cjson -I../mosquitto_passwd
+-LOCAL_LDFLAGS:=-L/usr/local/lib
++LOCAL_CPPFLAGS:=-I../mosquitto_passwd
+ 
+ OBJS=	mosquitto_ctrl.o \
+ 		client.o \
+-- 
+2.20.1
+
package/mosquitto/0002-Fix-cjson-include-paths.patch new file +305 -0

305 lines not on this page · raw message

package/mosquitto/0003-Fix-build-using-WITH_TLS-no-when-the-openssl-headers.patch new file +47 -0

47 lines not on this page · raw message

package/mosquitto/0004-Drop-hard-coded-linker-flags.patch new file +48 -0

48 lines not on this page · raw message

package/mosquitto/mosquitto.hash +4 -4
index 13f0c8de23..f1b16bfd03 100644
@@ -1,8 +1,8 @@
 # Locally calculated after checking gpg signature
-# from https://mosquitto.org/files/source/mosquitto-1.6.12.tar.gz.asc
-sha256  548d73d19fb787dd0530334e398fd256ef3a581181678488a741a995c4f007fb  mosquitto-1.6.12.tar.gz
+# from https://mosquitto.org/files/source/mosquitto-2.0.0.tar.gz.asc
+sha256  ca8c21d1b04037df27639de9ea8f82fa73e1cbd24e83e6394ed67b537c4b6d86  mosquitto-2.0.0.tar.gz
 
 # License files
-sha256  cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1  LICENSE.txt
-sha256  3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c  epl-v10
+sha256  d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c  LICENSE.txt
+sha256  0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303  epl-v20
 sha256  e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c  edl-v10
package/mosquitto/mosquitto.mk +10 -3
index fcd9cb7de9..2f92b57e27 100644
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-MOSQUITTO_VERSION = 1.6.12
+MOSQUITTO_VERSION = 2.0.0
 MOSQUITTO_SITE = https://mosquitto.org/files/source
-MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0
-MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
+MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0
+MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10
 MOSQUITTO_INSTALL_STAGING = YES
 
 MOSQUITTO_MAKE_OPTS = \
@@ -57,6 +57,13 @@ else
 MOSQUITTO_MAKE_OPTS += WITH_TLS=no
 endif
 
+ifeq ($(BR2_PACKAGE_CJSON),y)
+MOSQUITTO_DEPENDENCIES += cjson
+MOSQUITTO_MAKE_OPTS += WITH_CJSON=yes
+else
+MOSQUITTO_MAKE_OPTS += WITH_CJSON=no
+endif
+
 ifeq ($(BR2_PACKAGE_C_ARES),y)
 MOSQUITTO_DEPENDENCIES += c-ares
 MOSQUITTO_MAKE_OPTS += WITH_SRV=yes
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/mosquitto: bump version to 2.0.0

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

A new major version, see the announcement for details:
https://mosquitto.org/blog/2020/12/version-2-0-0-released/

License has now changed to v2.0 of the Eclipse Public License, so update the license info and hashes to match.

Quoted 6 lines

There is now optional cJSON support, so handle that.

Add upstream post-2.0.0 patches fixing build with cJSON and without TLS support.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard