From patchwork Thu Aug 27 11:17:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1352494 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=V+tURAkL; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BcgGh54nrz9sTS for ; Thu, 27 Aug 2020 21:19:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F02A3204C9; Thu, 27 Aug 2020 11:19:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ntozyzXERifM; Thu, 27 Aug 2020 11:19:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CC6F9203CE; Thu, 27 Aug 2020 11:19:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 513251BF2BF for ; Thu, 27 Aug 2020 11:19:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4947A203CE for ; Thu, 27 Aug 2020 11:19:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U+yeHdTwrvio for ; Thu, 27 Aug 2020 11:18:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by silver.osuosl.org (Postfix) with ESMTPS id 4B594203CC for ; Thu, 27 Aug 2020 11:18:59 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id w13so4986599wrk.5 for ; Thu, 27 Aug 2020 04:18:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8vEp6bAZpq/HGyQZ1pjIsIfoCxMpe0rUHUpt8Qdgtus=; b=V+tURAkLhqk31s1eBgZgLMq5s2sBlWer6soYtlo5dbOWwqJYbVkLXE75HqQrM8FmqF Rh9WYtvtwlBTZU+XbDoo3aroVLc0aLsNhL/3NC2+N6Vx7WAdhbPKB5itwB0eQCK5yOkY bj0AFqjdYljsYi39TYHtKPNG28inRX5DEqVf1nqQljA/Cgbehq5MCzOrdUyRtMoG318I 00BaPbCwRNqUKNnW86W0LyzKRrRgjDTX91VvaHFTVF8f8mvqZnUxg+GgKBKlJNgPYPAe n1GI94gE1HuabqKwduZ9pbfms8boBE0BomXC9EPSUrSRC8jawEJfORBcidV3QvYJGIUR owJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8vEp6bAZpq/HGyQZ1pjIsIfoCxMpe0rUHUpt8Qdgtus=; b=cQTCIqICLNiAw3cTwfJvQlSGykbZxtJ4w+6BVluhLU/0HPOQEJuBLqpkCfKHCP2TWX +LEopxOEdS4s8FMKGC86/f42siu7HL3Xa+otOEidMY7yTZcTRtf9F2IiPaO/fbRAbw4H /DxG9iV9mP7SHpJPfB1kqsSFX+FnYy29y0gjHbhSPwq0LHxJMEB8YnEmKd0l68YZWw3U dTFFcxzoW8sMwoNo3ty9MC6/Pd8yTKp0cTuBAhLO3prCMbzaeEYr2KNaRlZNrcvtL0Kj rPmjfeR/E6Uzb4HVmz+zliCNlJ6WKwz7WytODVXpgPW6qZe/dH7LbkSD+Wt0mBdfpGLg sJSQ== X-Gm-Message-State: AOAM533S6WFq1sBbZpBQgrES9trQqHxifYBOK/iE8fqK7YWOlmumJ3JB 7g9lLFsYdrI3PX+WYR3Z0M/PSmN6dLY= X-Google-Smtp-Source: ABdhPJyl9pSttQuEWqr2V06WonNbMA5DPmSs08vwA+mJZWmx8nk+iivmWb2RyO+yAiqsvevl9Hhhlw== X-Received: by 2002:adf:9ed1:: with SMTP id b17mr19812009wrf.227.1598527137452; Thu, 27 Aug 2020 04:18:57 -0700 (PDT) Received: from hthiery01.sab.local ([213.135.10.150]) by smtp.gmail.com with ESMTPSA id b8sm5303766wrx.76.2020.08.27.04.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 04:18:56 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Thu, 27 Aug 2020 13:17:32 +0200 Message-Id: <20200827111731.26090-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/1] package/netopeer2: bump verstion to 1.1.39 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Thiery Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Heiko Thiery --- Changes v1 -> v2: - drop patches already in version ...BUGFIX-take-DESTDIR-into-account-649.patch | 33 -------- ...HANGE-use-su-only-for-effective-root.patch | 79 ------------------- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 4 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 package/netopeer2/0001-build-BUGFIX-take-DESTDIR-into-account-649.patch delete mode 100644 package/netopeer2/0002-scripts-CHANGE-use-su-only-for-effective-root.patch diff --git a/package/netopeer2/0001-build-BUGFIX-take-DESTDIR-into-account-649.patch b/package/netopeer2/0001-build-BUGFIX-take-DESTDIR-into-account-649.patch deleted file mode 100644 index bff4337fe7..0000000000 --- a/package/netopeer2/0001-build-BUGFIX-take-DESTDIR-into-account-649.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c6afffafd1e27054ff59b82ffed3a99795814631 Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -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 -[patch taken from upstream: -https://github.com/CESNET/netopeer2/commit/726b1384a3f93090ede1143da86c99d5d24d06c5] -Signed-off-by: Heiko Thiery ---- - 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 - diff --git a/package/netopeer2/0002-scripts-CHANGE-use-su-only-for-effective-root.patch b/package/netopeer2/0002-scripts-CHANGE-use-su-only-for-effective-root.patch deleted file mode 100644 index b960a87beb..0000000000 --- a/package/netopeer2/0002-scripts-CHANGE-use-su-only-for-effective-root.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 71cc996faa5500b3bfd499ad0c436c8b96629ea7 Mon Sep 17 00:00:00 2001 -From: Michal Vasko -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 ---- - 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 - diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index 93a094d563..1d5997505f 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -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 diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 641666e8d3..5787d3a8cf 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -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