* [ptxdist] [PATCH 0/4] zeromq: version bump
@ 2022-07-08 7:10 Alexander Dahl
2022-07-08 7:10 ` [ptxdist] [PATCH 1/4] libzmq: Pin some more configure options Alexander Dahl
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Alexander Dahl @ 2022-07-08 7:10 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
Hello,
for a proprietary SDK in on of our BSPs we need a recent version of
zeromq, so I took the opportunity to upgrade it. The first three
patches should be straight forward, although a lot of new configure
options were introduced.
The fourth patch switches from embedded tweetnacl to external libsodium,
which I sent for a version bump series yesterday. I'm not 100% sure
about that change, anyone with a better understanding of security
implications might veto that patch.
One thing more: buildroot sets some autoconf cache variables [1] which
are reported in zeromq prepare step (configure) like this:
checking whether EFD_CLOEXEC is supported... not during cross-compile
…
checking whether SOCK_CLOEXEC is supported... not during cross-compile
checking whether O_CLOEXEC is supported... not during cross-compile
checking whether SO_BINDTODEVICE is supported... not during cross-compile
checking whether SO_KEEPALIVE is supported... not during cross-compile
checking whether TCP_KEEPCNT is supported... not during cross-compile
checking whether TCP_KEEPIDLE is supported... not during cross-compile
checking whether TCP_KEEPINTVL is supported... not during cross-compile
checking whether TCP_KEEPALIVE is supported... not during cross-compile
checking whether SO_PRIORITY is supported... not during cross-compile
checking whether getrandom is supported... not during cross-compile
Not sure if this should be taken care of by ptxdist's receipe, too? It
could be added in a separate patch then.
Greets
Alex
[1] https://git.busybox.net/buildroot/tree/package/zeromq/zeromq.mk
Alexander Dahl (4):
libzmq: Pin some more configure options
libzmq: Revise license and add license file hashes
libzmq: version bump 4.0.4 -> 4.3.4
libzmq: Prefer external libsodium over internal tweetnacl
rules/libzmq.in | 1 +
rules/libzmq.make | 41 ++++++++++++++++++++++++++++++++++-------
2 files changed, 35 insertions(+), 7 deletions(-)
base-commit: 7384b37919cb66e12ff15b4264325cb5eba911c3
--
2.30.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 1/4] libzmq: Pin some more configure options
2022-07-08 7:10 [ptxdist] [PATCH 0/4] zeromq: version bump Alexander Dahl
@ 2022-07-08 7:10 ` Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-08 7:11 ` [ptxdist] [PATCH 2/4] libzmq: Revise license and add license file hashes Alexander Dahl
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Alexander Dahl @ 2022-07-08 7:10 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
Should give the same settings as before.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/libzmq.make | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rules/libzmq.make b/rules/libzmq.make
index d96e7b420..0220a6c23 100644
--- a/rules/libzmq.make
+++ b/rules/libzmq.make
@@ -40,8 +40,10 @@ LIBZMQ_CONF_OPT := \
--disable-static \
--enable-shared \
--disable-debug \
+ --enable-eventfd \
--with-gnu-ld \
--without-gcov \
+ --without-libsodium \
--without-documentation \
--with-poller=epoll \
--without-pgm
--
2.30.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 2/4] libzmq: Revise license and add license file hashes
2022-07-08 7:10 [ptxdist] [PATCH 0/4] zeromq: version bump Alexander Dahl
2022-07-08 7:10 ` [ptxdist] [PATCH 1/4] libzmq: Pin some more configure options Alexander Dahl
@ 2022-07-08 7:11 ` Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-08 7:11 ` [ptxdist] [PATCH 3/4] libzmq: version bump 4.0.4 -> 4.3.4 Alexander Dahl
` (3 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Alexander Dahl @ 2022-07-08 7:11 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
The LGPL text in COPYING.LESSER contains a custom exception paragraph in
the end. That paragraph is part of zeromq since 2010, long before the
library entered ptxdist with version 4.0.4 in 2014.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/libzmq.make | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/rules/libzmq.make b/rules/libzmq.make
index 0220a6c23..6df738b3d 100644
--- a/rules/libzmq.make
+++ b/rules/libzmq.make
@@ -21,7 +21,10 @@ LIBZMQ_SUFFIX := tar.gz
LIBZMQ_URL := http://download.zeromq.org/$(LIBZMQ).$(LIBZMQ_SUFFIX)
LIBZMQ_SOURCE := $(SRCDIR)/$(LIBZMQ).$(LIBZMQ_SUFFIX)
LIBZMQ_DIR := $(BUILDDIR)/$(LIBZMQ)
-LIBZMQ_LICENSE := LGPL-3.0-or-later
+LIBZMQ_LICENSE := LGPL-3.0-or-later WITH custom-exception
+LIBZMQ_LICENSE_FILES := \
+ file://COPYING;md5=f7b40df666d41e6508d03e1c207d498f \
+ file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1
# ----------------------------------------------------------------------------
# Prepare
--
2.30.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 3/4] libzmq: version bump 4.0.4 -> 4.3.4
2022-07-08 7:10 [ptxdist] [PATCH 0/4] zeromq: version bump Alexander Dahl
2022-07-08 7:10 ` [ptxdist] [PATCH 1/4] libzmq: Pin some more configure options Alexander Dahl
2022-07-08 7:11 ` [ptxdist] [PATCH 2/4] libzmq: Revise license and add license file hashes Alexander Dahl
@ 2022-07-08 7:11 ` Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-08 7:11 ` [ptxdist] [PATCH 4/4] libzmq: Prefer external libsodium over internal tweetnacl Alexander Dahl
` (2 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Alexander Dahl @ 2022-07-08 7:11 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
Around 8 years of development.
Note: --enable-curve and --enable-curve-keygen match with what was built
and installed to target previously, especially /usr/bin/curve_keygen
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/libzmq.make | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/rules/libzmq.make b/rules/libzmq.make
index 6df738b3d..a8eab129f 100644
--- a/rules/libzmq.make
+++ b/rules/libzmq.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBZMQ) += libzmq
#
# Paths and names
#
-LIBZMQ_VERSION := 4.0.4
-LIBZMQ_MD5 := f3c3defbb5ef6cc000ca65e529fdab3b
+LIBZMQ_VERSION := 4.3.4
+LIBZMQ_MD5 := c897d4005a3f0b8276b00b7921412379
LIBZMQ := zeromq-$(LIBZMQ_VERSION)
LIBZMQ_SUFFIX := tar.gz
-LIBZMQ_URL := http://download.zeromq.org/$(LIBZMQ).$(LIBZMQ_SUFFIX)
+LIBZMQ_URL := https://github.com/zeromq/libzmq/releases/download/v$(LIBZMQ_VERSION)/$(LIBZMQ).$(LIBZMQ_SUFFIX)
LIBZMQ_SOURCE := $(SRCDIR)/$(LIBZMQ).$(LIBZMQ_SUFFIX)
LIBZMQ_DIR := $(BUILDDIR)/$(LIBZMQ)
LIBZMQ_LICENSE := LGPL-3.0-or-later WITH custom-exception
@@ -40,16 +40,38 @@ LIBZMQ_CONF_ENV := \
LIBZMQ_CONF_TOOL := autoconf
LIBZMQ_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --disable-code-coverage \
--disable-static \
--enable-shared \
+ --disable-valgrind \
+ --enable-symvers \
+ --disable-force-CXX98-compat \
--disable-debug \
+ --disable-pedantic \
+ --disable-thread-sanitizer \
+ --disable-address-sanitizer \
+ --disable-Werror \
--enable-eventfd \
- --with-gnu-ld \
+ --disable-perf \
+ --enable-curve-keygen \
+ --enable-curve \
+ --disable-ws \
+ --disable-libbsd \
+ --disable-drafts \
+ --disable-libunwind \
--without-gcov \
- --without-libsodium \
- --without-documentation \
+ --with-gnu-ld \
+ --without-militant \
+ --without-docs \
--with-poller=epoll \
- --without-pgm
+ --without-libgssapi_krb5 \
+ --without-libsodium \
+ --without-nss \
+ --without-tls \
+ --without-pgm \
+ --without-norm \
+ --without-vmci \
+ --without-fuzzing-engine
# ----------------------------------------------------------------------------
# Target-Install
--
2.30.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 4/4] libzmq: Prefer external libsodium over internal tweetnacl
2022-07-08 7:10 [ptxdist] [PATCH 0/4] zeromq: version bump Alexander Dahl
` (2 preceding siblings ...)
2022-07-08 7:11 ` [ptxdist] [PATCH 3/4] libzmq: version bump 4.0.4 -> 4.3.4 Alexander Dahl
@ 2022-07-08 7:11 ` Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-08 9:26 ` [ptxdist] [PATCH 0/4] zeromq: version bump Michael Olbrich
2022-07-08 15:15 ` Michael Olbrich
5 siblings, 1 reply; 11+ messages in thread
From: Alexander Dahl @ 2022-07-08 7:11 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
The external library is faster and seems to be better maintained.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/libzmq.in | 1 +
rules/libzmq.make | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/rules/libzmq.in b/rules/libzmq.in
index c272f845d..f03831ecd 100644
--- a/rules/libzmq.in
+++ b/rules/libzmq.in
@@ -3,6 +3,7 @@
config LIBZMQ
tristate
prompt "libzmq"
+ select LIBSODIUM
help
The zeroMQ lightweight messaging kernel is a library which extends the
standard socket interfaces with features traditionally provided by
diff --git a/rules/libzmq.make b/rules/libzmq.make
index a8eab129f..d221ef6ac 100644
--- a/rules/libzmq.make
+++ b/rules/libzmq.make
@@ -65,7 +65,7 @@ LIBZMQ_CONF_OPT := \
--without-docs \
--with-poller=epoll \
--without-libgssapi_krb5 \
- --without-libsodium \
+ --with-libsodium \
--without-nss \
--without-tls \
--without-pgm \
--
2.30.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 0/4] zeromq: version bump
2022-07-08 7:10 [ptxdist] [PATCH 0/4] zeromq: version bump Alexander Dahl
` (3 preceding siblings ...)
2022-07-08 7:11 ` [ptxdist] [PATCH 4/4] libzmq: Prefer external libsodium over internal tweetnacl Alexander Dahl
@ 2022-07-08 9:26 ` Michael Olbrich
2022-07-08 15:15 ` Michael Olbrich
5 siblings, 0 replies; 11+ messages in thread
From: Michael Olbrich @ 2022-07-08 9:26 UTC (permalink / raw)
To: Alexander Dahl; +Cc: Alexander Aring, ptxdist
On Fri, Jul 08, 2022 at 09:10:58AM +0200, Alexander Dahl wrote:
> Hello,
>
> for a proprietary SDK in on of our BSPs we need a recent version of
> zeromq, so I took the opportunity to upgrade it. The first three
> patches should be straight forward, although a lot of new configure
> options were introduced.
>
> The fourth patch switches from embedded tweetnacl to external libsodium,
> which I sent for a version bump series yesterday. I'm not 100% sure
> about that change, anyone with a better understanding of security
> implications might veto that patch.
>
> One thing more: buildroot sets some autoconf cache variables [1] which
> are reported in zeromq prepare step (configure) like this:
>
> checking whether EFD_CLOEXEC is supported... not during cross-compile
> …
> checking whether SOCK_CLOEXEC is supported... not during cross-compile
> checking whether O_CLOEXEC is supported... not during cross-compile
> checking whether SO_BINDTODEVICE is supported... not during cross-compile
> checking whether SO_KEEPALIVE is supported... not during cross-compile
> checking whether TCP_KEEPCNT is supported... not during cross-compile
> checking whether TCP_KEEPIDLE is supported... not during cross-compile
> checking whether TCP_KEEPINTVL is supported... not during cross-compile
> checking whether TCP_KEEPALIVE is supported... not during cross-compile
> checking whether SO_PRIORITY is supported... not during cross-compile
> checking whether getrandom is supported... not during cross-compile
>
> Not sure if this should be taken care of by ptxdist's receipe, too? It
> could be added in a separate patch then.
Yes please. All of those features are available an any reasonably new Linux
kernel and glibc. I think there are cache variables for all of those (e.g.
libzmq_cv_efd_cloexec), so just add those to the _CONF_ENV.
Michael
> Greets
> Alex
>
> [1] https://git.busybox.net/buildroot/tree/package/zeromq/zeromq.mk
>
> Alexander Dahl (4):
> libzmq: Pin some more configure options
> libzmq: Revise license and add license file hashes
> libzmq: version bump 4.0.4 -> 4.3.4
> libzmq: Prefer external libsodium over internal tweetnacl
>
> rules/libzmq.in | 1 +
> rules/libzmq.make | 41 ++++++++++++++++++++++++++++++++++-------
> 2 files changed, 35 insertions(+), 7 deletions(-)
>
>
> base-commit: 7384b37919cb66e12ff15b4264325cb5eba911c3
> --
> 2.30.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 0/4] zeromq: version bump
2022-07-08 7:10 [ptxdist] [PATCH 0/4] zeromq: version bump Alexander Dahl
` (4 preceding siblings ...)
2022-07-08 9:26 ` [ptxdist] [PATCH 0/4] zeromq: version bump Michael Olbrich
@ 2022-07-08 15:15 ` Michael Olbrich
5 siblings, 0 replies; 11+ messages in thread
From: Michael Olbrich @ 2022-07-08 15:15 UTC (permalink / raw)
To: Alexander Dahl; +Cc: Alexander Aring, ptxdist
On Fri, Jul 08, 2022 at 09:10:58AM +0200, Alexander Dahl wrote:
> Hello,
>
> for a proprietary SDK in on of our BSPs we need a recent version of
> zeromq, so I took the opportunity to upgrade it. The first three
> patches should be straight forward, although a lot of new configure
> options were introduced.
>
> The fourth patch switches from embedded tweetnacl to external libsodium,
> which I sent for a version bump series yesterday. I'm not 100% sure
> about that change, anyone with a better understanding of security
> implications might veto that patch.
I don't think there was an explicit decision to use the embedded library.
Using the external external libsodium make sense to me, so I applied the
patch with the rest.
Michael
> One thing more: buildroot sets some autoconf cache variables [1] which
> are reported in zeromq prepare step (configure) like this:
>
> checking whether EFD_CLOEXEC is supported... not during cross-compile
> …
> checking whether SOCK_CLOEXEC is supported... not during cross-compile
> checking whether O_CLOEXEC is supported... not during cross-compile
> checking whether SO_BINDTODEVICE is supported... not during cross-compile
> checking whether SO_KEEPALIVE is supported... not during cross-compile
> checking whether TCP_KEEPCNT is supported... not during cross-compile
> checking whether TCP_KEEPIDLE is supported... not during cross-compile
> checking whether TCP_KEEPINTVL is supported... not during cross-compile
> checking whether TCP_KEEPALIVE is supported... not during cross-compile
> checking whether SO_PRIORITY is supported... not during cross-compile
> checking whether getrandom is supported... not during cross-compile
>
> Not sure if this should be taken care of by ptxdist's receipe, too? It
> could be added in a separate patch then.
>
> Greets
> Alex
>
> [1] https://git.busybox.net/buildroot/tree/package/zeromq/zeromq.mk
>
> Alexander Dahl (4):
> libzmq: Pin some more configure options
> libzmq: Revise license and add license file hashes
> libzmq: version bump 4.0.4 -> 4.3.4
> libzmq: Prefer external libsodium over internal tweetnacl
>
> rules/libzmq.in | 1 +
> rules/libzmq.make | 41 ++++++++++++++++++++++++++++++++++-------
> 2 files changed, 35 insertions(+), 7 deletions(-)
>
>
> base-commit: 7384b37919cb66e12ff15b4264325cb5eba911c3
> --
> 2.30.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [APPLIED] libzmq: Pin some more configure options
2022-07-08 7:10 ` [ptxdist] [PATCH 1/4] libzmq: Pin some more configure options Alexander Dahl
@ 2022-07-29 6:23 ` Michael Olbrich
0 siblings, 0 replies; 11+ messages in thread
From: Michael Olbrich @ 2022-07-29 6:23 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Thanks, applied as d6cad81051d3162ffeec2d1fc7f020cf70ecec39.
Michael
[sent from post-receive hook]
On Fri, 29 Jul 2022 08:23:48 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Should give the same settings as before.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220708071102.18393-2-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libzmq.make b/rules/libzmq.make
> index d96e7b420788..0220a6c238ba 100644
> --- a/rules/libzmq.make
> +++ b/rules/libzmq.make
> @@ -40,8 +40,10 @@ LIBZMQ_CONF_OPT := \
> --disable-static \
> --enable-shared \
> --disable-debug \
> + --enable-eventfd \
> --with-gnu-ld \
> --without-gcov \
> + --without-libsodium \
> --without-documentation \
> --with-poller=epoll \
> --without-pgm
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [APPLIED] libzmq: Revise license and add license file hashes
2022-07-08 7:11 ` [ptxdist] [PATCH 2/4] libzmq: Revise license and add license file hashes Alexander Dahl
@ 2022-07-29 6:23 ` Michael Olbrich
0 siblings, 0 replies; 11+ messages in thread
From: Michael Olbrich @ 2022-07-29 6:23 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Thanks, applied as 993bf4b0dea15ef72fcfb35032892568a7e66d8b.
Michael
[sent from post-receive hook]
On Fri, 29 Jul 2022 08:23:50 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> The LGPL text in COPYING.LESSER contains a custom exception paragraph in
> the end. That paragraph is part of zeromq since 2010, long before the
> library entered ptxdist with version 4.0.4 in 2014.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220708071102.18393-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libzmq.make b/rules/libzmq.make
> index 0220a6c238ba..6df738b3d4fc 100644
> --- a/rules/libzmq.make
> +++ b/rules/libzmq.make
> @@ -21,7 +21,10 @@ LIBZMQ_SUFFIX := tar.gz
> LIBZMQ_URL := http://download.zeromq.org/$(LIBZMQ).$(LIBZMQ_SUFFIX)
> LIBZMQ_SOURCE := $(SRCDIR)/$(LIBZMQ).$(LIBZMQ_SUFFIX)
> LIBZMQ_DIR := $(BUILDDIR)/$(LIBZMQ)
> -LIBZMQ_LICENSE := LGPL-3.0-or-later
> +LIBZMQ_LICENSE := LGPL-3.0-or-later WITH custom-exception
> +LIBZMQ_LICENSE_FILES := \
> + file://COPYING;md5=f7b40df666d41e6508d03e1c207d498f \
> + file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [APPLIED] libzmq: version bump 4.0.4 -> 4.3.4
2022-07-08 7:11 ` [ptxdist] [PATCH 3/4] libzmq: version bump 4.0.4 -> 4.3.4 Alexander Dahl
@ 2022-07-29 6:23 ` Michael Olbrich
0 siblings, 0 replies; 11+ messages in thread
From: Michael Olbrich @ 2022-07-29 6:23 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Thanks, applied as 76a249e97c53f1a5b695ba37451b898d7724dfc0.
Michael
[sent from post-receive hook]
On Fri, 29 Jul 2022 08:23:51 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Around 8 years of development.
>
> Note: --enable-curve and --enable-curve-keygen match with what was built
> and installed to target previously, especially /usr/bin/curve_keygen
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220708071102.18393-4-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libzmq.make b/rules/libzmq.make
> index 6df738b3d4fc..a8eab129f1f1 100644
> --- a/rules/libzmq.make
> +++ b/rules/libzmq.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBZMQ) += libzmq
> #
> # Paths and names
> #
> -LIBZMQ_VERSION := 4.0.4
> -LIBZMQ_MD5 := f3c3defbb5ef6cc000ca65e529fdab3b
> +LIBZMQ_VERSION := 4.3.4
> +LIBZMQ_MD5 := c897d4005a3f0b8276b00b7921412379
> LIBZMQ := zeromq-$(LIBZMQ_VERSION)
> LIBZMQ_SUFFIX := tar.gz
> -LIBZMQ_URL := http://download.zeromq.org/$(LIBZMQ).$(LIBZMQ_SUFFIX)
> +LIBZMQ_URL := https://github.com/zeromq/libzmq/releases/download/v$(LIBZMQ_VERSION)/$(LIBZMQ).$(LIBZMQ_SUFFIX)
> LIBZMQ_SOURCE := $(SRCDIR)/$(LIBZMQ).$(LIBZMQ_SUFFIX)
> LIBZMQ_DIR := $(BUILDDIR)/$(LIBZMQ)
> LIBZMQ_LICENSE := LGPL-3.0-or-later WITH custom-exception
> @@ -40,16 +40,38 @@ LIBZMQ_CONF_ENV := \
> LIBZMQ_CONF_TOOL := autoconf
> LIBZMQ_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> + --disable-code-coverage \
> --disable-static \
> --enable-shared \
> + --disable-valgrind \
> + --enable-symvers \
> + --disable-force-CXX98-compat \
> --disable-debug \
> + --disable-pedantic \
> + --disable-thread-sanitizer \
> + --disable-address-sanitizer \
> + --disable-Werror \
> --enable-eventfd \
> - --with-gnu-ld \
> + --disable-perf \
> + --enable-curve-keygen \
> + --enable-curve \
> + --disable-ws \
> + --disable-libbsd \
> + --disable-drafts \
> + --disable-libunwind \
> --without-gcov \
> - --without-libsodium \
> - --without-documentation \
> + --with-gnu-ld \
> + --without-militant \
> + --without-docs \
> --with-poller=epoll \
> - --without-pgm
> + --without-libgssapi_krb5 \
> + --without-libsodium \
> + --without-nss \
> + --without-tls \
> + --without-pgm \
> + --without-norm \
> + --without-vmci \
> + --without-fuzzing-engine
>
> # ----------------------------------------------------------------------------
> # Target-Install
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [APPLIED] libzmq: Prefer external libsodium over internal tweetnacl
2022-07-08 7:11 ` [ptxdist] [PATCH 4/4] libzmq: Prefer external libsodium over internal tweetnacl Alexander Dahl
@ 2022-07-29 6:23 ` Michael Olbrich
0 siblings, 0 replies; 11+ messages in thread
From: Michael Olbrich @ 2022-07-29 6:23 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Thanks, applied as 6fbe59dec2ceb561821749e3ad80c24c3c18bc07.
Michael
[sent from post-receive hook]
On Fri, 29 Jul 2022 08:23:52 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> The external library is faster and seems to be better maintained.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220708071102.18393-5-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libzmq.in b/rules/libzmq.in
> index c272f845d8ed..f03831ecde0a 100644
> --- a/rules/libzmq.in
> +++ b/rules/libzmq.in
> @@ -3,6 +3,7 @@
> config LIBZMQ
> tristate
> prompt "libzmq"
> + select LIBSODIUM
> help
> The zeroMQ lightweight messaging kernel is a library which extends the
> standard socket interfaces with features traditionally provided by
> diff --git a/rules/libzmq.make b/rules/libzmq.make
> index a8eab129f1f1..d221ef6ac1db 100644
> --- a/rules/libzmq.make
> +++ b/rules/libzmq.make
> @@ -65,7 +65,7 @@ LIBZMQ_CONF_OPT := \
> --without-docs \
> --with-poller=epoll \
> --without-libgssapi_krb5 \
> - --without-libsodium \
> + --with-libsodium \
> --without-nss \
> --without-tls \
> --without-pgm \
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-07-29 6:29 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-08 7:10 [ptxdist] [PATCH 0/4] zeromq: version bump Alexander Dahl
2022-07-08 7:10 ` [ptxdist] [PATCH 1/4] libzmq: Pin some more configure options Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-08 7:11 ` [ptxdist] [PATCH 2/4] libzmq: Revise license and add license file hashes Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-08 7:11 ` [ptxdist] [PATCH 3/4] libzmq: version bump 4.0.4 -> 4.3.4 Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-08 7:11 ` [ptxdist] [PATCH 4/4] libzmq: Prefer external libsodium over internal tweetnacl Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-08 9:26 ` [ptxdist] [PATCH 0/4] zeromq: version bump Michael Olbrich
2022-07-08 15:15 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox