Skip to contentSkip to conversation

libsodium: new package

PATCH New Frank Hunleth 3 participants 5 messages May 19, 2015 – Jul 10, 2015

lore
Share & tools
lore

Frank Hunleth

author
#0 lore raw

PATCH v3 1/2 libsodium: new package

Signed-off-by Frank Hunleth <[email protected]>

---
Changes v1 -> v2:
- fix curly braces on variables (thanks to Thomas for noticing)
- added patch for zeromq (in separate patch) to address libsodium dependency in that library (thanks to Romain for this). I didn't find any other packages with a similar dependency, but it's not that easy to do that search.
Changes v2 -> v3:
- removed host build (thanks to Baruch and Thomas)

 package/Config.in                |  1 +
 package/libsodium/Config.in      |  6 ++++++
 package/libsodium/libsodium.hash |  2 ++
 package/libsodium/libsodium.mk   | 13 +++++++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 package/libsodium/Config.in
 create mode 100644 package/libsodium/libsodium.hash
 create mode 100644 package/libsodium/libsodium.mk
package/Config.in +1 -0
index e0c2e2a..5b99639 100644
@@ -723,6 +723,7 @@ menu "Crypto"
 	source "package/libnss/Config.in"
 	source "package/libsecret/Config.in"
 	source "package/libsha1/Config.in"
+	source "package/libsodium/Config.in"
 	source "package/libssh2/Config.in"
 	source "package/nettle/Config.in"
 	source "package/openssl/Config.in"
package/libsodium/Config.in new file +6 -0
new file mode 100644
index 0000000..47b9bb3
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBSODIUM
+	bool "libsodium"
+	help
+	  A modern and easy-to-use crypto library.
+
+	  http://libsodium.org/
package/libsodium/libsodium.hash new file +2 -0
new file mode 100644
index 0000000..089dc03
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256	cbcfc63cc90c05d18a20f229a62c7e7054a73731d0aa858c0517152c549b1288	libsodium-1.0.3.tar.gz
package/libsodium/libsodium.mk new file +13 -0
new file mode 100644
index 0000000..c032863
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libsodium
+#
+################################################################################
+
+LIBSODIUM_VERSION = 1.0.3
+LIBSODIUM_SITE = https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION)
+LIBSODIUM_LICENSE = ISC
+LIBSODIUM_LICENSE_FILES = LICENSE
+LIBSODIUM_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH v3 2/2 zeromq: depend on libsodium if available

ZeroMQ doesn't require libsodium, but will enable CURVE security if it's available. This patch adds the optional dependency.

Signed-off-by Frank Hunleth <[email protected]>

---
Changes v1 -> v2:
- added patch to series
Changes v2 -> v3:
- no changes

 package/zeromq/zeromq.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/zeromq/zeromq.mk +6 -0
index 7e9ed19..a876d5e 100644
@@ -34,4 +34,10 @@ ZEROMQ_DEPENDENCIES += host-pkgconf openpgm
 ZEROMQ_CONF_OPTS += --with-system-pgm
 endif
 
+# ZeroMQ uses libsodium if it's available.
+ifeq ($(BR2_PACKAGE_LIBSODIUM), y)
+ZEROMQ_DEPENDENCIES += libsodium
+ZEROMQ_CONF_OPTS += --with-libsodium="$(STAGING_DIR)/usr"
+endif
+
 $(eval $(autotools-package))

--
2.1.4

#2 lore raw

PATCH v3 2/2 zeromq: depend on libsodium if available

Hi Frank,

Le 19/05/2015 14:01, Frank Hunleth a ?crit :

Quoted 4 lines

ZeroMQ doesn't require libsodium, but will enable CURVE security if it's available. This patch adds the optional dependency.

Signed-off-by Frank Hunleth <[email protected]>
Reviewed-by Romain Naour <[email protected]>

Best regards,
Romain Naour

Quoted 32 lines

---
Changes v1 -> v2:
- added patch to series
Changes v2 -> v3:
- no changes

 package/zeromq/zeromq.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/zeromq/zeromq.mk +6 -1
index 7e9ed19..a876d5e 100644
@@ -34,4 +34,10 @@ ZEROMQ_DEPENDENCIES += host-pkgconf openpgm
 ZEROMQ_CONF_OPTS += --with-system-pgm
 endif
 
+# ZeroMQ uses libsodium if it's available.
+ifeq ($(BR2_PACKAGE_LIBSODIUM), y)
+ZEROMQ_DEPENDENCIES += libsodium
+ZEROMQ_CONF_OPTS += --with-libsodium="$(STAGING_DIR)/usr"
+endif
+
 $(eval $(autotools-package))
--

2.1.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#3 lore raw

PATCH v3 1/2 libsodium: new package

In reply to Frank Hunleth

Hi Frank,

Le 19/05/2015 14:01, Frank Hunleth a ?crit :

Quoted 58 lines
Signed-off-by Frank Hunleth <[email protected]>

---
Changes v1 -> v2:
- fix curly braces on variables (thanks to Thomas for noticing)
- added patch for zeromq (in separate patch) to address libsodium dependency in that library (thanks to Romain for this). I didn't find any other packages with a similar dependency, but it's not that easy to do that search.
Changes v2 -> v3:
- removed host build (thanks to Baruch and Thomas)

 package/Config.in                |  1 +
 package/libsodium/Config.in      |  6 ++++++
 package/libsodium/libsodium.hash |  2 ++
 package/libsodium/libsodium.mk   | 13 +++++++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 package/libsodium/Config.in
 create mode 100644 package/libsodium/libsodium.hash
 create mode 100644 package/libsodium/libsodium.mk
package/Config.in +1 -0
index e0c2e2a..5b99639 100644
@@ -723,6 +723,7 @@ menu "Crypto"
 	source "package/libnss/Config.in"
 	source "package/libsecret/Config.in"
 	source "package/libsha1/Config.in"
+	source "package/libsodium/Config.in"
 	source "package/libssh2/Config.in"
 	source "package/nettle/Config.in"
 	source "package/openssl/Config.in"
package/libsodium/Config.in new file +6 -0
new file mode 100644
index 0000000..47b9bb3
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBSODIUM
+	bool "libsodium"
+	help
+	  A modern and easy-to-use crypto library.
+
+	  http://libsodium.org/
package/libsodium/libsodium.hash new file +2 -0
new file mode 100644
index 0000000..089dc03
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256	cbcfc63cc90c05d18a20f229a62c7e7054a73731d0aa858c0517152c549b1288	libsodium-1.0.3.tar.gz
package/libsodium/libsodium.mk new file +0 -0
new file mode 100644
index 0000000..c032863

package/libsodium/libsodium.mk line 8

Quoted 8 lines
package/libsodium/libsodium.mk new file +8 -0
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libsodium
+#
+################################################################################
+
+LIBSODIUM_VERSION = 1.0.3
+LIBSODIUM_SITE = https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION)

Sorry for the long delay.

I think this patch is ok, so:

Reviewed-by Romain Naour <[email protected]>

Best regards,
Romain Naour

Quoted 6 lines
package/libsodium/libsodium.mk new file +5 -0
+LIBSODIUM_LICENSE = ISC
+LIBSODIUM_LICENSE_FILES = LICENSE
+LIBSODIUM_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
Applied
#4 lore raw

PATCH v3 1/2 libsodium: new package

In reply to Frank Hunleth

Dear Frank Hunleth,

Quoted 10 lines · Frank Hunleth
Signed-off-by Frank Hunleth <[email protected]>

---
Changes v1 -> v2:
- fix curly braces on variables (thanks to Thomas for noticing)
- added patch for zeromq (in separate patch) to address libsodium dependency in that library (thanks to Romain for this). I didn't find any other packages with a similar dependency, but it's not that easy to do that search.
Changes v2 -> v3:
- removed host build (thanks to Baruch and Thomas)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com