From patchwork Sun Jan 10 12:23:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1424240 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=none (p=none dis=none) header.from=t-online.de 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 4DDGG552pyz9sP7 for ; Sun, 10 Jan 2021 23:23:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 646132045C; Sun, 10 Jan 2021 12:23:21 +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 vyr4XHt8ITnN; Sun, 10 Jan 2021 12:23:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9048E20384; Sun, 10 Jan 2021 12:23:19 +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 0A14E1BF4D6 for ; Sun, 10 Jan 2021 12:23:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F408420384 for ; Sun, 10 Jan 2021 12:23:17 +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 JxbGDln3BcBe for ; Sun, 10 Jan 2021 12:23:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by silver.osuosl.org (Postfix) with ESMTPS id 23AAB20381 for ; Sun, 10 Jan 2021 12:23:16 +0000 (UTC) Received: from fwd20.aul.t-online.de (fwd20.aul.t-online.de [172.20.26.140]) by mailout01.t-online.de (Postfix) with SMTP id 9AC6F42DC10D for ; Sun, 10 Jan 2021 13:23:13 +0100 (CET) Received: from fli4l.lan.fli4l (ZqqPAMZBZhAfr1PmYtw0NnUdvwomK1wVZda4LRj7hw42GO0m+XbL7N38YwgWgTYZ-M@[91.58.7.116]) by fwd20.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1kyZkV-3fzC2C0; Sun, 10 Jan 2021 13:23:11 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:48798) by fli4l.lan.fli4l with esmtp (Exim 4.94) (envelope-from ) id 1kyZkU-0000oG-2T for buildroot@buildroot.org; Sun, 10 Jan 2021 13:23:10 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 10 Jan 2021 13:23:10 +0100 Message-Id: <20210110122310.313941-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-ID: ZqqPAMZBZhAfr1PmYtw0NnUdvwomK1wVZda4LRj7hw42GO0m+XbL7N38YwgWgTYZ-M X-TOI-EXPURGATEID: 150726::1610281391-000053CC-F4FAA234/0/0 CLEAN NORMAL X-TOI-MSGID: 33d1cacd-d0fe-40f3-8b7b-a11f1a7e1262 Subject: [Buildroot] [PATCH 1/1] package/busybox: fix selinux-related build error 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: http://autobuild.buildroot.net/results/b89/b89b7d0f0601bb706e76cea31cf4e43326e5540c/ Signed-off-by: Bernd Kuhls --- ...3-update_passwd-fix-context-variable.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/busybox/0003-update_passwd-fix-context-variable.patch diff --git a/package/busybox/0003-update_passwd-fix-context-variable.patch b/package/busybox/0003-update_passwd-fix-context-variable.patch new file mode 100644 index 0000000000..25c07d7054 --- /dev/null +++ b/package/busybox/0003-update_passwd-fix-context-variable.patch @@ -0,0 +1,41 @@ +From b4828612abe378491693c9036db19e4f64768307 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 10 Jan 2021 13:15:04 +0100 +Subject: [PATCH] update_passwd: fix context variable + +Commit +https://git.busybox.net/busybox/commit/libbb/update_passwd.c?id=2496616b0a8d1c80cd1416b73a4847b59b9f969a + +changed the variable used from context to seuser but forgot this +change resulting in build errors detected by buildroot autobuilders: + +http://autobuild.buildroot.net/results/b89/b89b7d0f0601bb706e76cea31cf4e43326e5540c//build-end.log + +libbb/update_passwd.c:51:11: error: 'context' undeclared (first use in + this function); did you mean 'ucontext'? + freecon(context); + +Patch sent upstream: +http://lists.busybox.net/pipermail/busybox/2021-January/088467.html + +Signed-off-by: Bernd Kuhls +--- + libbb/update_passwd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c +index 7b67f30cd..a228075cc 100644 +--- a/libbb/update_passwd.c ++++ b/libbb/update_passwd.c +@@ -48,7 +48,7 @@ static void check_selinux_update_passwd(const char *username) + bb_simple_error_msg_and_die("SELinux: access denied"); + } + if (ENABLE_FEATURE_CLEAN_UP) +- freecon(context); ++ freecon(seuser); + } + #else + # define check_selinux_update_passwd(username) ((void)0) +-- +2.29.2 +