From 422c3b9d3fc433c0da5715a6c775261fc176997a Mon Sep 17 00:00:00 2001 From: Mislav Novakovic Date: Thu, 12 Oct 2017 11:27:25 +0200 Subject: [PATCH 1/4] libyang: bump to latest version Signed-off-by: Mislav Novakovic --- libs/libyang/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libyang/Makefile b/libs/libyang/Makefile index 29c416b0a..cb198c049 100644 --- a/libs/libyang/Makefile +++ b/libs/libyang/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libyang -PKG_VERSION:=0.13.46 +PKG_VERSION:=0.13.75 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_LICENSE:=GPL-2.0+ PKG_MAINTAINER:=Mislav Novakovic PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=d1556e0ae3872d676dfd63bd6073fe7e72d0130f -PKG_MIRROR_HASH:=4a23a3854ceca147e113ab65ecdce3371e30b59436680e7d981b0bab6dbe751d +PKG_SOURCE_VERSION:=e11255e32a63fdafe31764f5d594bed46d08f6a9 +PKG_MIRROR_HASH:=916cbfd52a04c6b306afa5fb684299f202c1c235689d8b57546a6b4eb4cc5a39 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) From 240232a231797e36be1958cf419b3fd697a4dc29 Mon Sep 17 00:00:00 2001 From: Mislav Novakovic Date: Thu, 12 Oct 2017 11:27:42 +0200 Subject: [PATCH 2/4] libnetconf2: bump to latest version Signed-off-by: Mislav Novakovic --- libs/libnetconf2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libnetconf2/Makefile b/libs/libnetconf2/Makefile index 12e4bf11f..4bff51641 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.9.15 +PKG_VERSION:=0.9.22 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=cea46db1edb72231c9e009d7e6d6799256676eb8 -PKG_MIRROR_HASH:=a686754cef2ef29a511b8ea06d121f0ce562b570d6cea6c6a7562ff47b91d2a2 +PKG_SOURCE_VERSION:=8aafe1286cb4036b87054e6e1ca5edc34a31595c +PKG_MIRROR_HASH:=ac6fca84ba903825958afe313ff0795c34eb0865ed7b5003b7112afcb24b9d94 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) From cc9eedb7861eed0b7de7bf1f5fdf4030cf5f3d51 Mon Sep 17 00:00:00 2001 From: Mislav Novakovic Date: Thu, 12 Oct 2017 11:28:00 +0200 Subject: [PATCH 3/4] sysrepo: bump to latest version Signed-off-by: Mislav Novakovic --- net/sysrepo/Makefile | 6 +++--- net/sysrepo/files/sysrepo.init | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile index b832162db..3741dbc8a 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.0 +PKG_VERSION:=0.7.1 PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=7aa2f18d234267403147df92c0005c871f0aa840 -PKG_MIRROR_HASH:=31125596ae1c4dbf8dd48c639bf78043060ab1b89678c860eb2b10606fe4b686 +PKG_SOURCE_VERSION:=0b36f308574a60d7ee36b1a3118b999618bb40d8 +PKG_MIRROR_HASH:=d28ff0356b6ac4b934bb45ff77973efe7964b86a54270d11e1fd06a2af9bdbc8 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) diff --git a/net/sysrepo/files/sysrepo.init b/net/sysrepo/files/sysrepo.init index 9a4320133..abfcd66cd 100644 --- a/net/sysrepo/files/sysrepo.init +++ b/net/sysrepo/files/sysrepo.init @@ -23,6 +23,8 @@ start_service() { stop_service() { + kill -9 `ps | grep netopeer2-server | grep -v grep | awk '{print $1}'` >/dev/null 2>&1 service_stop ${PROG_PLUGIN} service_stop ${PROG_DEAMON} + rm -rf /var/run/sysrepo-subscriptions/* } From cd37f47e62be606fd49ab43ba7e94126979d4c29 Mon Sep 17 00:00:00 2001 From: Mislav Novakovic Date: Thu, 12 Oct 2017 11:28:17 +0200 Subject: [PATCH 4/4] netopeer2: bump to latest version Signed-off-by: Mislav Novakovic --- net/netopeer2/Makefile | 6 +- ...GFIX-replace-sr_get_iter-with-sr_get_items | 48 --------------- .../003-BUGFIX-for-missing-eaccess-in-uClibc | 59 ------------------- .../004-BUGFIX-for-missing-mkstemps-in-uClibc | 51 ---------------- 4 files changed, 3 insertions(+), 161 deletions(-) delete mode 100644 net/netopeer2/patches/002-server-BUGFIX-replace-sr_get_iter-with-sr_get_items delete mode 100644 net/netopeer2/patches/003-BUGFIX-for-missing-eaccess-in-uClibc delete mode 100644 net/netopeer2/patches/004-BUGFIX-for-missing-mkstemps-in-uClibc diff --git a/net/netopeer2/Makefile b/net/netopeer2/Makefile index fb136cb05..25da6cc1d 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.0 +PKG_VERSION:=0.4.3 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=d028c1f931819db4b3e3cb1fd2d349a4fd5c0459 -PKG_MIRROR_HASH:=7f5b3ad49aaf2a8ceea2c17a37e276f5694af570ef904cfc5a6f53d295809cef +PKG_SOURCE_VERSION:=e7c821cde14df31a03d23293f84e0aed9cb1a457 +PKG_MIRROR_HASH:=88a4c06e9cdb81879de7311138acbfe9fe5207db14fbb93c5ba4d6947d616aec 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) diff --git a/net/netopeer2/patches/002-server-BUGFIX-replace-sr_get_iter-with-sr_get_items b/net/netopeer2/patches/002-server-BUGFIX-replace-sr_get_iter-with-sr_get_items deleted file mode 100644 index 9cd4538fa..000000000 --- a/net/netopeer2/patches/002-server-BUGFIX-replace-sr_get_iter-with-sr_get_items +++ /dev/null @@ -1,48 +0,0 @@ -Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/server/ietf_netconf_server.c -=================================================================== ---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/server/ietf_netconf_server.c -+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/server/ietf_netconf_server.c -@@ -1161,8 +1161,8 @@ feature_change_ietf_netconf_server(const - { - int rc, rc2 = 0; - const char *path = NULL; -- sr_val_iter_t *sr_iter; -- sr_val_t *sr_val; -+ sr_val_t *values; -+ size_t value_cnt; - - assert(feature_name); - -@@ -1180,26 +1180,26 @@ feature_change_ietf_netconf_server(const - return EXIT_SUCCESS; - } - -- rc = sr_get_items_iter(np2srv.sr_sess.srs, path, &sr_iter); -+ rc =sr_get_items(np2srv.sr_sess.srs, path, &values, &value_cnt); - if (rc != SR_ERR_OK) { - ERR("Failed to get \"%s\" values iterator from sysrepo (%s).", sr_strerror(rc)); - return EXIT_FAILURE; - } - -- while ((rc = sr_get_item_next(np2srv.sr_sess.srs, sr_iter, &sr_val)) == SR_ERR_OK) { -- if (sr_val->type == SR_LIST_T) { -+ size_t i; -+ for(i = 0; i < value_cnt; i++) { -+ if (values[i].type == SR_LIST_T) { - /* no semantic meaning */ - continue; - } - -- rc2 = module_change_resolve(np2srv.sr_sess.srs, SR_OP_CREATED, NULL, sr_val, NULL, NULL); -- sr_free_val(sr_val); -+ rc2 = module_change_resolve(np2srv.sr_sess.srs, SR_OP_CREATED, NULL, &values[i], NULL, NULL); - if (rc2) { - ERR("Failed to enable nodes depending on the \"%s\" ietf-netconf-server feature.", feature_name); - break; - } - } -- sr_free_val_iter(sr_iter); -+ sr_free_values(values, value_cnt); - if (rc2) { - return EXIT_FAILURE; - } else if ((rc != SR_ERR_OK) && (rc != SR_ERR_NOT_FOUND)) { diff --git a/net/netopeer2/patches/003-BUGFIX-for-missing-eaccess-in-uClibc b/net/netopeer2/patches/003-BUGFIX-for-missing-eaccess-in-uClibc deleted file mode 100644 index 5314cdb48..000000000 --- a/net/netopeer2/patches/003-BUGFIX-for-missing-eaccess-in-uClibc +++ /dev/null @@ -1,59 +0,0 @@ -Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/CMakeLists.txt -=================================================================== ---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/CMakeLists.txt -+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/CMakeLists.txt -@@ -67,6 +67,9 @@ if(NOT MAN_INSTALL_DIR) - set(MAN_INSTALL_DIR share/man) - endif() - -+include(CheckFunctionExists) -+check_function_exists(eaccess HAVE_EACCESS) -+ - # install binary - install(TARGETS netopeer2-cli DESTINATION ${BIN_INSTALL_DIR}) - -Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/commands.c -=================================================================== ---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/commands.c -+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/commands.c -@@ -37,6 +37,10 @@ - # include - #endif - -+#ifndef HAVE_EACCESS -+#define eaccess access -+#endif -+ - #include "commands.h" - #include "configuration.h" - #include "completion.h" -Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/completion.c -=================================================================== ---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/completion.c -+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/completion.c -@@ -27,6 +27,10 @@ - - #include - -+#ifndef HAVE_EACCESS -+#define eaccess access -+#endif -+ - #include "commands.h" - #include "linenoise/linenoise.h" - -Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/configuration.c -=================================================================== ---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/configuration.c -+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/configuration.c -@@ -28,6 +28,10 @@ - #include - #include - -+#ifndef HAVE_EACCESS -+#define eaccess access -+#endif -+ - #include "configuration.h" - #include "commands.h" - #include "linenoise/linenoise.h" diff --git a/net/netopeer2/patches/004-BUGFIX-for-missing-mkstemps-in-uClibc b/net/netopeer2/patches/004-BUGFIX-for-missing-mkstemps-in-uClibc deleted file mode 100644 index 24460a18c..000000000 --- a/net/netopeer2/patches/004-BUGFIX-for-missing-mkstemps-in-uClibc +++ /dev/null @@ -1,51 +0,0 @@ -Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/CMakeLists.txt -=================================================================== ---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/CMakeLists.txt -+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/CMakeLists.txt -@@ -69,6 +69,10 @@ endif() - - include(CheckFunctionExists) - check_function_exists(eaccess HAVE_EACCESS) -+check_function_exists(mkstemps HAVE_MKSTEMPS) -+if(HAVE_MKSTEMPS) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_MKSTEMPS") -+endif(HAVE_MKSTEMPS) - - # install binary - install(TARGETS netopeer2-cli DESTINATION ${BIN_INSTALL_DIR}) -Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/completion.c -=================================================================== ---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/completion.c -+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/completion.c -@@ -120,6 +120,7 @@ readinput(const char *instruction, const - char* tmpname = NULL, *input = NULL, *old_content = NULL, *ptr, *ptr2; - - /* Create a unique temporary file */ -+#ifdef HAVE_MKSTEMPS - if (asprintf(&tmpname, "/tmp/tmpXXXXXX.xml") == -1) { - ERROR(__func__, "asprintf() failed (%s).", strerror(errno)); - goto fail; -@@ -129,6 +130,23 @@ readinput(const char *instruction, const - ERROR(__func__, "Failed to create a temporary file (%s).", strerror(errno)); - goto fail; - } -+#else -+ if (asprintf(&tmpname, "/tmp/tmpXXXXXX") == -1) { -+ ERROR(__func__, "asprintf() failed (%s).", strerror(errno)); -+ goto fail; -+ } -+ /* cannot fail */ -+ mktemp(tmpname); -+ if (asprintf(&tmpname, ".xml") == -1) { -+ ERROR(__func__, "asprintf() failed (%s).", strerror(errno)); -+ goto fail; -+ } -+ tmpfd = open(tmpname, O_RDWR | O_CREAT | O_EXCL, 0600); -+ if (tmpfd == -1) { -+ ERROR(__func__, "Failed to create a temporary file (%s).", strerror(errno)); -+ goto fail; -+ } -+#endif /* #ifdef HAVE_MKSTEMPS */ - - /* Read the old content, if any */ - if (old_tmp != NULL) {