mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-09 17:03:35 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libnetconf2: bump to version 3.7.1

Browse Source 
Changelog:
  error-path data node
  now using proper format so in rpc-reply uses XML XPath format instead of JSON
  several bugfixes and improvements

Depends on libyang v3.12.2:

  https://github.com/CESNET/libyang/releases/tag/v3.12.2

As part of this version bump, the ENABLE_SSH and ENABLE_TLS options
have been dropped by upstream in favor of a single ENABLE_SSH_TLS
option, which requires openssl or mbedtls, libcurl and libssh. Since
this is getting quite complicated to handle as an implicit optional
dependency, we make this explicit with a new sub-option
BR2_PACKAGE_LIBNETCONF2_SSH_TLS that ensures everything needed is
enabled.

In theory, libnetconf2 can use either mbedtls or openssl for crypto,
but netopeer2 will only work if OpenSSL is used, so we only allow
using OpenSSL until that gets fixed upstream.

The netopeer2 package, which needs SSH/TLS support in libnetconf2 is
updated accordingly (and actually becomes simpler).

Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Mattias Walström
2025-05-12 19:35:03 +02:00
committed by Thomas Petazzoni
parent 2ad082971a
commit eeb49a1f1f
4 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
package/libnetconf2/Config.in
View File

@@ -12,6 +12,24 @@ config BR2_PACKAGE_LIBNETCONF2
https://github.com/CESNET/libnetconf2
if BR2_PACKAGE_LIBNETCONF2
config BR2_PACKAGE_LIBNETCONF2_SSH_TLS
bool "SSH/TLS support"
depends on BR2_USE_MMU # libssh
depends on !BR2_STATIC_LIBS # libssh
depends on BR2_TOOLCHAIN_HAS_THREADS # libssh
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBSSH
select BR2_PACKAGE_LIBSSH_SERVER
comment "SSH/TLS support needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
endif
comment "libnetconf2 needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4

2
package/libnetconf2/libnetconf2.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated
sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz
sha256 c95c00ad887295d1fa31098c859c74e330eead78b2eee8d008701af2d9df80e5 libnetconf2-3.7.1.tar.gz
sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE

21
package/libnetconf2/libnetconf2.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
LIBNETCONF2_VERSION = 2.1.28
LIBNETCONF2_VERSION = 3.7.1
LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION))
LIBNETCONF2_INSTALL_STAGING = YES
LIBNETCONF2_LICENSE = BSD-3-Clause
@@ -16,18 +16,16 @@ LIBNETCONF2_CONF_OPTS = \
-DENABLE_TESTS=OFF \
-DENABLE_VALGRIND_TESTS=OFF
ifeq ($(BR2_PACKAGE_LIBSSH_SERVER), y)
LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=ON
LIBNETCONF2_DEPENDENCIES += libssh
ifeq ($(BR2_PACKAGE_LIBNETCONF2_SSH_TLS),y)
LIBNETCONF2_CONF_OPTS += -DENABLE_SSH_TLS=ON
LIBNETCONF2_DEPENDENCIES += libcurl libssh
ifeq ($(BR2_PACKAGE_MBEDTLS),y)
LIBNETCONF2_DEPENDENCIES += mbedtls
else
LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=OFF
endif
ifeq ($(BR2_PACKAGE_LIBOPENSSL), y)
LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=ON
LIBNETCONF2_DEPENDENCIES += openssl
endif
else
LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=OFF
LIBNETCONF2_CONF_OPTS += -DENABLE_SSH_TLS=OFF
endif
ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
@@ -37,8 +35,7 @@ endif
HOST_LIBNETCONF2_CONF_OPTS = \
-DENABLE_TESTS=OFF \
-DENABLE_VALGRIND_TESTS=OFF \
-DENABLE_SSH=OFF \
-DENABLE_TLS=OFF
-DENABLE_SSH_TLS=OFF
$(eval $(cmake-package))
$(eval $(host-cmake-package))

8
package/netopeer2/Config.in
View File

@@ -6,17 +6,15 @@ comment "netopeer2 needs a toolchain w/ gcc >= 4.8, C++, threads, dynamic librar
config BR2_PACKAGE_NETOPEER2
bool "netopeer2"
depends on BR2_USE_MMU # libnetconf2, libssh, sysrepo
depends on BR2_USE_MMU # libnetconf2, sysrepo
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libyang
depends on !BR2_STATIC_LIBS # libnetconf2, libssh, libyang, sysrepo
depends on !BR2_STATIC_LIBS # libnetconf2, libyang, sysrepo
depends on BR2_INSTALL_LIBSTDCPP # sysrepo
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # sysrepo
select BR2_PACKAGE_LIBNETCONF2
select BR2_PACKAGE_LIBSSH
select BR2_PACKAGE_LIBSSH_SERVER # For libnetconf2 to have SSH
select BR2_PACKAGE_LIBNETCONF2_SSH_TLS
select BR2_PACKAGE_LIBYANG
select BR2_PACKAGE_OPENSSL # For libnetconf2 to have TLS
select BR2_PACKAGE_SYSREPO
help
Netopeer2 is a set of tools implementing network configuration