net: mosquitto: Bump to 1.4 release

Of particular note, this adds optional support for websockets. This
defaults to enabled, as it's the biggest new feature in this release.
A config item is provided to disable it for manual use.

Full release notes: http://mosquitto.org/2015/02/version-1-4-released/

This also remove some build workarounds that are no longer required for
newer versions of mosquitto.

Signed-off-by: Karl Palsson <karlp@remake.is>
This commit is contained in:
Karl Palsson 2015-02-20 15:57:37 +00:00
parent 07961ce867
commit a584b3efe8
2 changed files with 15 additions and 4 deletions

6
net/mosquitto/Config.in Normal file
View File

@ -0,0 +1,6 @@
config MOSQUITTO_LWS
bool "libwebsockets support"
depends on PACKAGE_mosquitto
default y
help
Includes websockets support in the broker, via libwebsockets

View File

@ -9,19 +9,20 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mosquitto
PKG_VERSION:=1.3.5
PKG_VERSION:=1.4
PKG_RELEASE:=1
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE.txt
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://mosquitto.org/files/source/
PKG_MD5SUM:=55094ad4dc7c7985377f43d4fc3d09da
PKG_MD5SUM:=cd879f5964311501ba8e2275add71484
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
MAKE_FLAGS+=WITH_MEMORY_TRACKING=no
MAKE_FLAGS+=WITH_DOCS=no
MAKE_FLAGS+=WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no")
define Package/$(PKG_NAME)/default
SECTION:=net
@ -36,7 +37,7 @@ endef
define Package/$(PKG_NAME)
$(call Package/mosquitto/default)
TITLE+= (with SSL support)
DEPENDS+= +libopenssl
DEPENDS+= +libopenssl +MOSQUITTO_LWS:libwebsockets-openssl
VARIANT:=ssl
endef
@ -46,6 +47,10 @@ define Package/$(PKG_NAME)-nossl
VARIANT:=nossl
endef
define Package/$(PKG_NAME)/config
source "$(SOURCE)/Config.in"
endef
define Package/$(PKG_NAME)/default/description
Mosquitto is an open source (BSD licensed) message broker that implements
the MQTT protocol version 3.1 and 3.1.1. MQTT provides a lightweight