From patchwork Thu Nov 17 16:32:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44563 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 30D1927BBED; Thu, 17 Nov 2022 16:33:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F1A6527BBE9 for ; Thu, 17 Nov 2022 16:33:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovhp5-0003Ae-BD; Thu, 17 Nov 2022 11:33:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovhp1-000393-LP for guix-patches@gnu.org; Thu, 17 Nov 2022 11:33:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovhp1-0002og-Ax for guix-patches@gnu.org; Thu, 17 Nov 2022 11:33:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovhp1-0003jf-7S for guix-patches@gnu.org; Thu, 17 Nov 2022 11:33:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59336] [PATCH 4/6] gnu: Add apparmor-utils. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 16:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59336 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59336@debbugs.gnu.org Received: via spool by 59336-submit@debbugs.gnu.org id=B59336.166870275714304 (code B ref 59336); Thu, 17 Nov 2022 16:33:03 +0000 Received: (at 59336) by debbugs.gnu.org; 17 Nov 2022 16:32:37 +0000 Received: from localhost ([127.0.0.1]:34126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhoa-0003ie-JN for submit@debbugs.gnu.org; Thu, 17 Nov 2022 11:32:36 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:39030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhoZ-0003iR-Gr for 59336@debbugs.gnu.org; Thu, 17 Nov 2022 11:32:36 -0500 Date: Fri, 18 Nov 2022 00:32:00 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668702750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vj01kv1PlND74VSI2N2aHXAOVDgYEHCPvkCRastChow=; b=a0EsuFeQqiWnANxYySdscTIECkFlfwfA23mVCAUgM/zv5XMAfqAr89/T+T2n1L5Vjkx4ST f0lC6MY3YVxYk51kw5WvOxBoAvaT5tg8nbcgK8984vurfypd+v7Xkqdci1a3wT7s1BFsFo bFw6PQpbbxaBpRqCbr2hbIHgXJho/e4N8tLBC6ki0zjaNGb9hckIinad1BXJJccNVvM7d1 ygv/ivUrT2m18T4arPNajpiT5++DifRkVBh8018c4RAwIPpdz+uvmxDrAghntQAIeB8Tg+ +TVU2Je9gGosESgezbmX8uls5pCBRpPmATPRj4zLlQBqE766FP4mFF9N0TAcAw== Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/apparmor.scm (apparmor-utils): New variable. --- gnu/packages/apparmor.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/apparmor.scm b/gnu/packages/apparmor.scm index 8648a2213f..b753ffc88a 100644 --- a/gnu/packages/apparmor.scm +++ b/gnu/packages/apparmor.scm @@ -146,3 +146,39 @@ (define-public apparmor-parser (native-inputs (modify-inputs (package-native-inputs base) (append bison flex python-minimal)))))) + +(define-public apparmor-utils + (let ((base apparmor)) + (package + (inherit base) + (name "apparmor-utils") + (arguments + (append + ;; FIXME: Tests required Python library from this package (itself). + (list #:tests? #f) + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'change-directory + (lambda _ + (chdir "utils"))) + (add-after 'change-directory 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix kernel header path + (substitute* "Makefile" + (("/include/linux/capability.h" path) + (search-input-file inputs path))) + ;; Fix apparmor_parser path + (for-each (lambda (file) + (substitute* file + (("/sbin/apparmor_parser" path) + (search-input-file inputs path)))) + '("apparmor/aa.py" + "apparmor/easyprof.py" + "logprof.conf"))))))))) + (native-inputs + (modify-inputs (package-native-inputs base) + (append python-minimal))) + (inputs + (modify-inputs (package-inputs base) + (append apparmor-parser))))))