[Buildroot] [PATCH v2 1/2] monkey: bump to version 1.6.9

[Buildroot] [PATCH v2 1/2] monkey: bump to version 1.6.9

[david.pierret at smile.fr]

From: David Pierret <david.pierret@gmail.com>

This commit update monkey-server package to 1.6.9

The --datadir option have been moved to --webroot.
The --plugdir option does not exist anymore.

Signed-off-by: David Pierret <david.pierret@gmail.com>
---
 package/monkey/monkey.hash | 6 +++---
 package/monkey/monkey.mk   | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package/monkey/monkey.hash b/package/monkey/monkey.hash
index 6c7eada..47e0e0d 100644
--- a/package/monkey/monkey.hash
+++ b/package/monkey/monkey.hash
@@ -1,3 +1,3 @@
-# md5 from http://monkey-project.com/releases/1.5/monkey-1.5.6.tar.gz.md5, sha256 locally computed:
-md5    9699e4c9ea6ce6b989907c252ae80254 				monkey-1.5.6.tar.gz
-sha256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22	monkey-1.5.6.tar.gz
+# md5 from http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz.md5, sha256 locally computed:
+md5    c401734985a936ee07dbff5eca7d176a 				monkey-1.6.9.tar.gz
+sha256 f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb	monkey-1.6.9.tar.gz
diff --git a/package/monkey/monkey.mk b/package/monkey/monkey.mk
index 02c26c9..58bc26e 100644
--- a/package/monkey/monkey.mk
+++ b/package/monkey/monkey.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-MONKEY_VERSION_MAJOR = 1.5
-MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).6
+MONKEY_VERSION_MAJOR = 1.6
+MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).9
 MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR)
 MONKEY_LICENSE = Apache-2.0
 MONKEY_LICENSE_FILES = LICENSE
@@ -17,11 +17,10 @@ MONKEY_LICENSE_FILES = LICENSE
 MONKEY_CONF_OPTS = \
 	--prefix=/usr \
 	--sysconfdir=/etc/monkey \
-	--datadir=/var/www \
+	--webroot=/var/www \
 	--mandir=/usr/share/man \
 	--logdir=/var/log \
 	--pidfile=/var/run \
-	--plugdir=/usr/lib/monkey \
 	--malloc-libc
 
 # --uclib-mode is not a typo
-- 
2.7.4

[Buildroot] [PATCH v2 2/2] monkey: add option for SSL/TLS plugin compilation

[david.pierret at smile.fr]

From: David Pierret <david.pierret@gmail.com>

This commit add an option to enable SSL/TLS plugin compilation who is not build
by default.

Signed-off-by: David Pierret <david.pierret@gmail.com>

---

Changes v1 -> v2:
  - Always use external libraries
---
 package/monkey/Config.in | 6 ++++++
 package/monkey/monkey.mk | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/package/monkey/Config.in b/package/monkey/Config.in
index 9054aa0..fdfa148 100644
--- a/package/monkey/Config.in
+++ b/package/monkey/Config.in
@@ -17,6 +17,12 @@ config BR2_PACKAGE_MONKEY_SHARED
 	  Build Monkey as a shared library in addition to stand-alone
 	  server
 
+config BR2_PACKAGE_MONKEY_SSL
+	bool "enable SSL/TLS"
+	select BR2_PACKAGE_MBEDTLS
+	help
+	  Enable build of the SSL/TLS plugin.
+
 endif
 
 comment "monkey needs an toolchain w/ threads, dynamic library"
diff --git a/package/monkey/monkey.mk b/package/monkey/monkey.mk
index 58bc26e..427f359 100644
--- a/package/monkey/monkey.mk
+++ b/package/monkey/monkey.mk
@@ -48,6 +48,10 @@ ifeq ($(BR2_ENABLE_DEBUG),y)
 MONKEY_CONF_OPTS += --debug
 endif
 
+ifeq ($(BR2_PACKAGE_MONKEY_SSL),y)
+MONKEY_CONF_OPTS += --enable-plugins=tls --mbedtls-shared
+endif
+
 define MONKEY_CONFIGURE_CMDS
 	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(MONKEY_CONF_OPTS))
 endef
-- 
2.7.4

[Buildroot] [PATCH v2 1/2] monkey: bump to version 1.6.9

[Thomas Petazzoni]

Hello,

On Mon, 17 Sep 2018 15:05:48 +0200, david.pierret at smile.fr wrote:
> From: David Pierret <david.pierret@gmail.com>
> 
> This commit update monkey-server package to 1.6.9
> 
> The --datadir option have been moved to --webroot.
> The --plugdir option does not exist anymore.
> 
> Signed-off-by: David Pierret <david.pierret@gmail.com>

I've applied to master, thanks. It's a bit weird now, because monkey
plugins are installed directly in /usr/lib, and no longer
in /usr/lib/monkey. But after looking at the CMakeLists.txt logic, it
indeed seems like it's upstream intention to install them in /usr/lib.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 2/2] monkey: add option for SSL/TLS plugin compilation

[Thomas Petazzoni]

Hello,

On Mon, 17 Sep 2018 15:05:49 +0200, david.pierret at smile.fr wrote:

> +ifeq ($(BR2_PACKAGE_MONKEY_SSL),y)
> +MONKEY_CONF_OPTS += --enable-plugins=tls --mbedtls-shared

You forgot:

MONKEY_DEPENDENCIES += mbedtls

here. Without this, you don't have the guarantee that mbedtls will be
built before monkey.

I've fixed this and applied your patch to master. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 1/2] monkey: bump to version 1.6.9

[Thomas Petazzoni]

Hello David,

On Mon, 17 Sep 2018 15:05:48 +0200, david.pierret at smile.fr wrote:
> From: David Pierret <david.pierret@gmail.com>
> 
> This commit update monkey-server package to 1.6.9
> 
> The --datadir option have been moved to --webroot.
> The --plugdir option does not exist anymore.
> 
> Signed-off-by: David Pierret <david.pierret@gmail.com>

This update is causing a number of failures in the autobuilders:

  http://autobuild.buildroot.net/?reason=monkey-1.6.9

Could you have a look and submit patches fixing that ?

Thanks a lot,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com