version bump of netopeer2 and related dependencies

PATCH New Heiko Thiery 2 participants 6 messages Jan 30, 2021 – Jan 31, 2021

lore

Share & tools

lore

Heiko Thiery

author

2021-01-30 21:40 UTC #0 lore raw

cover version bump of netopeer2 and related dependencies

For the bump of netopeer2 the bump of the dependencies is required:

From the releae summary [1]: "This release depends on libyang (v1.0.215), libnetconf2 (v1.1.36) and sysrepo (v1.4.104)."

[1] https://github.com/CESNET/netopeer2/releases/tag/v1.1.53

Heiko Thiery (4):
package/libyang: bump to version 1.0.215
package/libnetconf2: bump version to 1.1.36
package/sysrepo: bump version to 1.4.104
package/netopeer2: bump version to 1.1.53

 package/libnetconf2/libnetconf2.hash          |  2 +-
 package/libnetconf2/libnetconf2.mk            |  2 +-
 package/libyang/libyang.hash                  |  2 +-
 package/libyang/libyang.mk                    |  2 +-
 ...support-using-current-user-for-SR-mo.patch | 93 -------------------
 package/netopeer2/netopeer2.hash              |  2 +-
 package/netopeer2/netopeer2.mk                |  2 +-
 package/sysrepo/sysrepo.hash                  |  2 +-
 package/sysrepo/sysrepo.mk                    |  2 +-
 9 files changed, 8 insertions(+), 101 deletions(-)
 delete mode 100644 package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch

Signature · 1 line

2.20.1

Heiko Thiery

author

2021-01-30 21:40 UTC #1 lore raw

PATCH 1/4 package/libyang: bump to version 1.0.215

Signed-off-by Heiko Thiery <[email protected]>

---
 package/libyang/libyang.hash | 2 +-
 package/libyang/libyang.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/libyang/libyang.hash +1 -1

index d318ecb9d6..bc9e948c03 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  1a5637451b73c4c5683837eb4c51371bb084795f653bc1a5fc20fed5541b58bc  libyang-1.0.184.tar.gz
+sha256  c4498a77a7c12a28c9911f993eeafbf2badd2ecea58bb74781bd61cfc635e4c9  libyang-1.0.215.tar.gz
 sha256  f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112  LICENSE

package/libyang/libyang.mk +1 -1

index b4b82a9df7..ee24256bed 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBYANG_VERSION = 1.0.184
+LIBYANG_VERSION = 1.0.215
 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION))
 LIBYANG_LICENSE = BSD-3-Clause
 LIBYANG_LICENSE_FILES = LICENSE

Signature · 1 line

2.20.1

Heiko Thiery

author

2021-01-30 21:40 UTC #2 lore raw

PATCH 2/4 package/libnetconf2: bump version to 1.1.36

In reply to Heiko Thiery

Signed-off-by Heiko Thiery <[email protected]>

---
 package/libnetconf2/libnetconf2.hash | 2 +-
 package/libnetconf2/libnetconf2.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/libnetconf2/libnetconf2.hash +1 -1

index 489188daf1..a20e31e8d3 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  2ce2b819f3544fd46a3a4c8ba6dd0a3798cab2a63aa347bc1eb5275a2c89b7bd  libnetconf2-1.1.26.tar.gz
+sha256  17aa551380ffcccc3bfd928edbcc170cbe85b0f336b361d5f03ede8f3e5f6348  libnetconf2-1.1.36.tar.gz
 sha256  bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064  LICENSE

package/libnetconf2/libnetconf2.mk +1 -1

index 1b692550dc..770188df91 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNETCONF2_VERSION = 1.1.26
+LIBNETCONF2_VERSION = 1.1.36
 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION))
 LIBNETCONF2_INSTALL_STAGING = YES
 LIBNETCONF2_LICENSE = BSD-3-Clause

Signature · 1 line

2.20.1

Heiko Thiery

author

2021-01-30 21:40 UTC #3 lore raw

PATCH 3/4 package/sysrepo: bump version to 1.4.104

In reply to Heiko Thiery

Signed-off-by Heiko Thiery <[email protected]>

---
 package/sysrepo/sysrepo.hash | 2 +-
 package/sysrepo/sysrepo.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/sysrepo/sysrepo.hash +1 -1

index cdd2f7e478..d0b3c82ad3 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  f0f894d4ed98ce9d20fda219378b844731d796e95115c07f4c067d853e20ca36  sysrepo-1.4.70.tar.gz
+sha256  635f68ad5f8cb5ea3bd7c3081963f1a9a79ee0d6570facb1f3bcbf3b640446a4  sysrepo-1.4.104.tar.gz
 sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE

package/sysrepo/sysrepo.mk +1 -1

index 8a2e56bd61..e4d553cdbd 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSREPO_VERSION = 1.4.70
+SYSREPO_VERSION = 1.4.104
 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION))
 SYSREPO_INSTALL_STAGING = YES
 SYSREPO_LICENSE = Apache-2.0

Signature · 1 line

2.20.1

Heiko Thiery

author

2021-01-30 21:40 UTC #4 lore raw

PATCH 4/4 package/netopeer2: bump version to 1.1.53

In reply to Heiko Thiery

Remove patch applied upstream.

Signed-off-by Heiko Thiery <[email protected]>

---
 ...support-using-current-user-for-SR-mo.patch | 93 -------------------
 package/netopeer2/netopeer2.hash              |  2 +-
 package/netopeer2/netopeer2.mk                |  2 +-
 3 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch

package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch deleted +0 ~~-93~~

deleted file mode 100644
index 76c71d0ff9..0000000000
@@ -1,93 +0,0 @@
-From 4a950257fa353e27ef1bd753bca4d0279f41bc77 Mon Sep 17 00:00:00 2001
-From: Michal Vasko <[email protected]>
-Date: Mon, 24 Aug 2020 13:47:40 +0200
-Subject: [PATCH] scripts FEATURE support using current user for SR modules
-
-Mostly for special cases user/group configuration
-when the user/group cannot be retrieved normally.
-
-Fixes #701
----
- CMakeLists.txt   | 10 +++++-----
- scripts/setup.sh | 23 +++++++++++++++++++----
- 2 files changed, 24 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 77aea1f..8fd6b43 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -68,19 +68,19 @@ if(NOT MODULES_OWNER)
-     OUTPUT_VARIABLE MODULES_OWNER OUTPUT_STRIP_TRAILING_WHITESPACE
-     ERROR_VARIABLE ERROR_STR OUTPUT_STRIP_TRAILING_WHITESPACE)
-     if(RET)
--        message(FATAL_ERROR "Learning server module user failed: ${ERROR_STR}")
-+        message(WARNING "Learning server module user failed (${ERROR_STR}), the current user will be used.")
-     endif()
- endif()
--set(MODULES_OWNER "${MODULES_OWNER}" CACHE STRING "System user that will become the owner of server modules")
--if(NOT MODULES_GROUP)
-+set(MODULES_OWNER "${MODULES_OWNER}" CACHE STRING "System user that will become the owner of server modules, empty means the current user")
-+if(NOT MODULES_GROUP AND MODULES_OWNER)
-     execute_process(COMMAND id -gn ${MODULES_OWNER} RESULT_VARIABLE RET
-     OUTPUT_VARIABLE MODULES_GROUP OUTPUT_STRIP_TRAILING_WHITESPACE
-     ERROR_VARIABLE ERROR_STR OUTPUT_STRIP_TRAILING_WHITESPACE)
-     if(RET)
--        message(FATAL_ERROR "Learning server module group failed: ${ERROR_STR}")
-+        message(WARNING "Learning server module group failed (${ERROR_STR}), the current user group will be used.")
-     endif()
- endif()
--set(MODULES_GROUP "${MODULES_GROUP}" CACHE STRING "System group that the server modules will belong to")
-+set(MODULES_GROUP "${MODULES_GROUP}" CACHE STRING "System group that the server modules will belong to, empty means the current user group")
- 
- # set prefix for the PID file
- if(NOT PIDFILE_PREFIX)
-diff --git a/scripts/setup.sh b/scripts/setup.sh
-index 9591a49..b7c7ba4 100755
---- a/scripts/setup.sh
-+++ b/scripts/setup.sh
-@@ -1,7 +1,8 @@
- #!/bin/bash
- 
--# env variables NP2_MODULE_DIR, NP2_MODULE_PERMS, NP2_MODULE_OWNER, NP2_MODULE_GROUP must be defined when executing this script!
--if [ -z "$NP2_MODULE_DIR" -o -z "$NP2_MODULE_PERMS" -o -z "$NP2_MODULE_OWNER" -o -z "$NP2_MODULE_GROUP" ]; then
-+# env variables NP2_MODULE_DIR, NP2_MODULE_PERMS must be defined and NP2_MODULE_OWNER, NP2_MODULE_GROUP will be used if
-+# defined when executing this script!
-+if [ -z "$NP2_MODULE_DIR" -o -z "$NP2_MODULE_PERMS" ]; then
-     echo "Required environment variables not defined!"
-     exit 1
- fi
-@@ -37,7 +38,14 @@ MODULES=(
- 
- # functions
- INSTALL_MODULE() {
--    "$SYSREPOCTL" -a -i $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2
-+    CMD="'$SYSREPOCTL' -a -i $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2"
-+    if [ ! -z ${OWNER} ]; then
-+        CMD="$CMD -o '$OWNER'"
-+    fi
-+    if [ ! -z ${GROUP} ]; then
-+        CMD="$CMD -g '$GROUP'"
-+    fi
-+    eval $CMD
-     local rc=$?
-     if [ $rc -ne 0 ]; then
-         exit $rc
-@@ -45,7 +53,14 @@ INSTALL_MODULE() {
- }
- 
- UPDATE_MODULE() {
--    "$SYSREPOCTL" -a -U $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2
-+    CMD="'$SYSREPOCTL' -a -U $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2"
-+    if [ ! -z ${OWNER} ]; then
-+        CMD="$CMD -o '$OWNER'"
-+    fi
-+    if [ ! -z ${GROUP} ]; then
-+        CMD="$CMD -g '$GROUP'"
-+    fi
-+    eval $CMD
-     local rc=$?
-     if [ $rc -ne 0 ]; then
-         exit $rc
--- 
-2.20.1
-

package/netopeer2/netopeer2.hash +1 -1

index 1d5997505f..801c353e11 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  e983683eda68792fedd73af54a5c7997496091489aa921f2a9e0dd27f2f6e19a  netopeer2-1.1.39.tar.gz
+sha256  6b43026211a787d5cb91d47cb7fdd7923649044c55f264aaf85bf5676c004211  netopeer2-1.1.53.tar.gz
 sha256  b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b  LICENSE

package/netopeer2/netopeer2.mk +1 -1

index 5787d3a8cf..bc02e0dc93 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NETOPEER2_VERSION = 1.1.39
+NETOPEER2_VERSION = 1.1.53
 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION))
 NETOPEER2_DL_SUBDIR = netopeer2
 NETOPEER2_LICENSE = BSD-3-Clause

Signature · 1 line

2.20.1

Thomas Petazzoni

Applied

2021-01-31 20:23 UTC #5 lore raw

cover version bump of netopeer2 and related dependencies

In reply to Heiko Thiery

Quoted 5 lines · On Sat, 30 Jan 2021 22:40:24 +0100 Heiko Thiery <[email protected]> wrote:

Heiko Thiery (4):
package/libyang: bump to version 1.0.215
package/libnetconf2: bump version to 1.1.36
package/sysrepo: bump version to 1.4.104
package/netopeer2: bump version to 1.1.53

Applied, thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com