NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/netopeer2: bump version to 1.1.39

Browse Source 
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Heiko Thiery 2020-08-27 13:17:32 +02:00 committed by Thomas Petazzoni
parent 9bce0009c0
commit c210fe93f8
4 changed files with 2 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
package/netopeer2/0001-build-BUGFIX-take-DESTDIR-into-account-649.patch
View File

@ -1,33 +0,0 @@
From c6afffafd1e27054ff59b82ffed3a99795814631 Mon Sep 17 00:00:00 2001
From: Heiko Thiery <heiko.thiery@gmail.com>
Date: Mon, 8 Jun 2020 09:47:58 +0200
Subject: [PATCH] build BUGFIX take DESTDIR into account (#649)
When installing yang modules add DESTDIR prefix to the NP2_MODULE_DIR.
Fixes #648
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
[patch taken from upstream:
https://github.com/CESNET/netopeer2/commit/726b1384a3f93090ede1143da86c99d5d24d06c5]
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
scripts/setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 7175bc4..81abf63 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -8,7 +8,7 @@ fi
# avoid problems with sudo path
SYSREPOCTL=`su -c "which sysrepoctl" $USER`
-MODDIR=${NP2_MODULE_DIR}
+MODDIR=${DESTDIR}${NP2_MODULE_DIR}
PERMS=${NP2_MODULE_PERMS}
OWNER=${NP2_MODULE_OWNER}
GROUP=${NP2_MODULE_GROUP}
--
2.20.1

79
package/netopeer2/0002-scripts-CHANGE-use-su-only-for-effective-root.patch
View File

@ -1,79 +0,0 @@
From 71cc996faa5500b3bfd499ad0c436c8b96629ea7 Mon Sep 17 00:00:00 2001
From: Michal Vasko <mvasko@cesnet.cz>
Date: Wed, 10 Jun 2020 15:20:23 +0200
Subject: [PATCH] scripts CHANGE use su only for effective root
Fixes #645
[patch taken from upstream:
https://github.com/CESNET/netopeer2/commit/2161b333009c21ffc8501e5127b82e6f0570ca8e]
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
scripts/merge_config.sh | 8 ++++++--
scripts/merge_hostkey.sh | 11 ++++++++---
scripts/setup.sh | 8 ++++++--
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/scripts/merge_config.sh b/scripts/merge_config.sh
index dde0c75..4ad151c 100755
--- a/scripts/merge_config.sh
+++ b/scripts/merge_config.sh
@@ -2,8 +2,12 @@
set -e
-# avoid problems with sudo path
-SYSREPOCFG=`su -c "which sysrepocfg" $USER`
+# avoid problems with sudo PATH
+if [ `id -u` -eq 0 ]; then
+ SYSREPOCFG=`su -c 'which sysrepocfg' -l $USER`
+else
+ SYSREPOCFG=`which sysrepocfg`
+fi
KS_KEY_NAME=genkey
# check that there is no listen/Call Home configuration yet
diff --git a/scripts/merge_hostkey.sh b/scripts/merge_hostkey.sh
index 87947fa..a0677ee 100755
--- a/scripts/merge_hostkey.sh
+++ b/scripts/merge_hostkey.sh
@@ -2,9 +2,14 @@
set -e
-# avoid problems with sudo path
-SYSREPOCFG=`su -c "which sysrepocfg" $USER`
-OPENSSL=`su -c "which openssl" $USER`
+# avoid problems with sudo PATH
+if [ `id -u` -eq 0 ]; then
+ SYSREPOCFG=`su -c 'which sysrepocfg' -l $USER`
+ OPENSSL=`su -c 'which openssl' -l $USER`
+else
+ SYSREPOCFG=`which sysrepocfg`
+ OPENSSL=`which openssl`
+fi
# check that there is no SSH key with this name yet
KEYSTORE_KEY=`$SYSREPOCFG -X -x "/ietf-keystore:keystore/asymmetric-keys/asymmetric-key[name='genkey']/name"`
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 81abf63..8bf6825 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -6,8 +6,12 @@ if [ -z "$NP2_MODULE_DIR" -o -z "$NP2_MODULE_PERMS" -o -z "$NP2_MODULE_OWNER" -o
exit 1
fi
-# avoid problems with sudo path
-SYSREPOCTL=`su -c "which sysrepoctl" $USER`
+# avoid problems with sudo PATH
+if [ `id -u` -eq 0 ]; then
+ SYSREPOCTL=`su -c 'which sysrepoctl' -l $USER`
+else
+ SYSREPOCTL=`which sysrepoctl`
+fi
MODDIR=${DESTDIR}${NP2_MODULE_DIR}
PERMS=${NP2_MODULE_PERMS}
OWNER=${NP2_MODULE_OWNER}
--
2.20.1

2
package/netopeer2/netopeer2.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 66f3ad68cc6e41f3231b090ef27016ccbfe007cda7d08ec19f409f7429f46ff9 netopeer2-1.1.34.tar.gz
sha256 e983683eda68792fedd73af54a5c7997496091489aa921f2a9e0dd27f2f6e19a netopeer2-1.1.39.tar.gz
sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE

2
package/netopeer2/netopeer2.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
NETOPEER2_VERSION = 1.1.34
NETOPEER2_VERSION = 1.1.39
NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION))
NETOPEER2_DL_SUBDIR = netopeer2
NETOPEER2_LICENSE = BSD-3-Clause