From patchwork Sat Jan 30 21:40:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1433750 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) 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=S1YB2VIG; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DSnkZ0gH5z9t0J for ; Sun, 31 Jan 2021 08:43:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5EBAB871A0; Sat, 30 Jan 2021 21:43:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rnM964L3eFAz; Sat, 30 Jan 2021 21:42:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6F24A871A2; Sat, 30 Jan 2021 21:42:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E7D401BF44C for ; Sat, 30 Jan 2021 21:42:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DBFB0871A2 for ; Sat, 30 Jan 2021 21:42:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V8tZ7q7lqY9D for ; Sat, 30 Jan 2021 21:42:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by hemlock.osuosl.org (Postfix) with ESMTPS id B4272871A0 for ; Sat, 30 Jan 2021 21:42:54 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id z6so12427111wrq.10 for ; Sat, 30 Jan 2021 13:42:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b7B4Jt5yz2HRRiD8SqwaRsaTH4gXA+D7oFIS6YTB/ws=; b=S1YB2VIGhSNwu6QDVtU8PiQZbfWV2gli2bXg3DdaBYR8VXyhxcQTrtL6ILWsIB2sWo kZXWIOrH/s9RmeRTvnKX/aRoN7yfqGu1ANeXKNJ57v5vYiyUkp4N79ID/HIIqc3/3LCg RO6l1cl07oezjA+zjXi4lryCdHiFMF78M+IzzMnCzYpYs6LIzIzEkhFt7upLuoij4/HN WbCOndiiU06scuOnpg33doPPKRlsXRkxWpJaEydUvgFU5PWk6DmM3A48SdEvT/lrExK0 bscEKOtKTKoXNf4S/4KN0faORWiCrtXJid6M6YU3xZHpktXso23Klxs4XP8lOUUqu+Td Hq2g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=b7B4Jt5yz2HRRiD8SqwaRsaTH4gXA+D7oFIS6YTB/ws=; b=S/f7roMjYZhUY1AsgDIilACT/nNz0O6Oq5L9df4t6tsxVcDr0WYVsrhxISQYp/NdjP z6wKrzIZ7hVxze+Rs/sF4rgVfLRUla+xiecqD2vY3ip2sRXYF1XNaXS7kOGGtFAJdlJe VVGB5eY671+gVmxd9EGJoC7gJnosIehhLWgN3FkgXgOPbYpISUKG2wsg9DZHxuMzgzIf mas1gmriIiM2jS5XtoQa6mjQkSEaF8kyPmGJ1fwGHe1v8YFgmp7ktWDEizX3b5+laH20 Ew3wiPJX/zif6Xk4PwDpxq6KFzk/u6RWIeMqgrc6bDd/JQ82Y2oh3ho4BmpifFsFVNJU tzdg== X-Gm-Message-State: AOAM532AVp3+orYY/LDh8XerdtJbkpnBFLXZK/XwAqbXhi2EBlKSl76U RiROlsb0qCIkc4gwy1d/CgEXAUc6UaH3Rw== X-Google-Smtp-Source: ABdhPJx5lir8Mwy65FildA3Vzy2ZF23ugVFsRPKJp6pX6fBmBRMWLB7n8a7+tcPWOKjPVbsOXkFa+A== X-Received: by 2002:adf:fb91:: with SMTP id a17mr10989498wrr.93.1612042972964; Sat, 30 Jan 2021 13:42:52 -0800 (PST) Received: from t450s.fritz.box (ip1f1322f8.dynamic.kabel-deutschland.de. [31.19.34.248]) by smtp.gmail.com with ESMTPSA id b3sm17611915wme.32.2021.01.30.13.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jan 2021 13:42:52 -0800 (PST) From: Heiko Thiery To: buildroot@buildroot.org Date: Sat, 30 Jan 2021 22:40:32 +0100 Message-Id: <20210130214028.26398-5-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210130214028.26398-1-heiko.thiery@gmail.com> References: <20210130214028.26398-1-heiko.thiery@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/4] package/netopeer2: bump version to 1.1.53 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 , Samuel Martin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove patch applied upstream. Signed-off-by: Heiko Thiery --- ...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 diff --git a/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch deleted file mode 100644 index 76c71d0ff9..0000000000 --- a/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 4a950257fa353e27ef1bd753bca4d0279f41bc77 Mon Sep 17 00:00:00 2001 -From: Michal Vasko -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 - diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index 1d5997505f..801c353e11 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -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 diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 5787d3a8cf..bc02e0dc93 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -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