From 583977b9539185612f91f1a820431ecfc597468b Mon Sep 17 00:00:00 2001 From: Mislav Novakovic Date: Wed, 28 Nov 2018 14:21:02 +0100 Subject: [PATCH 1/2] sysrepo: update to 0.7.7 Signed-off-by: Mislav Novakovic --- net/sysrepo/Makefile | 4 +- .../006-update-generated-protobufc-files | 70 +++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 net/sysrepo/patches/006-update-generated-protobufc-files diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile index 443ab6dd0..a9fb24fdb 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.6 +PKG_VERSION:=0.7.7 PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/sysrepo/sysrepo/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=44389df29618f0056192a1b7659a64c9d3b3f88fd87cea395b3a9cd8d224032b +PKG_HASH:=2bf8cb4d810d19231eba1e549f58f3a0ce068d170a5e7b212b927396098560e4 CMAKE_INSTALL:=1 diff --git a/net/sysrepo/patches/006-update-generated-protobufc-files b/net/sysrepo/patches/006-update-generated-protobufc-files new file mode 100644 index 000000000..9041eeca7 --- /dev/null +++ b/net/sysrepo/patches/006-update-generated-protobufc-files @@ -0,0 +1,70 @@ +Index: sysrepo-0.7.7/src/common/sysrepo.pb-c.c +=================================================================== +--- sysrepo-0.7.7.orig/src/common/sysrepo.pb-c.c ++++ sysrepo-0.7.7/src/common/sysrepo.pb-c.c +@@ -8013,7 +8013,7 @@ const ProtobufCMessageDescriptor sr__eve + (ProtobufCMessageInit) sr__event_notif_replay_resp__init, + NULL,NULL,NULL /* reserved[123] */ + }; +-static const ProtobufCFieldDescriptor sr__data_provide_req__field_descriptors[4] = ++static const ProtobufCFieldDescriptor sr__data_provide_req__field_descriptors[5] = + { + { + "xpath", +@@ -8063,8 +8063,21 @@ static const ProtobufCFieldDescriptor sr + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, ++ { ++ "original_xpath", ++ 21, ++ PROTOBUF_C_LABEL_REQUIRED, ++ PROTOBUF_C_TYPE_STRING, ++ 0, /* quantifier_offset */ ++ offsetof(Sr__DataProvideReq, original_xpath), ++ NULL, ++ NULL, ++ 0, /* flags */ ++ 0,NULL,NULL /* reserved1,reserved2, etc */ ++ }, + }; + static const unsigned sr__data_provide_req__field_indices_by_name[] = { ++ 4, /* field[4] = original_xpath */ + 3, /* field[3] = request_id */ + 1, /* field[1] = subscriber_address */ + 2, /* field[2] = subscription_id */ +@@ -8075,7 +8088,7 @@ static const ProtobufCIntRange sr__data_ + { 1, 0 }, + { 10, 1 }, + { 20, 3 }, +- { 0, 4 } ++ { 0, 5 } + }; + const ProtobufCMessageDescriptor sr__data_provide_req__descriptor = + { +@@ -8085,7 +8098,7 @@ const ProtobufCMessageDescriptor sr__dat + "Sr__DataProvideReq", + "sr", + sizeof(Sr__DataProvideReq), +- 4, ++ 5, + sr__data_provide_req__field_descriptors, + sr__data_provide_req__field_indices_by_name, + 3, sr__data_provide_req__number_ranges, +Index: sysrepo-0.7.7/src/common/sysrepo.pb-c.h +=================================================================== +--- sysrepo-0.7.7.orig/src/common/sysrepo.pb-c.h ++++ sysrepo-0.7.7/src/common/sysrepo.pb-c.h +@@ -1630,10 +1630,11 @@ struct _Sr__DataProvideReq + char *subscriber_address; + uint32_t subscription_id; + uint64_t request_id; ++ char *original_xpath; + }; + #define SR__DATA_PROVIDE_REQ__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&sr__data_provide_req__descriptor) \ +- , NULL, NULL, 0, 0 } ++ , NULL, NULL, 0, 0, NULL } + + + /* From 9cb6d07cabec470648bbdbdd628ca743d082a811 Mon Sep 17 00:00:00 2001 From: Mislav Novakovic Date: Wed, 28 Nov 2018 14:23:52 +0100 Subject: [PATCH 2/2] Netopeer2: update to 0.7-r1 Signed-off-by: Mislav Novakovic --- net/Netopeer2/Makefile | 4 ++-- net/Netopeer2/patches/001-fix-for-cmake-build | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net/Netopeer2/Makefile b/net/Netopeer2/Makefile index 81c21cd93..f61ddcc66 100644 --- a/net/Netopeer2/Makefile +++ b/net/Netopeer2/Makefile @@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Netopeer2 -PKG_VERSION:=0.6-r1 +PKG_VERSION:=0.7-r1 PKG_LICENSE:=BSD-3-Clause PKG_MAINTAINER:=Mislav Novakovic PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/CESNET/Netopeer2/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=5f38db43f6021e389cf1f3c5c70e432586d8ba7f2d64ed5bd2bea8c7ea6b39e6 +PKG_HASH:=040013d1e315c62c496b704475665165578c374ffb387cbbff422cf8898d3a12 CMAKE_INSTALL:=1 diff --git a/net/Netopeer2/patches/001-fix-for-cmake-build b/net/Netopeer2/patches/001-fix-for-cmake-build index dad54a440..3dae3caa5 100644 --- a/net/Netopeer2/patches/001-fix-for-cmake-build +++ b/net/Netopeer2/patches/001-fix-for-cmake-build @@ -65,10 +65,11 @@ 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)") +@@ -204,7 +204,7 @@ if (ENABLE_CONFIGURATION) + execute_process(COMMAND ${PROJECT_BINARY_DIR}/model-install.sh)") endif() - + -add_custom_target(install-scripts-ide +add_custom_target(install-scripts-ide-server - scripts/model-install.sh + ${PROJECT_BINARY_DIR}/model-install.sh + )