From patchwork Fri Mar 27 09:29:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1262648 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=SWLCbAha; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48pc4d3DwXz9sP7 for ; Fri, 27 Mar 2020 20:29:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 05436876B6; Fri, 27 Mar 2020 09:29:19 +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 45xS66i03aYC; Fri, 27 Mar 2020 09:29:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7710787699; Fri, 27 Mar 2020 09:29:16 +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 910F91BF318 for ; Fri, 27 Mar 2020 09:29:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8E4AE2634F for ; Fri, 27 Mar 2020 09:29:14 +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 Yd5Fc24CRF8I for ; Fri, 27 Mar 2020 09:29:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by silver.osuosl.org (Postfix) with ESMTPS id 0BD602634D for ; Fri, 27 Mar 2020 09:29:13 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id m11so4638570wrx.10 for ; Fri, 27 Mar 2020 02:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BUPyId+U+JisLRoIquRXl7J4UberwmYVcwywX1480Vw=; b=SWLCbAhaSVDSFecap07R6zTlF0AMRfQ4AquY5but1GSeYRDMPyyy/KaqXH6d2R9j+v tMhDzpGmfJ9OaL8eapyNGdNW9LsBDqnF/coCd4suvfuPUrKVb4VnXqlaJmFkN5QTEKxf 6fa/FNoDLXvLIQZUPCupIa1WSxMmoFoxlVZFI= 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; bh=BUPyId+U+JisLRoIquRXl7J4UberwmYVcwywX1480Vw=; b=WJ1bW45ULrNHC8wDZUtfTcEH2W9KVIfmB9YgSONusgNRTFpjPZTXQLZqBHgRAlYem9 A4dYq9KtsQhRy7DkwEGHAdmEE5ZEHLfYC1e5r/O6pe7ICWGK4VcK9vjJ2pH+acoop9H6 tVJ6gw5/gAa7CstseOeBJun5KGONXa74LvFFUfKEA4UjBP6UyeM5NGIPuKh/wqL7amAR DRGYKVy69XnGopf2AXnEW+ovuzdWR2H8vwStBPNH3Rtaoy32Cg2xMCLXp86lw/rH2fHP 74rc5tkfCohMiUKapau4/0d2+LfPstloepp1O9eZbhwlUBD/kqaKRYkt3HY3z0YNnxa0 P6OA== X-Gm-Message-State: ANhLgQ2Xq8wzoQ+MS1U8WRqX7vkoiHm/v8zqMQV8kKaL9Y78G7XmULfL 3zeA/0+6mMbGZjenZcJk/a6ad+YQ4KE= X-Google-Smtp-Source: ADFU+vsbXZu/+R2+iAFMWKolOUAb2Buzk1T+nVtc3xigy+d2bv7Q9Cp3dQrGPLwvrQpg6v1FmV5Gaw== X-Received: by 2002:adf:e650:: with SMTP id b16mr13400028wrn.328.1585301350976; Fri, 27 Mar 2020 02:29:10 -0700 (PDT) Received: from angelo-ThinkPad-T470p.powersoft.it ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id h26sm7002409wmb.19.2020.03.27.02.29.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Mar 2020 02:29:10 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 27 Mar 2020 10:29:06 +0100 Message-Id: <1585301346-7477-2-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1585301346-7477-1-git-send-email-angelo@amarulasolutions.com> References: <1585301346-7477-1-git-send-email-angelo@amarulasolutions.com> Subject: [Buildroot] [PATCH v4 2/2] package/libapparmor-utils: new package 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: Angelo Compagnucci , Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Angelo Compagnucci This patch adds libapparmor related tools. Signed-off-by: Angelo Compagnucci --- DEVELOPERS | 1 + package/Config.in | 1 + package/libapparmor-utils/Config.in | 7 +++ package/libapparmor-utils/libapparmor-utils.hash | 3 ++ package/libapparmor-utils/libapparmor-utils.mk | 65 ++++++++++++++++++++++++ 5 files changed, 77 insertions(+) create mode 100644 package/libapparmor-utils/Config.in create mode 100644 package/libapparmor-utils/libapparmor-utils.hash create mode 100644 package/libapparmor-utils/libapparmor-utils.mk diff --git a/DEVELOPERS b/DEVELOPERS index a818be9..07675b3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -197,6 +197,7 @@ F: package/corkscrew/ F: package/fail2ban/ F: package/i2c-tools/ F: package/libapparmor/ +F: package/libapparmor-utils/ F: package/mender/ F: package/mender-artifact/ F: package/mono/ diff --git a/package/Config.in b/package/Config.in index ae1bc22..1e6f958 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1883,6 +1883,7 @@ endmenu menu "Security" source "package/libapparmor/Config.in" + source "package/libapparmor-utils/Config.in" source "package/libselinux/Config.in" source "package/libsemanage/Config.in" source "package/libsepol/Config.in" diff --git a/package/libapparmor-utils/Config.in b/package/libapparmor-utils/Config.in new file mode 100644 index 0000000..4fe1074 --- /dev/null +++ b/package/libapparmor-utils/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBAPPARMOR_UTILS + bool "libapparmor utilities" + depends on BR2_PACKAGE_LIBAPPARMOR + help + Apparmor userspace utils, pam module and apache module + + http://wiki.apparmor.net diff --git a/package/libapparmor-utils/libapparmor-utils.hash b/package/libapparmor-utils/libapparmor-utils.hash new file mode 100644 index 0000000..e5ae65d --- /dev/null +++ b/package/libapparmor-utils/libapparmor-utils.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 267053234c68cdb122c5294d7c276b6e2f5fa7e75c6c2d23e3ce69f95d9a7639 apparmor-2.13.3.tar.gz +sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/libapparmor-utils/libapparmor-utils.mk b/package/libapparmor-utils/libapparmor-utils.mk new file mode 100644 index 0000000..3b2b47b --- /dev/null +++ b/package/libapparmor-utils/libapparmor-utils.mk @@ -0,0 +1,65 @@ +################################################################################ +# +# libapparmor-utils +# +################################################################################ + +LIBAPPARMOR_UTILS_BASE_VERSION = 2.13 +LIBAPPARMOR_UTILS_VERSION = $(LIBAPPARMOR_UTILS_BASE_VERSION).3 +LIBAPPARMOR_UTILS_SOURCE = apparmor-$(LIBAPPARMOR_UTILS_VERSION).tar.gz +LIBAPPARMOR_UTILS_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_UTILS_BASE_VERSION)/$(LIBAPPARMOR_UTILS_VERSION)/+download +LIBAPPARMOR_UTILS_LICENSE = GPL-2.0 +LIBAPPARMOR_UTILS_LICENSE_FILES = LICENSE +LIBAPPARMOR_UTILS_CONF_OPTS = --enable-static --enable-man-pages=no +LIBAPPARMOR_UTILS_DEPENDENCIES = libapparmor + +ifeq ($(BR2_PACKAGE_APACHE),y) + +LIBAPPARMOR_UTILS_DEPENDENCIES += apache +LIBAPPARMOR_UTILS_SUBDIRS += changehat/mod_apparmor +LIBAPPARMOR_UTILS_SUBDIRS_BUILD_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs + +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) + +LIBAPPARMOR_UTILS_DEPENDENCIES += linux-pam +LIBAPPARMOR_UTILS_SUBDIRS += changehat/pam_apparmor + +endif + +LIBAPPARMOR_UTILS_SUBDIRS_BUILD_CMD = $(TARGET_MAKE_ENV) \ + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D)/$(d) USE_SYSTEM=1 + +define LIBAPPARMOR_UTILS_BUILD_CMDS + $(foreach d,$(LIBAPPARMOR_UTILS_SUBDIRS), \ + $(LIBAPPARMOR_UTILS_SUBDIRS_BUILD_CMD) + ) +endef + +define LIBAPPARMOR_UTILS_INSTALL_TARGET_CMDS + $(foreach d,$(LIBAPPARMOR_UTILS_SUBDIRS), \ + $(LIBAPPARMOR_UTILS_SUBDIRS_BUILD_CMD) \ + DESTDIR=$(TARGET_DIR) install + ) +endef + +ifeq ($(BR2_PACKAGE_PYTHON3),y) + +LIBAPPARMOR_UTILS_SUBDIRS += utils +LIBAPPARMOR_UTILS_SUBDIRS_BUILD_CMD += PYTHON=$(HOST_DIR)/usr/bin/python3 + +endif + +# Enabling rules caching if the system is mounted R/W +ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y) + +define LIBAPPARMOR_UTILS_ENABLE_PROFILE_CACHE + $(SED) '/^#write-cache/c\write-cache' $(TARGET_DIR)/etc/apparmor/parser.conf +endef +LIBAPPARMOR_UTILS_POST_INSTALL_TARGET_HOOKS += LIBAPPARMOR_UTILS_ENABLE_PROFILE_CACHE + +endif + +$(eval $(generic-package))