sysrepo: update to 0.7.5

Signed-off-by: Mislav Novakovic <mislav.novakovic@sartura.hr>

4 files changed, 26 insertions, 51 deletions

diff --git a/net/sysrepo/patches/001-protobuf-remove-protoc-command-from-cmake-file b/net/sysrepo/patches/001-add-generated-protobufc-files
index cb742cec7..ec08c137f 100644
--- a/net/sysrepo/patches/001-protobuf-remove-protoc-command-from-cmake-file
+++ b/net/sysrepo/patches/001-add-generated-protobufc-files
@@ -1,26 +1,7 @@
-Index: sysrepo-7aa2f18d234267403147df92c0005c871f0aa840/src/CMakeLists.txt
-===================================================================
---- sysrepo-7aa2f18d234267403147df92c0005c871f0aa840.orig/src/CMakeLists.txt
-+++ sysrepo-7aa2f18d234267403147df92c0005c871f0aa840/src/CMakeLists.txt
-@@ -21,14 +21,6 @@ set(GENERATED_PROTO_H "${COMMON_BIN_DIR}
- set(GENERATED_PROTO_C "${COMMON_BIN_DIR}/${PROTO_NAME}.pb-c.c")
- 
- get_filename_component(ABS_PATH ${PROTO_FILE} PATH)
--add_custom_command(
--    OUTPUT "${GENERATED_PROTO_C}"
--           "${GENERATED_PROTO_H}"
--   COMMAND  ${PROTOBUFC_PROTOC_EXECUTABLE}
--   ARGS --c_out ${COMMON_BIN_DIR} -I ${ABS_PATH} ${PROTO_FILE}
--   DEPENDS ${PROTO_FILE}
--   COMMENT "Running C protocol buffer compiler on ${PROTO_FILE}"
--   VERBATIM )
- 
- configure_file("${COMMON_DIR}/sr_constants.h.in" "${COMMON_BIN_DIR}/sr_constants.h" ESCAPE_QUOTES @ONLY)
- 
-Index: sysrepo-7aa2f18d234267403147df92c0005c871f0aa840/src/common/sysrepo.pb-c.c
+Index: sysrepo-0.7.5/src/common/sysrepo.pb-c.c
 ===================================================================
 --- /dev/null
-+++ sysrepo-7aa2f18d234267403147df92c0005c871f0aa840/src/common/sysrepo.pb-c.c
++++ sysrepo-0.7.5/src/common/sysrepo.pb-c.c
 @@ -0,0 +1,10537 @@
 +/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
 +/* Generated from: sysrepo.proto */
@@ -10559,10 +10540,10 @@ Index: sysrepo-7aa2f18d234267403147df92c0005c871f0aa840/src/common/sysrepo.pb-c.
 +  sr__operation__value_ranges,
 +  NULL,NULL,NULL,NULL   /* reserved[1234] */
 +};
-Index: sysrepo-7aa2f18d234267403147df92c0005c871f0aa840/src/common/sysrepo.pb-c.h
+Index: sysrepo-0.7.5/src/common/sysrepo.pb-c.h
 ===================================================================
 --- /dev/null
-+++ sysrepo-7aa2f18d234267403147df92c0005c871f0aa840/src/common/sysrepo.pb-c.h
++++ sysrepo-0.7.5/src/common/sysrepo.pb-c.h
 @@ -0,0 +1,4238 @@
 +/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
 +/* Generated from: sysrepo.proto */
diff --git a/net/sysrepo/patches/002-remove-buildtime-module-install b/net/sysrepo/patches/002-remove-buildtime-module-install
index 15bc77c96..3826853fb 100644
--- a/net/sysrepo/patches/002-remove-buildtime-module-install
+++ b/net/sysrepo/patches/002-remove-buildtime-module-install
@@ -1,26 +1,26 @@
-Index: sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/CMakeLists.txt
+Index: sysrepo-0.7.5/CMakeLists.txt
 ===================================================================
---- sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf.orig/CMakeLists.txt
-+++ sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/CMakeLists.txt
-@@ -280,7 +280,7 @@ install (FILES ${INTERNAL_YANGS} DESTINA
+--- sysrepo-0.7.5.orig/CMakeLists.txt
++++ sysrepo-0.7.5/CMakeLists.txt
+@@ -303,7 +303,7 @@ install (FILES ${INTERNAL_YANGS} DESTINA
  
  # install NACM YANG module
  if(ENABLE_NACM)
--    INSTALL_YANG("ietf-netconf-acm" "@2012-02-22" "644")
-+    # INSTALL_YANG("ietf-netconf-acm" "@2012-02-22" "644")
+-    INSTALL_YANG("ietf-netconf-acm" "@2018-02-14" "644")
++    #INSTALL_YANG("ietf-netconf-acm" "@2018-02-14" "644")
  endif(ENABLE_NACM)
  
  find_package(PkgConfig QUIET)
-@@ -304,9 +304,9 @@ if(WITH_SYSTEMD)
+@@ -327,9 +327,9 @@ if(WITH_SYSTEMD)
          FILES_MATCHING PATTERN "*.service")
  endif()
  
 -INSTALL_YANG("ietf-netconf-notifications" "" "666")
 -INSTALL_YANG("nc-notifications" "" "666")
 -INSTALL_YANG("notifications" "" "666")
-+# INSTALL_YANG("ietf-netconf-notifications" "" "666")
-+# INSTALL_YANG("nc-notifications" "" "666")
-+# INSTALL_YANG("notifications" "" "666")
++#INSTALL_YANG("ietf-netconf-notifications" "" "666")
++#INSTALL_YANG("nc-notifications" "" "666")
++#INSTALL_YANG("notifications" "" "666")
  
  if(GEN_LANGUAGE_BINDINGS)
      add_subdirectory(swig)
diff --git a/net/sysrepo/patches/003-missing-time-header b/net/sysrepo/patches/003-missing-time-header
deleted file mode 100644
index 6ce54dea6..000000000
--- a/net/sysrepo/patches/003-missing-time-header
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/inc/sysrepo.h
-===================================================================
---- sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf.orig/inc/sysrepo.h
-+++ sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/inc/sysrepo.h
-@@ -51,6 +51,7 @@
-  * @ref xp_page "XPath Addressing" is used for node identification in data-related calls.
-  */
- 
-+#include <time.h>
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdlib.h>
diff --git a/net/sysrepo/patches/004-disable-sysrepod-autostart b/net/sysrepo/patches/004-disable-sysrepod-autostart
index 3261aee13..ca4b0caa8 100644
--- a/net/sysrepo/patches/004-disable-sysrepod-autostart
+++ b/net/sysrepo/patches/004-disable-sysrepod-autostart
@@ -1,12 +1,11 @@
-Index: sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/src/clientlib/client_library.c
+Index: sysrepo-0.7.5/src/clientlib/client_library.c
 ===================================================================
---- sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf.orig/src/clientlib/client_library.c
-+++ sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/src/clientlib/client_library.c
-@@ -405,14 +405,6 @@ sr_connect(const char *app_name, const s
-     if (SR_ERR_OK != rc) {
+--- sysrepo-0.7.5.orig/src/clientlib/client_library.c
++++ sysrepo-0.7.5/src/clientlib/client_library.c
+@@ -396,13 +396,13 @@ sr_connect(const char *app_name, const s
          if (opts & SR_CONN_DAEMON_REQUIRED) {
              if ((opts & SR_CONN_DAEMON_START) && (0 == getuid())) {
--                /* sysrepo daemon start requested and process is running under root privileges */
+                 /* sysrepo daemon start requested and process is running under root privileges */
 -                SR_LOG_DBG_MSG("Sysrepo daemon not detected, starting it.");
 -                ret = system("sysrepod");
 -                if (0 == ret) {
@@ -14,6 +13,13 @@ Index: sysrepo-e4a5705a4c5293ba121048c71899b98243d99edf/src/clientlib/client_lib
 -                } else {
 -                    SR_LOG_WRN("Unable to start sysrepo daemon, error code=%d.", ret);
 -                }
++                //SR_LOG_DBG_MSG("Sysrepo daemon not detected, starting it.");
++                //ret = system("sysrepod");
++                //if (0 == ret) {
++                //    SR_LOG_INF_MSG("Sysrepo daemon has been started.");
++                //} else {
++                //    SR_LOG_WRN("Unable to start sysrepo daemon, error code=%d.", ret);
++                //}
                  /* retry to connect again in any case */
                  rc = cl_socket_connect(connection, SR_DAEMON_SOCKET);
                  CHECK_RC_LOG_GOTO(rc, cleanup, "Unable to connect to sysrepod: %s.", sr_strerror(rc));