From patchwork Thu Mar 26 22:56:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1262413 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=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=Bvlhyhy8; 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 48pL2x3TWyz9sSL for ; Fri, 27 Mar 2020 09:56:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 661FB87587; Thu, 26 Mar 2020 22:56:55 +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 rnzRa4R2M3lc; Thu, 26 Mar 2020 22:56:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2A7248753C; Thu, 26 Mar 2020 22:56:54 +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 0AABE1BF322 for ; Thu, 26 Mar 2020 22:56:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0726120505 for ; Thu, 26 Mar 2020 22:56:51 +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 H1YAmBUyjRFy for ; Thu, 26 Mar 2020 22:56:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by silver.osuosl.org (Postfix) with ESMTPS id 8256120504 for ; Thu, 26 Mar 2020 22:56:49 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id z5so9356352wml.5 for ; Thu, 26 Mar 2020 15:56:49 -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; bh=Zc2b1HUU8gHxzXjfzLxsdAmcBB9Ts/+/AGBaqRjit20=; b=Bvlhyhy8MkH3nV3MYH+0NF9wUdbB9JU77KEx7pIq6jfCDPDhOV5NITFj6vhIAEjFKx pYZHO9TxO8zVdJcW3MJaod8xZrMEs9E6+xTdWAF4aagTByAboL9xp1KEH4SJZJ87c34W 8G/+PrXuuAG7CpUsG5rPhXK+tFWm1ceb63sPVdRyqRw/r6FKge49xeH5DcMK9sRidv6o 333S1cOleGFnY1v5hZyQ8wRtnTaHfF6F/S3p/0oHg5OR0VcVotCCnXXBetdaIhohnsuC CkTNVNTgrTfsEpC8JhMDAavxZ/UBgldTcalO+ET3/3hFGqE1EoXyvjTqA4rHsucqW4U8 IarQ== 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=Zc2b1HUU8gHxzXjfzLxsdAmcBB9Ts/+/AGBaqRjit20=; b=D55TmlCQLLL/1OPx2yCcAmsZYo94ze00BVcSnKO9bYMaMSCJpSUfMsS3b/SkitG2tG FoMtfFGPP1FD4nzA+A/iWKWTHtubDR8htks4sK7CaD7AcM4r+IRCwFTO4daveE/TVmTU zwUadHhHl6E8ENFgsO6dP0OB/jgyPlexAYaqOKH7k3cVjttz0JDJftMU4UtAgiwICAsb m3gNsLHZgACUFlMlpGOCV0LwSsx06NQnaJ9EszsTL20qgsg6SH5MuTfw/EKCdtOQ+XfP WWZnCVs69ery26YhaMJtC/LTf/Z9xhfWPwQ0ZbMH7ueYA5OzuXMU9BqnqJXM3kBdeb2t iL7A== X-Gm-Message-State: ANhLgQ2PgYY0ep5Jn/tMDv2x9St9yzJCrkEwp9HZxzQRBplsrccnpRK8 3kX1NoLs45+4AwAS8YRNdM8MSJn8L64= X-Google-Smtp-Source: ADFU+vv1Y8kz29Plvt4GyI+ZFsWypMm25cjo46YWVDrOibsB+4X8ocpOXDoYPXnCxnTo6TzysoIEbQ== X-Received: by 2002:a1c:e3c2:: with SMTP id a185mr2157833wmh.64.1585263407412; Thu, 26 Mar 2020 15:56:47 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id t124sm5879752wmg.13.2020.03.26.15.56.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 15:56:46 -0700 (PDT) From: Angelo Compagnucci X-Google-Original-From: Angelo Compagnucci To: buildroot@buildroot.org Date: Thu, 26 Mar 2020 23:56:41 +0100 Message-Id: <20200326225641.15536-2-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200326225641.15536-1-angelo@amarulasolutions.com> References: <20200326225641.15536-1-angelo@amarulasolutions.com> Subject: [Buildroot] [PATCH v3 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 MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch adds libapparmor related tools. Signed-off-by: Angelo Compagnucci --- DEVELOPERS | 1 + package/Config.in | 1 + package/libapparmor-utils/Config.in | 7 ++ .../libapparmor-utils/libapparmor-utils.hash | 3 + .../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 3ab96b8707..d86c61b416 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 31445af0f3..6702ca4b6e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1884,6 +1884,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 0000000000..4fe1074f5d --- /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 0000000000..e5ae65d91c --- /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 0000000000..3b2b47be07 --- /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))