mirror of
https://github.com/openwrt/packages.git
synced 2026-10-12 05:57:04 +04:00
libnetconf2: update to 4.4.10
Jump from the 3.x series to 4.x, which tracks libyang 5.x and moves its SONAME from libnetconf2.so.3 to libnetconf2.so.5. Switch DEPENDS back to +libyang and drop the legacy staging prefix override. ENABLE_PAM=OFF is upstream now, so its patch goes away. 4.x owns the transport YANG modules netopeer2 registers at first boot, so ship them to /etc/netconf2/modules. Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
This commit is contained in:
1 parent
48ad8589bc
commit
5450e21134
3 files changed
+25
-37
No files matched your search
@@ -8,12 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libnetconf2
|
||||
PKG_VERSION:=3.7.10
|
||||
PKG_VERSION:=4.4.10
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/CESNET/libnetconf2/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=7146932ea4fc8e12b9152e23e18e46699174c531ef1e0fc351b05fcd12295a81
|
||||
PKG_HASH:=ee52910da3e09f7cfb00f980ec7adb66b792373278b28ec43476934cb123112b
|
||||
|
||||
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
@@ -25,15 +25,14 @@ include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/cmake.mk
|
||||
|
||||
CMAKE_OPTIONS += \
|
||||
-DENABLE_PAM=OFF \
|
||||
-DCMAKE_PREFIX_PATH=$(STAGING_DIR)/usr/lib/libyang-legacy
|
||||
-DENABLE_PAM=OFF
|
||||
|
||||
define Package/libnetconf2
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
TITLE:=NETCONF library
|
||||
URL:=https://github.com/CESNET/libnetconf2
|
||||
DEPENDS:=+libyang-legacy +libcurl +libssh +libopenssl +libpthread
|
||||
DEPENDS:=+libyang +libcurl +libssh +libopenssl +libpthread
|
||||
endef
|
||||
|
||||
define Package/libnetconf2/description
|
||||
@@ -46,6 +45,9 @@ endef
|
||||
define Package/libnetconf2/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetconf2.so* $(1)/usr/lib/
|
||||
|
||||
$(INSTALL_DIR) $(1)/etc/netconf2/modules
|
||||
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yang/modules/libnetconf2/*.yang $(1)/etc/netconf2/modules/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,libnetconf2))
|
||||
@@ -1,32 +0,0 @@
|
||||
From 7216d51cae92bfd1c4d59d959ecf90898183912b Mon Sep 17 00:00:00 2001
|
||||
From: Christian Marangi <ansuelsmth@gmail.com>
|
||||
Date: Tue, 25 Nov 2025 16:12:27 +0100
|
||||
Subject: [PATCH] CMakeLists: permit to disable PAM support
|
||||
|
||||
Introduce a CMake option ENABLE_PAM to force disable PAM support even if
|
||||
it's detected.
|
||||
|
||||
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -100,6 +100,7 @@ set(MAX_PSPOLL_THREAD_COUNT 6 CACHE STRI
|
||||
set(TIMEOUT_STEP 100 CACHE STRING "Number of microseconds tasks are repeated until timeout elapses")
|
||||
set(YANG_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/yang/modules/libnetconf2" CACHE STRING "Directory where to copy the YANG modules to")
|
||||
set(CLIENT_SEARCH_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/yang/modules" CACHE STRING "Default NC client YANG module search directory")
|
||||
+option(ENABLE_PAM "Detect and use PAM" ON)
|
||||
|
||||
#
|
||||
# sources
|
||||
@@ -282,7 +283,7 @@ if(ENABLE_SSH_TLS)
|
||||
|
||||
# libpam
|
||||
find_package(LibPAM)
|
||||
- if(LibPAM_FOUND)
|
||||
+ if(LibPAM_FOUND AND ENABLE_PAM)
|
||||
set(HAVE_LIBPAM TRUE)
|
||||
|
||||
target_link_libraries(netconf2 ${LIBPAM_LIBRARIES})
|
||||
Executable
+18
@@ -0,0 +1,18 @@
|
||||
#!/bin/sh
|
||||
|
||||
case "$1" in
|
||||
libnetconf2)
|
||||
[ -e /usr/lib/libnetconf2.so ] || {
|
||||
echo "libnetconf2.so not found" >&2
|
||||
exit 1
|
||||
}
|
||||
[ -e /usr/lib/libnetconf2.so.5 ] || {
|
||||
echo "libnetconf2.so.5 not found" >&2
|
||||
exit 1
|
||||
}
|
||||
;;
|
||||
*)
|
||||
echo "Unsupported test target: $1" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
Reference in new issue
Block a user