package/mosquitto: bump version to 2.0.2
PATCH 1/1 package/mosquitto: bump version to 2.0.2
Bugfix release. Drop the now upstreamed patches and add 3 new post-2.0.2 patches from the fixes branch.
Signed-off-by Peter Korsgaard <[email protected]>
--- ...tall-target-when-using-WITH_CJSON-no.patch | 62 ++++ ...-mosquitto_ctrl-don-t-hard-set-paths.patch | 32 -- .../0002-Fix-cjson-include-paths.patch | 305 ------------------ ..._passwd-b-using-username-as-password.patch | 31 ++ ...WT-not-being-sent-on-client-takeover.patch | 138 ++++++++ ...WITH_TLS-no-when-the-openssl-headers.patch | 47 --- .../0004-Drop-hard-coded-linker-flags.patch | 48 --- package/mosquitto/mosquitto.hash | 4 +- package/mosquitto/mosquitto.mk | 2 +- 9 files changed, 234 insertions(+), 435 deletions(-) create mode 100644 package/mosquitto/0001-Fix-install-target-when-using-WITH_CJSON-no.patch delete mode 100644 package/mosquitto/0001-apps-mosquitto_ctrl-don-t-hard-set-paths.patch delete mode 100644 package/mosquitto/0002-Fix-cjson-include-paths.patch create mode 100644 package/mosquitto/0002-Fix-mosquitto_passwd-b-using-username-as-password.patch create mode 100644 package/mosquitto/0003-Fix-LWT-not-being-sent-on-client-takeover.patch delete mode 100644 package/mosquitto/0003-Fix-build-using-WITH_TLS-no-when-the-openssl-headers.patch delete mode 100644 package/mosquitto/0004-Drop-hard-coded-linker-flags.patch
package/mosquitto/0001-Fix-install-target-when-using-WITH_CJSON-no.patch new file +62 -0
@@ -0,0 +1,62 @@ +From f7dc138157ca2252d7ed58b61daad19b63fcfe4c Mon Sep 17 00:00:00 2001 +From: "Roger A. Light" <[email protected]> +Date: Fri, 11 Dec 2020 00:02:43 +0000 +Subject: [PATCH] Fix `install` target when using WITH_CJSON=no. + +Closes #1938. Thanks to apple3306 and JulianCaruso. + +Signed-off-by: Peter Korsgaard <[email protected]> +[Peter: drop ChangeLog.txt hunk] +--- + apps/mosquitto_ctrl/Makefile | 6 +++++- + plugins/dynamic-security/Makefile | 6 +++++- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/apps/mosquitto_ctrl/Makefile b/apps/mosquitto_ctrl/Makefile +index 3a4843bf..d2122abc 100644 +--- a/apps/mosquitto_ctrl/Makefile ++++ b/apps/mosquitto_ctrl/Makefile +@@ -36,7 +36,7 @@ else + TARGET:= + endif + +-all : $(TARGET) ++all : ${TARGET} + + mosquitto_ctrl : ${OBJS} + ${CROSS_COMPILE}${CC} ${APP_LDFLAGS} $^ -o $@ $(PASSWD_LDADD) $(LOCAL_LDFLAGS) $(LIBMOSQ) -lcjson -ldl +@@ -84,8 +84,12 @@ password_mosq.o : ../../src/password_mosq.c ../../src/password_mosq.h + ${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@ + + install : all ++ifeq ($(WITH_TLS),yes) ++ifeq ($(WITH_CJSON),yes) + $(INSTALL) -d "${DESTDIR}$(prefix)/bin" + $(INSTALL) ${STRIP_OPTS} mosquitto_ctrl "${DESTDIR}${prefix}/bin/mosquitto_ctrl" ++endif ++endif + + uninstall : + -rm -f "${DESTDIR}${prefix}/bin/mosquitto_ctrl" +diff --git a/plugins/dynamic-security/Makefile b/plugins/dynamic-security/Makefile +index 203fbc3e..810a17ba 100644 +--- a/plugins/dynamic-security/Makefile ++++ b/plugins/dynamic-security/Makefile +@@ -74,9 +74,13 @@ clean: + check: test + test: + +-install: ${PLUGIN_NAME}.so ++install: all ++ifeq ($(WITH_CJSON),yes) ++ifeq ($(WITH_TLS),yes) + $(INSTALL) -d "${DESTDIR}$(prefix)/lib" + $(INSTALL) ${STRIP_OPTS} ${PLUGIN_NAME}.so "${DESTDIR}${prefix}/lib/${PLUGIN_NAME}.so" ++endif ++endif + + uninstall : + -rm -f "${DESTDIR}${prefix}/lib/${PLUGIN_NAME}.so" +-- +2.20.1 +
package/mosquitto/0001-apps-mosquitto_ctrl-don-t-hard-set-paths.patch deleted +0 -32
@@ -1,32 +0,0 @@ -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 deleted +0 -305
305 lines not on this page · raw message
package/mosquitto/0002-Fix-mosquitto_passwd-b-using-username-as-password.patch new file +31 -0
@@ -0,0 +1,31 @@ +From f63386bf4a8a6e07621a3f4ecae2897b4ea01294 Mon Sep 17 00:00:00 2001 +From: Roger Light <[email protected]> +Date: Sun, 13 Dec 2020 20:32:30 +0000 +Subject: [PATCH] Fix `mosquitto_passwd -b` using username as password. + +Only applies if if `-c` is not also used. + +Closes #1949. Thanks to J. Augusto de Oliveira. + +Signed-off-by: Peter Korsgaard <[email protected]> +[Peter: drop ChangeLog.txt hunk] +--- + apps/mosquitto_passwd/mosquitto_passwd.c | 2 +- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/apps/mosquitto_passwd/mosquitto_passwd.c b/apps/mosquitto_passwd/mosquitto_passwd.c +index 92613f0f..9495c3c5 100644 +--- a/apps/mosquitto_passwd/mosquitto_passwd.c ++++ b/apps/mosquitto_passwd/mosquitto_passwd.c +@@ -505,7 +505,7 @@ int main(int argc, char *argv[]) + }else if(batch_mode == true && idx+3 == argc){ + password_file_tmp = argv[idx]; + username = argv[idx+1]; +- password_cmd = argv[idx+1]; ++ password_cmd = argv[idx+2]; + }else if(batch_mode == false && idx+2 == argc){ + password_file_tmp = argv[idx]; + username = argv[idx+1]; +-- +2.20.1 +
package/mosquitto/0003-Fix-LWT-not-being-sent-on-client-takeover.patch new file +138 -0
138 lines not on this page · raw message
package/mosquitto/0003-Fix-build-using-WITH_TLS-no-when-the-openssl-headers.patch deleted +0 -47
47 lines not on this page · raw message
package/mosquitto/0004-Drop-hard-coded-linker-flags.patch deleted +0 -48
48 lines not on this page · raw message
package/mosquitto/mosquitto.hash +2 -2
@@ -1,6 +1,6 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-2.0.0.tar.gz.asc -sha256 ca8c21d1b04037df27639de9ea8f82fa73e1cbd24e83e6394ed67b537c4b6d86 mosquitto-2.0.0.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.2.tar.gz.asc +sha256 5ea9ebf0a5ed3e95cecd75f30ebcf84f054584eff5617ac0f2e60428d3ad9707 mosquitto-2.0.2.tar.gz # License files sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt
package/mosquitto/mosquitto.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 2.0.0 +MOSQUITTO_VERSION = 2.0.2 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10
Signature · 1 line
2.20.1
PATCH 1/1 package/mosquitto: bump version to 2.0.2
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Bugfix release. Drop the now upstreamed patches and add 3 new post-2.0.2 patches from the fixes branch.
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard