sysrepo: Update to 0.7.8

Makefile cleanups for consistency between packages.

Placed libsysrepo in Libraries instead of Utilities.

Removed InstallDev as it is implied by CMAKE_INSTALL.

Added .patch at the end of patch files.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-07-15 15:41:20 -07:00
parent b5132ef780
commit 98c04e04c4
6 changed files with 18 additions and 34 deletions
@@ -1,15 +1,15 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -310,7 +310,7 @@ install (FILES ${INTERNAL_YANGS} DESTINA
@@ -335,7 +335,7 @@ install (FILES ${INTERNAL_YANGS} DESTINATION ${INTERNAL_SCHEMA_SEARCH_DIR})
# install NACM YANG module
if(ENABLE_NACM)
- INSTALL_YANG("ietf-netconf-acm" "@2018-02-14" "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)
@@ -334,9 +334,9 @@ if(WITH_SYSTEMD)
# generate and install pkg-config file
@@ -356,9 +356,9 @@ if(WITH_SYSTEMD)
FILES_MATCHING PATTERN "*.service")
endif()
@@ -1,6 +1,6 @@
--- a/src/clientlib/client_library.c
+++ b/src/clientlib/client_library.c
@@ -396,13 +396,13 @@ sr_connect(const char *app_name, const s
@@ -396,13 +396,13 @@ sr_connect(const char *app_name, const sr_conn_options_t opts, sr_conn_ctx_t **c
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 */
@@ -1,6 +1,6 @@
--- a/src/common/sr_utils.c
+++ b/src/common/sr_utils.c
@@ -477,14 +477,24 @@ sr_fd_set_nonblock(int fd)
@@ -506,14 +506,24 @@ sr_fd_set_nonblock(int fd)
#if defined(SO_PEERCRED)
@@ -14,14 +14,14 @@
};
#endif /* !defined(SCM_CREDENTIALS) */
+#else
+#if !defined(__USE_GNU)
+#if !defined(_GNU_SOURCE)
+struct ucred {
+ pid_t pid; /* process ID of the sending process */
+ uid_t uid; /* user ID of the sending process */
+ gid_t gid; /* group ID of the sending process */
+};
+/* struct ucred is ifdefined behind __USE_GNU, but __USE_GNU is not defined */
+#endif /* !defined(__USE_GNU) */
+#endif /* !defined(__GNU_SOURCE) */
+#endif /* defined(__GLIBC__) */
int
@@ -1,6 +1,6 @@
--- a/src/common/sysrepo.pb-c.c
+++ b/src/common/sysrepo.pb-c.c
@@ -8013,7 +8013,7 @@ const ProtobufCMessageDescriptor sr__eve
@@ -8013,7 +8013,7 @@ const ProtobufCMessageDescriptor sr__event_notif_replay_resp__descriptor =
(ProtobufCMessageInit) sr__event_notif_replay_resp__init,
NULL,NULL,NULL /* reserved[123] */
};
@@ -9,7 +9,7 @@
{
{
"xpath",
@@ -8063,8 +8063,21 @@ static const ProtobufCFieldDescriptor sr
@@ -8063,8 +8063,21 @@ static const ProtobufCFieldDescriptor sr__data_provide_req__field_descriptors[4]
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
@@ -31,7 +31,7 @@
3, /* field[3] = request_id */
1, /* field[1] = subscriber_address */
2, /* field[2] = subscription_id */
@@ -8075,7 +8088,7 @@ static const ProtobufCIntRange sr__data_
@@ -8075,7 +8088,7 @@ static const ProtobufCIntRange sr__data_provide_req__number_ranges[3 + 1] =
{ 1, 0 },
{ 10, 1 },
{ 20, 3 },
@@ -40,7 +40,7 @@
};
const ProtobufCMessageDescriptor sr__data_provide_req__descriptor =
{
@@ -8085,7 +8098,7 @@ const ProtobufCMessageDescriptor sr__dat
@@ -8085,7 +8098,7 @@ const ProtobufCMessageDescriptor sr__data_provide_req__descriptor =
"Sr__DataProvideReq",
"sr",
sizeof(Sr__DataProvideReq),