From patchwork Wed Jun 23 16:59:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1496217 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=smtp3.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=VWC7JEJk; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G98dG1Cj5z9sCD for ; Thu, 24 Jun 2021 02:59:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3EE46607EA; Wed, 23 Jun 2021 16:59:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PgkzC_nt9UrC; Wed, 23 Jun 2021 16:59:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 96C4D6077B; Wed, 23 Jun 2021 16:59:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 4FFDA1BF369 for ; Wed, 23 Jun 2021 16:59:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4C5126077B for ; Wed, 23 Jun 2021 16:59:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ba4ARvlrpWv4 for ; Wed, 23 Jun 2021 16:59:38 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by smtp3.osuosl.org (Postfix) with ESMTPS id AA073606DB for ; Wed, 23 Jun 2021 16:59:38 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id a13so3414822wrf.10 for ; Wed, 23 Jun 2021 09:59:38 -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=gLjXgt5Xax9A8Iys2hMxECal1bgcSVGiGkeF/m2i1NY=; b=VWC7JEJk68Kwi1H8icI14ZX3bRI9EQfdT7DXUmmjzz0K5kq48AgSDbZb9ciOd5IHal B4Grn3EXnFmcsP/KY/4ZK7ZY7ZXKDHB9kzZ34s8cINWlFLSR3bsEo3cdctLAExK41CP8 2KaaQVGEIIFpHm8iUd0+waguUSTCqxqcw52kqFmYodwuCzu6op6B4a258PzYIkae+yj+ qSfDvMaXANMYg+k8oL4p1rb26OQpC+eCitMX2tDhLQgg5B5xB1ZS9ckJZd5xU35ZdDy7 /KRsGIY0soPFMDWRMep5lSwdUEVNShdmSoIuSys/r+1hYS2UNlHsQt3SMLst37vIrQu2 jXiA== 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=gLjXgt5Xax9A8Iys2hMxECal1bgcSVGiGkeF/m2i1NY=; b=OBljN7mjPXuNdbalxAvVITyIHop7vQRIN/ILEzFj+s8adtjx69cafwdTgVtDHepp0L IDN54bUE+EwB/EpHV5LOlIxTkU67rfwLmsq3jqzy/wvMR05pqGcSMw8d0kfeOXsV+aMs aZ8AcF5/U1LJlX7bTJXaRnRomoYuVdIkePmBWA3tP8g3QUX04myGLzOP3iAeknEpNqY3 y8pX2V+RjFHcmQmzQ7WaHAnot5O0eCeyb7HjG49R6gNTPI3mwhO/UD+HEz+AeL2BoQIG 93ea9V2RwyEwC7dmJj7QoA6TLmm2TlaYb8GP+rgKXWDi8LFt3xWS7kGn7OSa8OKLjZl1 rQ3w== X-Gm-Message-State: AOAM53193SlUuY7iPBYtsZWtFVllEBvmUkqYs9C9MrBAtaI3clgm+Ldo ZA/1uApjyS94yI4ZT0aZxUctuR1Lmv2x1A== X-Google-Smtp-Source: ABdhPJxXsrqKsOqfJvM1ftFmgngVClL+5qqx+eUCKMsRSpW3xeh9ccnNtzDhNZKDqt4FLx6Y02aw0g== X-Received: by 2002:a05:6000:128b:: with SMTP id f11mr1191602wrx.171.1624467576655; Wed, 23 Jun 2021 09:59:36 -0700 (PDT) Received: from kali.home (lfbn-ren-1-1383-171.w86-229.abo.wanadoo.fr. [86.229.230.171]) by smtp.gmail.com with ESMTPSA id u12sm590984wrq.50.2021.06.23.09.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 09:59:36 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 23 Jun 2021 18:59:23 +0200 Message-Id: <20210623165924.200759-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/usbguard: improve option handling 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: Kamel Bouhara , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Don't pass --disable-seccomp and --disable-systemd unconditionally While at it, also add a space and a new line when needed Signed-off-by: Fabrice Fontaine --- package/usbguard/usbguard.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 72e9e6459a..3aff254b3e 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,9 +8,9 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE -USBGUARD_CONF_OPTS= --with-bundled-catch --with-bundled-pegtl \ +USBGUARD_CONF_OPTS = --with-bundled-catch --with-bundled-pegtl \ --disable-debug-build --without-dbus --without-polkit \ - --disable-seccomp --disable-umockdev --disable-systemd + --disable-umockdev USBGUARD_DEPENDENCIES += libqb protobuf @@ -18,10 +18,12 @@ ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) USBGUARD_CONF_OPTS += --with-crypto-library=openssl USBGUARD_DEPENDENCIES += libopenssl endif + ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) USBGUARD_CONF_OPTS += --with-crypto-library=gcrypt USBGUARD_DEPENDENCIES += libgcrypt endif + ifeq ($(BR2_PACKAGE_LIBSODIUM),y) USBGUARD_CONF_OPTS += --with-crypto-library=sodium USBGUARD_DEPENDENCIES += libsodium @@ -30,11 +32,15 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) USBGUARD_CONF_OPTS += --enable-systemd USBGUARD_DEPENDENCIES += systemd +else +USBGUARD_CONF_OPTS += --disable-systemd endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) USBGUARD_CONF_OPTS += --enable-seccomp USBGUARD_DEPENDENCIES += libseccomp +else +USBGUARD_CONF_OPTS += --disable-seccomp endif ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) From patchwork Wed Jun 23 16:59:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1496218 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=2605:bc80:3010::133; helo=smtp2.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=HLEhyiaj; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G98dW585zz9sVp for ; Thu, 24 Jun 2021 02:59:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9DC154025E; Wed, 23 Jun 2021 16:59:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yHUCvGxay0tW; Wed, 23 Jun 2021 16:59:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 0A79040238; Wed, 23 Jun 2021 16:59:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E26D51BF369 for ; Wed, 23 Jun 2021 16:59:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D2CF683B66 for ; Wed, 23 Jun 2021 16:59:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g0VPuFYuqCQ8 for ; Wed, 23 Jun 2021 16:59:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0656B83B64 for ; Wed, 23 Jun 2021 16:59:40 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id h11so3430403wrx.5 for ; Wed, 23 Jun 2021 09:59:40 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=PxP/EE/WudzL82VapuBZF/vPRIfmuf8FBSgnuB1UtiQ=; b=HLEhyiajF0pWLowJIE4SUkmTltuF1fF5o/aNtfNsLhQ4G0byeUQ2Dg2BGt30VfbGyK SQXVIKwe1t4XZ7ULMSyW+SZgt3QuGSJnAmJjNq9YJLFXsCPVZA9UNEwaifmxE6aWeRzb i2jB8MlPi4+UJCV9MnjS3nA1s6WCpp8/3GCSgYlh6oRc0vObWIBMwch9ds/pSdKDCVFU VwbNHAHiRis6IYyw08cnQjfM7ChVWM1uj6MVI21XWTNMVXPuWDhgtck5FU7ID32DRlpZ vroJ9QS83HOIEAwGCf3NryiFsd1VC/Q88sWF200R/A1CEHm/06FFntOhJR0vWyTvJogD 1IiQ== 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=PxP/EE/WudzL82VapuBZF/vPRIfmuf8FBSgnuB1UtiQ=; b=Z8maZ3rxVltOu9IJV+UrwlMZ7qK77+yWOqGvDBANfhK9N42odRPL9mWKCuR9+Qve/v GH3TXmFAdmTXV4IDOTE9W7TEcTRJv44lwXK74OlMLwkqa0J+4L4mjnZt8jKipFon3EUI ocBKrZEIUWJ+8Dp7lG9vL0ockQbGWEu9/iQhhJ7H7iWCg3JuY5sUga5hXtG/FGaJT87l W753WSm4yzNDKAzDdi5rozoyxmTz0g1XKVmyfQQaSSihdK0GCubv4uV3a//3bMx+XYad 29pnwy9BcLAJ2M92XazqbQSegC7jVktNQmuUjHuqkISXjo2WrmOTwKWoHQBXfbpabP9w VnVw== X-Gm-Message-State: AOAM530WV4RZ4jxvBOxOBzvooQgEn2+Wi3hI8EN+4KMWUWrbyrWbnH2L tlaetdnT2dpEzr+zLvSNhjt+/zsY4BGOig== X-Google-Smtp-Source: ABdhPJyiXHGVtMlOaViBT1XIsUZgYc/QmRxMbK8O3Nt7sVxGhfdTt3J+jZQpSw5hCOxN6rEsEtk+0Q== X-Received: by 2002:a5d:5181:: with SMTP id k1mr1107480wrv.415.1624467579030; Wed, 23 Jun 2021 09:59:39 -0700 (PDT) Received: from kali.home (lfbn-ren-1-1383-171.w86-229.abo.wanadoo.fr. [86.229.230.171]) by smtp.gmail.com with ESMTPSA id u12sm590984wrq.50.2021.06.23.09.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 09:59:38 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 23 Jun 2021 18:59:24 +0200 Message-Id: <20210623165924.200759-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210623165924.200759-1-fontaine.fabrice@gmail.com> References: <20210623165924.200759-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/usbguard: fix libgcrypt build 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: Kamel Bouhara , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Building with libgcrypt fails since the addition of the package in commit fbff7d7289cc95db991184f890f4ca1fcf8a101e: checking for sparc64-buildroot-linux-gnu-libgcrypt-config... no checking for libgcrypt-config... no checking for LIBGCRYPT - version >= 1.5.0... no configure: error: The selected crypto backend library is not available. Fix this build failure by helping usbguard to find libgcrypt-config Fixes: - http://autobuild.buildroot.org/results/4c19e50a2a5308cb31a62f1b4b538a30353022bb Signed-off-by: Fabrice Fontaine --- package/usbguard/usbguard.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 3aff254b3e..ff5a311a7b 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -20,6 +20,8 @@ USBGUARD_DEPENDENCIES += libopenssl endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +USBGUARD_CONF_ENV += \ + ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config USBGUARD_CONF_OPTS += --with-crypto-library=gcrypt USBGUARD_DEPENDENCIES += libgcrypt endif