* [Buildroot] [PATCH] netsniff-ng: add dependency on libsodium. @ 2019-11-04 4:01 Yi Zheng 2019-11-04 8:24 ` Vadim Kochan 0 siblings, 1 reply; 5+ messages in thread From: Yi Zheng @ 2019-11-04 4:01 UTC (permalink / raw) To: buildroot The tool 'curvetun' in netsniff-ng package can only be built when NACL/Sodium lib is added. Adjust the dependency and the configure environ settings to build the curvetun tool. Signed-off-by: Yi Zheng <goodmenzy@gmail.com> --- package/netsniff-ng/netsniff-ng.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk index 283ecaf245..34a9fd8a3a 100644 --- a/package/netsniff-ng/netsniff-ng.mk +++ b/package/netsniff-ng/netsniff-ng.mk @@ -11,9 +11,10 @@ NETSNIFF_NG_LICENSE = GPL-2.0 NETSNIFF_NG_LICENSE_FILES = README COPYING # Prevent netsniff-ng configure script from finding a host installed nacl NETSNIFF_NG_CONF_ENV = \ - NACL_INC_DIR=/dev/null \ - NACL_LIB_DIR=/dev/null -NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu + NACL_INC_DIR=$(STAGING_DIR)/usr/include/sodium \ + NACL_LIB_DIR=$(STAGING_DIR)/lib\ + NACL_LIB=sodium +NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu libsodium ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y) NETSNIFF_NG_DEPENDENCIES += libcli libnet -- 2.23.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] netsniff-ng: add dependency on libsodium. 2019-11-04 4:01 [Buildroot] [PATCH] netsniff-ng: add dependency on libsodium Yi Zheng @ 2019-11-04 8:24 ` Vadim Kochan 2019-11-04 13:58 ` [Buildroot] [PATCH] netsniff-ng: add libsodium/nacl dependency, to build curvetun tool Yi Zheng 0 siblings, 1 reply; 5+ messages in thread From: Vadim Kochan @ 2019-11-04 8:24 UTC (permalink / raw) To: buildroot Hi Zheng, On Mon, Nov 4, 2019 at 6:02 AM Yi Zheng <goodmenzy@gmail.com> wrote: > > The tool 'curvetun' in netsniff-ng package can only be built > when NACL/Sodium lib is added. > > Adjust the dependency and the configure environ settings to > build the curvetun tool. > > Signed-off-by: Yi Zheng <goodmenzy@gmail.com> > --- > package/netsniff-ng/netsniff-ng.mk | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/netsniff-ng/netsniff-ng.mk > b/package/netsniff-ng/netsniff-ng.mk > index 283ecaf245..34a9fd8a3a 100644 > --- a/package/netsniff-ng/netsniff-ng.mk > +++ b/package/netsniff-ng/netsniff-ng.mk > @@ -11,9 +11,10 @@ NETSNIFF_NG_LICENSE = GPL-2.0 > NETSNIFF_NG_LICENSE_FILES = README COPYING > # Prevent netsniff-ng configure script from finding a host installed nacl > NETSNIFF_NG_CONF_ENV = \ > - NACL_INC_DIR=/dev/null \ > - NACL_LIB_DIR=/dev/null probably you need to check if BR2_PACKAGE_LIBSODIUM is selected and only then link with it and add to dependencies list ? > -NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu > + NACL_INC_DIR=$(STAGING_DIR)/usr/include/sodium \ > + NACL_LIB_DIR=$(STAGING_DIR)/lib\ > + NACL_LIB=sodium > +NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack > liburcu libsodium > > ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y) > NETSNIFF_NG_DEPENDENCIES += libcli libnet > -- > 2.23.0 Regards, Vadym Kochan ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] netsniff-ng: add libsodium/nacl dependency, to build curvetun tool 2019-11-04 8:24 ` Vadim Kochan @ 2019-11-04 13:58 ` Yi Zheng 2019-11-04 21:57 ` Yann E. MORIN 0 siblings, 1 reply; 5+ messages in thread From: Yi Zheng @ 2019-11-04 13:58 UTC (permalink / raw) To: buildroot The tool 'curvetun' in netsniff-ng package can only be built when NACL/Sodium lib is added. Adjust the dependency and the configure environ settings to build the curvetun tool. Signed-off-by: Yi Zheng <goodmenzy@gmail.com> --- Makefile | 1 + package/netsniff-ng/Config.in | 5 +++++ package/netsniff-ng/netsniff-ng.mk | 13 ++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bab34ab9b5..e028a0dc60 100644 --- a/Makefile +++ b/Makefile @@ -1198,3 +1198,4 @@ include docs/manual/manual.mk .PHONY: $(noconfig_targets) endif #umask / $(CURDIR) / $(O) + diff --git a/package/netsniff-ng/Config.in b/package/netsniff-ng/Config.in index 5d1407baac..9adae0510a 100644 --- a/package/netsniff-ng/Config.in +++ b/package/netsniff-ng/Config.in @@ -27,6 +27,11 @@ config BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN comment "mausezahn needs glibc or musl toolchain" depends on BR2_TOOLCHAIN_USES_UCLIBC +config BR2_PACKAGE_NETSNIFF_NG_CURVETUN + bool "curvetun" + default y + select BR2_PACKAGE_LIBSODIUM + endif comment "netsniff-ng needs a toolchain w/ threads, headers >= 3.0" diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk index 283ecaf245..b6b03403ad 100644 --- a/package/netsniff-ng/netsniff-ng.mk +++ b/package/netsniff-ng/netsniff-ng.mk @@ -9,11 +9,22 @@ NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz NETSNIFF_NG_LICENSE = GPL-2.0 NETSNIFF_NG_LICENSE_FILES = README COPYING + +NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu + +ifeq ($(BR2_PACKAGE_NETSNIFF_NG_CURVETUN),y) +# Prevent netsniff-ng configure script from finding a host installed nacl +NETSNIFF_NG_CONF_ENV = \ + NACL_INC_DIR=$(STAGING_DIR)/usr/include/sodium \ + NACL_LIB_DIR=$(STAGING_DIR)/lib \ + NACL_LIB=sodium +NETSNIFF_NG_DEPENDENCIES += libsodium +else # Prevent netsniff-ng configure script from finding a host installed nacl NETSNIFF_NG_CONF_ENV = \ NACL_INC_DIR=/dev/null \ NACL_LIB_DIR=/dev/null -NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu +endif ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y) NETSNIFF_NG_DEPENDENCIES += libcli libnet -- 2.23.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] netsniff-ng: add libsodium/nacl dependency, to build curvetun tool 2019-11-04 13:58 ` [Buildroot] [PATCH] netsniff-ng: add libsodium/nacl dependency, to build curvetun tool Yi Zheng @ 2019-11-04 21:57 ` Yann E. MORIN 2019-11-05 0:15 ` Yi Zheng 0 siblings, 1 reply; 5+ messages in thread From: Yann E. MORIN @ 2019-11-04 21:57 UTC (permalink / raw) To: buildroot Zheng, All, On 2019-11-04 21:58 +0800, Yi Zheng spake thusly: > The tool 'curvetun' in netsniff-ng package can only be built > when NACL/Sodium lib is added. > > Adjust the dependency and the configure environ settings to > build the curvetun tool. Thanks for this new version of the patch. I have a few comments about it. First, the title should be something like: package/netsniff-ng: add option to build curvetun Second, your patch does not apply as-is: the TABs have been replaced by spaces. Please, can you use 'git send-emal' to send the patches, as this keeps the integrity of the patch, next time? > Signed-off-by: Yi Zheng <goodmenzy@gmail.com> > --- > Makefile | 1 + > package/netsniff-ng/Config.in | 5 +++++ > package/netsniff-ng/netsniff-ng.mk | 13 ++++++++++++- > 3 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index bab34ab9b5..e028a0dc60 100644 > --- a/Makefile > +++ b/Makefile > @@ -1198,3 +1198,4 @@ include docs/manual/manual.mk > .PHONY: $(noconfig_targets) > > endif #umask / $(CURDIR) / $(O) > + Spurious empty line change. > diff --git a/package/netsniff-ng/Config.in b/package/netsniff-ng/Config.in > index 5d1407baac..9adae0510a 100644 > --- a/package/netsniff-ng/Config.in > +++ b/package/netsniff-ng/Config.in > @@ -27,6 +27,11 @@ config BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN > comment "mausezahn needs glibc or musl toolchain" > depends on BR2_TOOLCHAIN_USES_UCLIBC > > +config BR2_PACKAGE_NETSNIFF_NG_CURVETUN > + bool "curvetun" > + default y We usually do not use 'default y' for optional features, especially when such a feature was previously disabled anyway. Note that mausezahn is a special case, because it is an optional feature that was previously always built, so it got a 'default y' to keep old (def)config files working. > + select BR2_PACKAGE_LIBSODIUM > + > endif > > comment "netsniff-ng needs a toolchain w/ threads, headers >= 3.0" > diff --git a/package/netsniff-ng/netsniff-ng.mk > b/package/netsniff-ng/netsniff-ng.mk > index 283ecaf245..b6b03403ad 100644 > --- a/package/netsniff-ng/netsniff-ng.mk > +++ b/package/netsniff-ng/netsniff-ng.mk > @@ -9,11 +9,22 @@ NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng > NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz > NETSNIFF_NG_LICENSE = GPL-2.0 > NETSNIFF_NG_LICENSE_FILES = README COPYING > + > +NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu > + > +ifeq ($(BR2_PACKAGE_NETSNIFF_NG_CURVETUN),y) > +# Prevent netsniff-ng configure script from finding a host installed nacl > +NETSNIFF_NG_CONF_ENV = \ > + NACL_INC_DIR=$(STAGING_DIR)/usr/include/sodium \ > + NACL_LIB_DIR=$(STAGING_DIR)/lib \ libsodium is in $(STAGING_DIR)/usr/lib, not in .../lib but bizarrely enough, this patch still produced a curvetune properly linked with libsodium... Can you check whether those options (NACL_INC_DIR and NACL_LIB_DIR) are indeed really needed? Probably, keeping NACL_LIB=sodium might be jsut enough... Regards, Yann E. MORIN. > + NACL_LIB=sodium > +NETSNIFF_NG_DEPENDENCIES += libsodium > +else > # Prevent netsniff-ng configure script from finding a host installed nacl > NETSNIFF_NG_CONF_ENV = \ > NACL_INC_DIR=/dev/null \ > NACL_LIB_DIR=/dev/null > -NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu > +endif > > ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y) > NETSNIFF_NG_DEPENDENCIES += libcli libnet > -- > 2.23.0 > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] netsniff-ng: add libsodium/nacl dependency, to build curvetun tool 2019-11-04 21:57 ` Yann E. MORIN @ 2019-11-05 0:15 ` Yi Zheng 0 siblings, 0 replies; 5+ messages in thread From: Yi Zheng @ 2019-11-05 0:15 UTC (permalink / raw) To: buildroot Hi Yann, About TAB problem, it is hard for me! Currently, I can only access my gmail by web. My MUTT mailer is forbidden to send mail by the GFW in China. I'll try to find the right way to commit the patch by mail. Damn it, those who developed the GFW will be cursed! Yann E. MORIN <yann.morin.1998@free.fr> ?2019?11?5??? ??5:57??? > > Zheng, All, > > On 2019-11-04 21:58 +0800, Yi Zheng spake thusly: > > The tool 'curvetun' in netsniff-ng package can only be built > > when NACL/Sodium lib is added. > > > > Adjust the dependency and the configure environ settings to > > build the curvetun tool. > > Thanks for this new version of the patch. I have a few comments about > it. > > First, the title should be something like: > > package/netsniff-ng: add option to build curvetun > > Second, your patch does not apply as-is: the TABs have been replaced by > spaces. Please, can you use 'git send-emal' to send the patches, as this > keeps the integrity of the patch, next time? > > > Signed-off-by: Yi Zheng <goodmenzy@gmail.com> > > --- > > Makefile | 1 + > > package/netsniff-ng/Config.in | 5 +++++ > > package/netsniff-ng/netsniff-ng.mk | 13 ++++++++++++- > > 3 files changed, 18 insertions(+), 1 deletion(-) > > > > diff --git a/Makefile b/Makefile > > index bab34ab9b5..e028a0dc60 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -1198,3 +1198,4 @@ include docs/manual/manual.mk > > .PHONY: $(noconfig_targets) > > > > endif #umask / $(CURDIR) / $(O) > > + > > Spurious empty line change. > > > diff --git a/package/netsniff-ng/Config.in b/package/netsniff-ng/Config.in > > index 5d1407baac..9adae0510a 100644 > > --- a/package/netsniff-ng/Config.in > > +++ b/package/netsniff-ng/Config.in > > @@ -27,6 +27,11 @@ config BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN > > comment "mausezahn needs glibc or musl toolchain" > > depends on BR2_TOOLCHAIN_USES_UCLIBC > > > > +config BR2_PACKAGE_NETSNIFF_NG_CURVETUN > > + bool "curvetun" > > + default y > > We usually do not use 'default y' for optional features, especially > when such a feature was previously disabled anyway. > > Note that mausezahn is a special case, because it is an optional feature > that was previously always built, so it got a 'default y' to keep old > (def)config files working. > > > + select BR2_PACKAGE_LIBSODIUM > > + > > endif > > > > comment "netsniff-ng needs a toolchain w/ threads, headers >= 3.0" > > diff --git a/package/netsniff-ng/netsniff-ng.mk > > b/package/netsniff-ng/netsniff-ng.mk > > index 283ecaf245..b6b03403ad 100644 > > --- a/package/netsniff-ng/netsniff-ng.mk > > +++ b/package/netsniff-ng/netsniff-ng.mk > > @@ -9,11 +9,22 @@ NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng > > NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz > > NETSNIFF_NG_LICENSE = GPL-2.0 > > NETSNIFF_NG_LICENSE_FILES = README COPYING > > + > > +NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu > > + > > +ifeq ($(BR2_PACKAGE_NETSNIFF_NG_CURVETUN),y) > > +# Prevent netsniff-ng configure script from finding a host installed nacl > > +NETSNIFF_NG_CONF_ENV = \ > > + NACL_INC_DIR=$(STAGING_DIR)/usr/include/sodium \ > > + NACL_LIB_DIR=$(STAGING_DIR)/lib \ > > libsodium is in $(STAGING_DIR)/usr/lib, not in .../lib but bizarrely > enough, this patch still produced a curvetune properly linked with > libsodium... > > Can you check whether those options (NACL_INC_DIR and NACL_LIB_DIR) are > indeed really needed? Probably, keeping NACL_LIB=sodium might be jsut > enough... > > Regards, > Yann E. MORIN. > > > + NACL_LIB=sodium > > +NETSNIFF_NG_DEPENDENCIES += libsodium > > +else > > # Prevent netsniff-ng configure script from finding a host installed nacl > > NETSNIFF_NG_CONF_ENV = \ > > NACL_INC_DIR=/dev/null \ > > NACL_LIB_DIR=/dev/null > > -NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu > > +endif > > > > ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y) > > NETSNIFF_NG_DEPENDENCIES += libcli libnet > > -- > > 2.23.0 > > _______________________________________________ > > buildroot mailing list > > buildroot at busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-05 0:15 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-11-04 4:01 [Buildroot] [PATCH] netsniff-ng: add dependency on libsodium Yi Zheng 2019-11-04 8:24 ` Vadim Kochan 2019-11-04 13:58 ` [Buildroot] [PATCH] netsniff-ng: add libsodium/nacl dependency, to build curvetun tool Yi Zheng 2019-11-04 21:57 ` Yann E. MORIN 2019-11-05 0:15 ` Yi Zheng
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox