From patchwork Thu Sep 3 08:49:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1356442 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; 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=aJ9t/gcX; 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 4Bhvdz1BQtz9sTh for ; Thu, 3 Sep 2020 18:50:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 873B787371; Thu, 3 Sep 2020 08:50:27 +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 hwc6c-K8YRCC; Thu, 3 Sep 2020 08:50:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 323178736E; Thu, 3 Sep 2020 08:50:25 +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 8BA471BF376 for ; Thu, 3 Sep 2020 08:50:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 82F2D203DC for ; Thu, 3 Sep 2020 08:50:23 +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 hnMh8nIcT5qC for ; Thu, 3 Sep 2020 08:50:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id C56E2203AC for ; Thu, 3 Sep 2020 08:50:21 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id z4so2284780wrr.4 for ; Thu, 03 Sep 2020 01:50:21 -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=/BZ+/lxLj85GDQkYODCEMfp+VEvU4D+R5nA7cAJ7ZnI=; b=aJ9t/gcX79t0LKLXdHpPCpIsYnTcvqSfW9rDWiJY7ZyCLH8nmsBBzC5bwAY53R4TzU cJZjultz79SzaekxgBvS6W2YqGDuP6pKROqUmjky58NYru5bgHaOXVtTz6yDUUkzC1TB BeeUwo3axG1bzMsnSmU0yuPe8dZZ7LOncP331uRUUOAfooyjPwB/2GrXQt7lz0x3y8PQ a1OXQ8EnrsJGqRsND3VhLcKN3NsAGSCwViIKebYtJG1BTvMbg6tdQR3UCmO+UT6vUgrw ViZ1AlG+X/5wNa0kXYyh3p6xpTTOww0vjv61YxefJlQEJPYeSk2Ah/pwbLgqxE6Td7WV vjDA== 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=/BZ+/lxLj85GDQkYODCEMfp+VEvU4D+R5nA7cAJ7ZnI=; b=L/sOXqW9evuXAzGb7YOWH/0J2TBxGFDoDojdlZKAoE9urEJ9Wct5jOdFYto1iKZr1/ AFSvnnyiyEwjklCP4RcAnyoqmXdwryd2OOLaZ0AtlLKiDALQY0XgLr3cTHpabNjT+4OV I1SAecPrfymP8b0fhedjJy7jNw+imrCTwwRNmV5pIU5PrZfq66PSiISAZQpPXJMVpbr/ AcrLTVJgBIq6f2dcn6eM4NW+GoZmdfEUVUUvj5+etDmEkS91QqmJTAklndT4qEzJVy9t rPn3QrqnAX75PLUpItuWUvFuZOmuu8U7xz4YCc1Yxv3xo1VyOLbmKVCdaUluu5Jcg/oh Ot4A== X-Gm-Message-State: AOAM53069K/yvSIRXAGva9mBcitUXccVZOtFHMS4ygwIKCS8ddU7Qiqq t5mJgg8+8FwOtyydXrVOmTUHyiGIrjg= X-Google-Smtp-Source: ABdhPJx+ylYfyfaFXzOMvrtPAeIVzyFQ6KnvJ6gcvgTBlAytApWjqPFAE28EsoiJo7SFYSEENqQbYg== X-Received: by 2002:a5d:554c:: with SMTP id g12mr1267640wrw.294.1599123019877; Thu, 03 Sep 2020 01:50:19 -0700 (PDT) Received: from hthiery01.sab.local ([213.135.10.150]) by smtp.gmail.com with ESMTPSA id b8sm3217250wmh.48.2020.09.03.01.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 01:50:19 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Thu, 3 Sep 2020 10:49:55 +0200 Message-Id: <20200903084956.23337-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: fix patch 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" Patch cannot be applied to bumped version anymore. So recreate on top of current version. Also change the patch numbering from 0003 -> 0001 since the others are dropped due to version bump. Fixes: http://autobuild.buildroot.net/results/ec58bc318e0e2fd46c16814a4011a4847090e696/ Signed-off-by: Heiko Thiery --- ...upport-using-current-user-for-SR-mo.patch} | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) rename package/netopeer2/{0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch => 0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch} (85%) diff --git a/package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch similarity index 85% rename from package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch rename to package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch index 45257b2ff4..76c71d0ff9 100644 --- a/package/netopeer2/0003-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +++ b/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch @@ -1,4 +1,4 @@ -From 36ee1f33bceb0c2a7899e28d75c0d05408b561f1 Mon Sep 17 00:00:00 2001 +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 @@ -7,18 +7,13 @@ Mostly for special cases user/group configuration when the user/group cannot be retrieved normally. Fixes #701 - -Signed-off-by: Heiko Thiery -[patch taken from upstream: -https://github.com/CESNET/netopeer2/commit/12a82701e10651fbdedb1524b27edf3bb2377488] -Signed-off-by: Heiko Thiery --- CMakeLists.txt | 10 +++++----- scripts/setup.sh | 23 +++++++++++++++++++---- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d4175e..95e7e61 100755 +index 77aea1f..8fd6b43 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,19 +68,19 @@ if(NOT MODULES_OWNER) @@ -47,7 +42,7 @@ index 2d4175e..95e7e61 100755 # set prefix for the PID file if(NOT PIDFILE_PREFIX) diff --git a/scripts/setup.sh b/scripts/setup.sh -index 7175bc4..b5d1406 100755 +index 9591a49..b7c7ba4 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,7 +1,8 @@ @@ -61,11 +56,11 @@ index 7175bc4..b5d1406 100755 echo "Required environment variables not defined!" exit 1 fi -@@ -33,7 +34,14 @@ MODULES=( +@@ -37,7 +38,14 @@ MODULES=( # functions INSTALL_MODULE() { -- $SYSREPOCTL -a -i $MODDIR/$1 -s $MODDIR -p $PERMS -o $OWNER -g $GROUP -v2 +- "$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'" @@ -77,11 +72,11 @@ index 7175bc4..b5d1406 100755 local rc=$? if [ $rc -ne 0 ]; then exit $rc -@@ -41,7 +49,14 @@ INSTALL_MODULE() { +@@ -45,7 +53,14 @@ INSTALL_MODULE() { } UPDATE_MODULE() { -- $SYSREPOCTL -a -U $MODDIR/$1 -s $MODDIR -p $PERMS -o $OWNER -g $GROUP -v2 +- "$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'"