From patchwork Tue Jul 3 11:11:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 938621 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tkos.co.il Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41KhKk1HMBz9s1b for ; Tue, 3 Jul 2018 21:12:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5896286C61; Tue, 3 Jul 2018 11:12:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v9X2mZ9aXost; Tue, 3 Jul 2018 11:12:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2AE5987708; Tue, 3 Jul 2018 11:12:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8DA421C27C0 for ; Tue, 3 Jul 2018 11:12:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8B066887C4 for ; Tue, 3 Jul 2018 11:12:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 69JAvpjy4xN3 for ; Tue, 3 Jul 2018 11:12:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8CBC887B00 for ; Tue, 3 Jul 2018 11:12:16 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id 7E90A4403F3; Tue, 3 Jul 2018 14:12:13 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Tue, 3 Jul 2018 14:11:33 +0300 Message-Id: <3f2a94307e6c380842726b8158e8ec2e9d24372a.1530616293.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.18.0 Subject: [Buildroot] [PATCH 2018.02.x] procps-ng: disable for musl libc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The recent procps-ng security bump in commit 88ec06ad484 (procps-ng: security bump to version 3.3.15) of the 2018.02.x branch, introduced use of fopencookie() which is a GNU extension that musl version 1.1.8 does not implement. Backporting the security fixes alone is not feasible. Disable procps-ng for musl libc toolchains. Propagate this dependency to procps-ng reverse dependencies that used to allow build with musl, openvmtools and tovid. Fixes: http://autobuild.buildroot.net/results/eac/eac700c61e277689b46fd617b6ddcbf94b5271e5/ http://autobuild.buildroot.net/results/baa/baac54b934d5ac07d3604ae3c6016595e4d7014a/ Signed-off-by: Baruch Siach --- package/openvmtools/Config.in | 6 +++--- package/procps-ng/Config.in | 5 +++++ package/tovid/Config.in | 6 ++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in index 72c0293de725..66d4f1b1585f 100644 --- a/package/openvmtools/Config.in +++ b/package/openvmtools/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_OPENVMTOOLS depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC depends on BR2_ENABLE_LOCALE - depends on !BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBDNET help @@ -47,9 +47,9 @@ comment "PAM support needs a glibc toolchain w/ dynamic library" endif -comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, RPC, locale" +comment "openvmtools needs a glibc toolchain w/ wchar, threads, RPC, locale" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE || \ - BR2_TOOLCHAIN_USES_UCLIBC + !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/procps-ng/Config.in b/package/procps-ng/Config.in index 6ff898320204..d9e884faee5e 100644 --- a/package/procps-ng/Config.in +++ b/package/procps-ng/Config.in @@ -2,9 +2,14 @@ config BR2_PACKAGE_PROCPS_NG bool "procps-ng" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on !BR2_TOOLCHAIN_USES_MUSL # fopencookie() select BR2_PACKAGE_NCURSES help Standard informational utilities and process-handling tools. Provides things like kill, ps, uptime, free, top, etc... http://sourceforge.net/projects/procps-ng/ + +comment "procps-ng needs a glibc or uclibc toolchain" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_USES_MUSL diff --git a/package/tovid/Config.in b/package/tovid/Config.in index d8052ea334c6..a22dca8e1e43 100644 --- a/package/tovid/Config.in +++ b/package/tovid/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_TOVID depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mplayer + depends on !BR2_TOOLCHAIN_USES_MUSL # procps-ng # The below dependencies are runtime dependencies only select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng select BR2_PACKAGE_DVDAUTHOR @@ -27,14 +28,15 @@ config BR2_PACKAGE_TOVID http://tovid.wikia.com/wiki/Installing_tovid -comment "tovid needs a toolchain w/ threads, C++, wchar" +comment "tovid needs a glibc or uclibc toolchain w/ threads, C++, wchar" depends on BR2_USE_MMU depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_USE_WCHAR + || !BR2_USE_WCHAR \ + || BR2_TOOLCHAIN_USES_MUSL comment "tovid depends on python or python3" depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3