From 69aef5a4d5ac4866b7444f87887ec5b386c742b1 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Thu, 14 May 2015 14:24:18 -0400 Subject: [PATCH 1/2] lzmq: Use smaller .tar.gz source package Signed-off-by: Ted Hess --- lang/lzmq/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/lzmq/Makefile b/lang/lzmq/Makefile index bc1587ee9e..a62d7e0759 100644 --- a/lang/lzmq/Makefile +++ b/lang/lzmq/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lzmq PKG_VERSION:=0.4.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Dirk Chang PKG_LICENSE:=MIT -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip -PKG_SOURCE_URL:=https://codeload.github.com/zeromq/lzmq/zip/v0.4.2? -PKG_MD5SUM:=6789895c925e7eb9036e526181ec1a33 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/zeromq/lzmq/tar.gz/v0.4.2? +PKG_MD5SUM:=ec9e15bd1495f4c87959fe22a368523d include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk From 877469ccfe8067464999aa4375617b3eeaba7963 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Thu, 14 May 2015 14:28:23 -0400 Subject: [PATCH 2/2] zmq: Make CurveZMQ security (libsodium) optional, cleanup descrition and dependencies Signed-off-by: Ted Hess --- libs/zmq/Makefile | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile index b94db19393..515d6faced 100644 --- a/libs/zmq/Makefile +++ b/libs/zmq/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zeromq PKG_VERSION:=4.0.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Dirk Chang PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=LICENCE.txt @@ -31,28 +31,26 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk -define Package/libzmq/Default - TITLE:=ZeroMQ - Code Connected - URL:=http://www.zeromq.org/ -endef - -define Package/libzmq/Default/description - A replacment for raw socket developing library -endef - define Package/libzmq - $(call Package/libzmq/Default) + TITLE:=ZeroMQ - Message Queue engine + URL:=http://www.zeromq.org/ SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libuuid +libpthread +librt +libsodium $(CXX_DEPENDS) - TITLE+= (library) - URL:= + DEPENDS:=+libuuid +libpthread +librt +PACKAGE_libsodium:libsodium $(CXX_DEPENDS) + MENU:=1 +endef + +define Package/libzmq/config + config LIBZMQ_CURVEZMQ + bool "Include support for CurveZMQ security" + depends on PACKAGE_libzmq + default y + select PACKAGE_libsodium endef define Package/libzmq/description - $(call Package/libzmq/Default/description) - This package contains the ZeroMQ shared library, used by other - programs. + This package contains the ZeroMQ messaging engine shared library. + CurveZMQ security protocols are optional using libsodium. endef # add extra configure flags here