diff --git a/libs/libnetconf2/Makefile b/libs/libnetconf2/Makefile index 96b59c0b4..3160d9c01 100644 --- a/libs/libnetconf2/Makefile +++ b/libs/libnetconf2/Makefile @@ -12,11 +12,11 @@ PKG_NAME:=libnetconf2 PKG_LICENSE:=BSD-3-Clause PKG_MAINTAINER:=Mislav Novakovic -PKG_VERSION:=0.10.17 +PKG_VERSION:=0.11.37 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=bd93b091d6e4414283c6c764dc451aee61e09997 -PKG_MIRROR_HASH:=499847be79d202cb0c933aad8133a38ebca7099344a1194404e488aa4d10ff08 +PKG_SOURCE_VERSION:=46d56e08b161eb60f37410dae4d5e1a8a1bedd58 +PKG_MIRROR_HASH:=e12007b69eee42d1eb9925a93bcac7a71139583a76a59c78039b48cc20fc431f PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/cesnet/libnetconf2/ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) diff --git a/libs/libyang/Makefile b/libs/libyang/Makefile index 902951967..c0f8aad1a 100644 --- a/libs/libyang/Makefile +++ b/libs/libyang/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libyang -PKG_VERSION:=0.14.53 +PKG_VERSION:=0.15.130 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_LICENSE:=GPL-2.0+ PKG_MAINTAINER:=Mislav Novakovic PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=2698bd6484526facbf82b1263810b938b82a2f23 -PKG_MIRROR_HASH:=3bfe4fd8236f0d1903d275aa76e039645d1093ef4204ab3b9bef46aecbe68f72 +PKG_SOURCE_VERSION:=d6baaf90e24af3b07649e9dda6fc0d9b272b2ebc +PKG_MIRROR_HASH:=eace667ae787ac27b7c717a52f672d05e55608c47d9e54d39d60f8ab5e47f0c9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/CESNET/libyang.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) @@ -73,7 +73,10 @@ define Package/libyang/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libyang.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/libyang - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyang/* $(1)/usr/lib/libyang/ + $(INSTALL_DIR) $(1)/usr/lib/libyang/extensions + $(INSTALL_DIR) $(1)/usr/lib/libyang/user_types + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyang/extensions/* $(1)/usr/lib/libyang/extensions + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyang/user_types/* $(1)/usr/lib/libyang/user_types endef define Package/yanglint/install diff --git a/libs/libyang/patches/001-fix-musl-issue.patch b/libs/libyang/patches/001-fix-musl-issue.patch deleted file mode 100644 index b497c9d16..000000000 --- a/libs/libyang/patches/001-fix-musl-issue.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: libyang-0.14.53-2698bd6484526facbf82b1263810b938b82a2f23/src/extensions.c -=================================================================== ---- libyang-0.14.53-2698bd6484526facbf82b1263810b938b82a2f23.orig/src/extensions.c -+++ libyang-0.14.53-2698bd6484526facbf82b1263810b938b82a2f23/src/extensions.c -@@ -123,11 +123,14 @@ lyext_load_plugins(void) - - /* and construct the filepath */ - asprintf(&str, "%s/%s", pluginsdir, file->d_name); -- -- /* load the plugin - first, try if it is already loaded... */ -- dlhandler = dlopen(str, RTLD_NOW | RTLD_NOLOAD); -- dlerror(); /* Clear any existing error */ -- if (dlhandler) { -+ /* load the plugin */ -+ dlhandler = dlopen(str, RTLD_NOW); -+ if (!dlhandler) { -+ LOGERR(LY_ESYS, "Loading \"%s\" as a plugin failed (%s).", str, dlerror()); -+ free(str); -+ continue; -+ } -+ if (ly_set_contains(&dlhandlers, dlhandler) != -1) { - /* the plugin is already loaded */ - LOGVRB("Extension plugin \"%s\" already loaded.", str); - free(str); -@@ -137,14 +140,6 @@ lyext_load_plugins(void) - continue; - } - -- /* ... and if not, load it */ -- dlhandler = dlopen(str, RTLD_NOW); -- if (!dlhandler) { -- LOGERR(LY_ESYS, "Loading \"%s\" as an extension plugin failed (%s).", str, dlerror()); -- free(str); -- continue; -- } -- LOGVRB("Extension plugin \"%s\" successfully loaded.", str); - free(str); - dlerror(); /* Clear any existing error */ - -@@ -156,6 +151,7 @@ lyext_load_plugins(void) - dlclose(dlhandler); - continue; - } -+ LOGVRB("Plugin \"%s\" successfully loaded.", str) - - for(u = 0; plugin[u].name; u++) { - /* check extension implementations for collisions */ diff --git a/net/netopeer2/Makefile b/net/netopeer2/Makefile index b9f296866..09668f0f2 100644 --- a/net/netopeer2/Makefile +++ b/net/netopeer2/Makefile @@ -14,11 +14,11 @@ PKG_NAME:=netopeer2 PKG_LICENSE:=BSD-3-Clause PKG_MAINTAINER:=Mislav Novakovic -PKG_VERSION:=0.4.13 +PKG_VERSION:=0.5.26 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=ae560bef2e70d274f6d028b59e3cb398ea2a621d -PKG_MIRROR_HASH:=43b7f9c436afc76de539a7426b1462249326318b9b836f1d49282106a730a6b8 +PKG_SOURCE_VERSION:=3b99e99c9d507ddc89d21d7f1cbded494e6aa72e +PKG_MIRROR_HASH:=d29b501d56bf9a2480759cc55368c842f69b07722afb3a0a70f05d6088f72574 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/CESNET/Netopeer2.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) @@ -86,6 +86,8 @@ define Package/netopeer2-server/install $(INSTALL_DATA) $(PKG_BUILD_ROOT)/modules/iana-crypt-hash.yang $(1)/etc/sysrepo/yang/iana-crypt-hash@2014-08-06.yang $(INSTALL_DATA) $(PKG_BUILD_ROOT)/modules/ietf-x509-cert-to-name.yang $(1)/etc/sysrepo/yang/ietf-x509-cert-to-name@2014-12-10.yang $(INSTALL_DATA) $(PKG_BUILD_ROOT)/modules/ietf-netconf-server.yang $(1)/etc/sysrepo/yang/ietf-netconf-server@2016-11-02.yang + $(INSTALL_DATA) $(PKG_BUILD_ROOT)/modules/ietf-netconf-monitoring.yang $(1)/etc/sysrepo/yang/ietf-netconf-monitoring@2010-10-04.yang + $(INSTALL_DATA) $(PKG_BUILD_ROOT)/modules/ietf-netconf-with-defaults.yang $(1)/etc/sysrepo/yang/ietf-netconf-with-defaults@2011-06-01.yang $(INSTALL_DATA) $(PKG_BUILD_ROOT)/modules/ietf-system.yang $(1)/etc/sysrepo/yang/ietf-system@2014-08-06.yang $(INSTALL_DIR) $(1)/etc/uci-defaults diff --git a/net/netopeer2/files/netopeer2-server.default b/net/netopeer2/files/netopeer2-server.default index 8a7b7fe7e..a93127036 100644 --- a/net/netopeer2/files/netopeer2-server.default +++ b/net/netopeer2/files/netopeer2-server.default @@ -34,6 +34,16 @@ if [ -x /bin/sysrepoctl ]; then fi fi + match=$(sysrepoctl -l | grep "ietf-netconf-monitoring ") + if [ ! "$match" ]; then + sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-monitoring@2010-10-04.yang -o root:root -p 600 + fi + + match=$(sysrepoctl -l | grep "ietf-netconf-with-defaults ") + if [ ! "$match" ]; then + sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-with-defaults@2011-06-01.yang -o root:root -p 600 + fi + match=$(sysrepoctl -l | grep "ietf-system ") if [ ! "$match" ]; then sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-system@2014-08-06.yang -o root:root -p 600 diff --git a/net/netopeer2/patches/002-fix-for-cmake-build b/net/netopeer2/patches/001-fix-for-cmake-build similarity index 82% rename from net/netopeer2/patches/002-fix-for-cmake-build rename to net/netopeer2/patches/001-fix-for-cmake-build index bd29d4d7d..920086a7c 100644 --- a/net/netopeer2/patches/002-fix-for-cmake-build +++ b/net/netopeer2/patches/001-fix-for-cmake-build @@ -43,6 +43,15 @@ Index: netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/keystored/CMake project(keystored C) include(GNUInstallDirs) +@@ -140,7 +140,7 @@ if (SSH_KEY_INSTALL) + execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ssh-key-import.sh)") + endif() + +-add_custom_target(install-scripts-ide ++add_custom_target(install-scripts-ide-keystored + scripts/model-install.sh + scripts/ssh-key-import.sh + ) Index: netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/server/CMakeLists.txt =================================================================== --- netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d.orig/server/CMakeLists.txt @@ -56,3 +65,10 @@ Index: netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/server/CMakeLis project(netopeer2-server C) include(GNUInstallDirs) +@@ -176,7 +176,7 @@ if (ENABLE_CONFIGURATION) + execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/model-install.sh)") + endif() + +-add_custom_target(install-scripts-ide ++add_custom_target(install-scripts-ide-server + scripts/model-install.sh diff --git a/net/netopeer2/patches/001-remove-sysrepoctl-commands-from-cmake b/net/netopeer2/patches/001-remove-sysrepoctl-commands-from-cmake deleted file mode 100644 index 1d14ee0bf..000000000 --- a/net/netopeer2/patches/001-remove-sysrepoctl-commands-from-cmake +++ /dev/null @@ -1,40 +0,0 @@ -Index: netopeer2-c204b59f9c2bb7e63eb907f33c44adbf208295ee/keystored/CMakeLists.txt -=================================================================== ---- netopeer2-c204b59f9c2bb7e63eb907f33c44adbf208295ee.orig/keystored/CMakeLists.txt -+++ netopeer2-c204b59f9c2bb7e63eb907f33c44adbf208295ee/keystored/CMakeLists.txt -@@ -105,6 +105,7 @@ endif() - install(DIRECTORY DESTINATION ${KEYSTORED_KEYS_DIR} - DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE) - -+if(FALSE) - # install all the required modules and enable features - install(CODE " - execute_process(COMMAND ${SYSREPOCTL_EXECUTABLE} -l RESULT_VARIABLE RET OUTPUT_VARIABLE INSTALLED_MODULES ERROR_VARIABLE OUT) -@@ -154,6 +155,7 @@ install(CODE " - message(FATAL_ERROR \" Command sysrepocfg import failed:\\n \${OUT}\") - endif() - endif()") -+endif() - - # plugins should be installed into sysrepo plugins dir - install(TARGETS keystored DESTINATION ${SR_PLUGINS_DIR}) -Index: netopeer2-c204b59f9c2bb7e63eb907f33c44adbf208295ee/server/CMakeLists.txt -=================================================================== ---- netopeer2-c204b59f9c2bb7e63eb907f33c44adbf208295ee.orig/server/CMakeLists.txt -+++ netopeer2-c204b59f9c2bb7e63eb907f33c44adbf208295ee/server/CMakeLists.txt -@@ -147,6 +147,7 @@ include_directories(${SYSREPO_INCLUDE_DI - # install binary - install(TARGETS netopeer2-server DESTINATION ${CMAKE_INSTALL_BINDIR}) - -+if(FALSE) - # only for configuration - if (ENABLE_CONFIGURATION) - # find sysrepoctl -@@ -239,6 +240,7 @@ if (ENABLE_CONFIGURATION) - - endif()") - endif() -+endif() - - # clean cmake cache - add_custom_target(cleancache diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile index a916f9cb2..a3b701166 100644 --- a/net/sysrepo/Makefile +++ b/net/sysrepo/Makefile @@ -11,12 +11,12 @@ PKG_LICENSE:=ASL-2.0 PKG_MAINTAINER:=Mislav Novakovic PKG_NAME:=sysrepo -PKG_VERSION:=0.7.3 +PKG_VERSION:=0.7.4 PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=91e65c6f7d8826197b2806ab6d5466d16882b07f -PKG_MIRROR_HASH:=41662c158d5eac3e6c9f400517bd02b1967632f3d8b3516523da669bbd1c28c4 +PKG_SOURCE_VERSION:=724a62fa830df7fcb2736b1ec41b320abe5064d2 +PKG_MIRROR_HASH:=19b864c52a35fd71398b2c965f87c37901a7056a2afd6b740105a5235bd459b1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/sysrepo/sysrepo.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) @@ -128,7 +128,7 @@ define Package/libsysrepo/install $(INSTALL_DIR) $(1)/etc/sysrepo/yang $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf-acm@2012-02-22.yang $(1)/etc/sysrepo/yang/ietf-netconf-acm@2012-02-22.yang - $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf-notifications.yang $(1)/etc/sysrepo/yang/ietf-netconf-notifications@2012-02-06..yang + $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf-notifications.yang $(1)/etc/sysrepo/yang/ietf-netconf-notifications@2012-02-06.yang $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/nc-notifications.yang $(1)/etc/sysrepo/yang/nc-notifications@2008-07-14.yang $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/notifications.yang $(1)/etc/sysrepo/yang/notifications@2008-07-14.yang $(INSTALL_DATA) $(PKG_BUILD_DIR)/yang/ietf-netconf@2011-06-01.yang $(1)/etc/sysrepo/yang/ietf-netconf@2011-06-01.yang diff --git a/net/sysrepo/files/libsysrepo.default b/net/sysrepo/files/libsysrepo.default index 35b56f67d..274a6c066 100644 --- a/net/sysrepo/files/libsysrepo.default +++ b/net/sysrepo/files/libsysrepo.default @@ -3,30 +3,36 @@ # Warning, problems can occur if the device restarts in the middle of this uci-default script if [ -x /bin/sysrepoctl ]; then - match=$(sysrepoctl -l | grep "ietf-netconf-acm ") + match=$(sysrepoctl -l | grep "notifications ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-acm@2012-02-22.yang -p 644 + sysrepoctl --install --yang=/etc/sysrepo/yang/notifications@2008-07-14.yang -p 666 fi - match=$(sysrepoctl -l | grep "ietf-netconf-notifications ") + match=$(sysrepoctl -l | grep "nc-notifications ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-notifications@2012-02-06..yang -p 600 + sysrepoctl --install --yang=/etc/sysrepo/yang/nc-notifications@2008-07-14.yang -p 666 fi - match=$(sysrepoctl -l | grep "nc-notifications ") + match=$(sysrepoctl -l | grep "ietf-netconf-acm ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/nc-notifications@2008-07-14.yang -p 666 + sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-acm@2012-02-22.yang -p 644 fi - match=$(sysrepoctl -l | grep "notifications ") + match=$(sysrepoctl -l | grep "ietf-netconf-notifications ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/notifications@2008-07-14.yang -p 666 + sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-notifications@2012-02-06.yang -p 600 fi match=$(sysrepoctl -l | grep "ietf-netconf ") if [ ! "$match" ]; then sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf@2011-06-01.yang -p 600 fi + sysrepoctl -m ietf-netconf -e writable-running + sysrepoctl -m ietf-netconf -e candidate + sysrepoctl -m ietf-netconf -e rollback-on-error + sysrepoctl -m ietf-netconf -e validate + sysrepoctl -m ietf-netconf -e startup + sysrepoctl -m ietf-netconf -e xpath fi exit 0