From patchwork Fri Nov 18 04:29:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44580 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 120DE27BBED; Fri, 18 Nov 2022 04:30:40 +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 D351827BBE9 for ; Fri, 18 Nov 2022 04:30:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovt0x-0000dE-Ja; Thu, 17 Nov 2022 23:30: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 1ovt0t-0000cI-Pn for guix-patches@gnu.org; Thu, 17 Nov 2022 23:30:05 -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 1ovt0t-0004EO-Gx for guix-patches@gnu.org; Thu, 17 Nov 2022 23:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovt0t-0007Mc-Aj for guix-patches@gnu.org; Thu, 17 Nov 2022 23:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59336] [PATCH v2 1/3] gnu: Add libapparmor. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Nov 2022 04:30: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 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166874580028263 (code B ref -1); Fri, 18 Nov 2022 04:30:03 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2022 04:30:00 +0000 Received: from localhost ([127.0.0.1]:34864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovt0p-0007Ln-Qx for submit@debbugs.gnu.org; Thu, 17 Nov 2022 23:30:00 -0500 Received: from lists.gnu.org ([209.51.188.17]:42464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovt0o-0007Lf-7T for submit@debbugs.gnu.org; Thu, 17 Nov 2022 23:29:59 -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 1ovt0o-0000bH-2j for guix-patches@gnu.org; Thu, 17 Nov 2022 23:29:58 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovt0l-00046E-T2 for guix-patches@gnu.org; Thu, 17 Nov 2022 23:29:57 -0500 Date: Fri, 18 Nov 2022 12:29:24 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668745794; 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=knP6EeGe8589/kWnFKcFq+RLUoRFSRrhIl1zgQoj/XU=; b=F4e06UC7OgpeQeeeDXt370snGH5avo/nQMs7dCCc6JDqJjyVuNCRka3/8BvIIOZrPf13WN 9yu1oqXIk24aFOvqTU07m4Us+AlS52MTPrXhA9otcmFMVZ7oe43tAPDvcekIpqepkCFMQd nIiRadoraVzffNC+bUS0vSBMLB8BufHmt+14GbifC+AxMjtaLXG1ZXbq87TSmly4esRHHr t31rXzJnwXwQtrcPhmQ03UDlMCWcmTLVGjPTLLFd7G6K6GFcL3KI3lU14stfpnGDJ8HOmJ mJ2gafq3+HFPpKcjFVCJ1LPzQ4uNu7GA7kQU90LZk4STZdHTR09Zxb7ZYKz5Eg== 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 Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: New file. (libapparmor): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add the file. --- gnu/local.mk | 1 + gnu/packages/apparmor.scm | 112 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 gnu/packages/apparmor.scm diff --git a/gnu/local.mk b/gnu/local.mk index b154caaaaa..8907ca625b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -115,6 +115,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/anthy.scm \ %D%/packages/antivirus.scm \ %D%/packages/apl.scm \ + %D%/packages/apparmor.scm \ %D%/packages/apr.scm \ %D%/packages/arcan.scm \ %D%/packages/aspell.scm \ diff --git a/gnu/packages/apparmor.scm b/gnu/packages/apparmor.scm new file mode 100644 index 0000000000..ac97580640 --- /dev/null +++ b/gnu/packages/apparmor.scm @@ -0,0 +1,112 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Hilton Chain +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages apparmor) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bison) + #:use-module (gnu packages dejagnu) + #:use-module (gnu packages flex) + #:use-module (gnu packages gawk) + #:use-module (gnu packages gettext) + #:use-module (gnu packages linux) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages ruby) + #:use-module (gnu packages swig) + #:use-module (guix build-system gnu) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define-public libapparmor + (package + (name "libapparmor") + (version "3.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/apparmor/apparmor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h77a7ww0rxfv5nsi1iy4fffklxdr2vq6r7kdsqm15yysglhbjyi")))) + (build-system gnu-build-system) + (arguments + (list #:configure-flags + #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") + "--with-perl" "--with-python" "--with-ruby") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (for-each patch-shebang + '("common/list_af_names.sh" + "common/list_capabilities.sh")) + (for-each (lambda (file) + (substitute* file + (("/usr") "") + (("/bin/\\<(pod2man|pod2html|podchecker|prove)\\>" path) + (search-input-file inputs path)) + (("/include/linux/capability.h" path) + (search-input-file inputs path)))) + '("common/Make-po.rules" + "common/Make.rules" + "binutils/Makefile" + "parser/Makefile" + "parser/tst/Makefile" + "profiles/Makefile" + "utils/Makefile" + "utils/python-tools-setup.py" + "utils/vim/Makefile")))) + (add-after 'fix-paths 'change-directory + (lambda _ + (chdir "libraries/libapparmor")))))) + (native-inputs + (list autoconf + automake + bison + dejagnu + flex + libtool + perl + python-minimal + ruby + swig + which)) + (home-page "https://apparmor.net") + (synopsis "Linux kernel security module") + (description + "AppArmor is an effective and easy-to-use Linux application security +system. + +AppArmor proactively protects the operating system and applications from +external or internal threats, even zero-day attacks, by enforcing good +behavior and preventing both known and unknown application flaws from being +exploited. + +AppArmor supplements the traditional Unix discretionary access control (DAC) +model by providing mandatory access control (MAC). It has been included in +the mainline Linux kernel since version 2.6.36 and its development has been +supported by Canonical since 2009.") + (license license:lgpl2.1))) From patchwork Fri Nov 18 04:30:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44581 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 E66F427BBEC; Fri, 18 Nov 2022 04:31:17 +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 06BCD27BBE9 for ; Fri, 18 Nov 2022 04:31:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovt1s-0000uv-QF; Thu, 17 Nov 2022 23:31:04 -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 1ovt1q-0000uf-WE for guix-patches@gnu.org; Thu, 17 Nov 2022 23:31:03 -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 1ovt1q-0004Td-NQ for guix-patches@gnu.org; Thu, 17 Nov 2022 23:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovt1q-0007Pe-Iy for guix-patches@gnu.org; Thu, 17 Nov 2022 23:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59336] [PATCH v2 2/3] gnu: Add apparmor. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Nov 2022 04:31:02 +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 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166874585128474 (code B ref -1); Fri, 18 Nov 2022 04:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2022 04:30:51 +0000 Received: from localhost ([127.0.0.1]:34872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovt1e-0007PC-Ma for submit@debbugs.gnu.org; Thu, 17 Nov 2022 23:30:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:51390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovt1d-0007P5-8P for submit@debbugs.gnu.org; Thu, 17 Nov 2022 23:30:49 -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 1ovt1c-0000se-D5 for guix-patches@gnu.org; Thu, 17 Nov 2022 23:30:49 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovt1a-0004On-Ee for guix-patches@gnu.org; Thu, 17 Nov 2022 23:30:47 -0500 Date: Fri, 18 Nov 2022 12:30:14 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668745844; 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=71lS6wljEtVrsGAwrEx5Y8zMtTKBYvbwiIm7lw3j24o=; b=NCeAh+GPcSxnhtyJwKWsG3I+nyhtnSP+Swiu1xNnB8slq4rk9hsNYIseEO75qCaxYZ/86C UUZCVxZTIhyqw7Wfu3CYEY1qX/5666mMeO2VkewdCZgMb+nUmBRxs3bkcmfZRxTjTNqNth TuWseeAA7zJY0jRAklxDUzIx+gDkH4Ij3s4X6gwem8JR2Fo5T1MH+1cRcST0wX49b0vt+f iV7bXptn2LwszbslrQw8C6jVCmYalgqaqvyRgvWKx+LiWFjWvZf72n7jY8EWYU4cBNzdB3 /mBPPVb+t3cZxc7z59eTLdMTk81+t7DbDGHRR/G9XMjp1XBSeu3urlYZ65YDzg== 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 Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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): New variable. --- gnu/packages/apparmor.scm | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/apparmor.scm b/gnu/packages/apparmor.scm index ac97580640..82c00ebb0e 100644 --- a/gnu/packages/apparmor.scm +++ b/gnu/packages/apparmor.scm @@ -110,3 +110,69 @@ (define-public libapparmor the mainline Linux kernel since version 2.6.36 and its development has been supported by Canonical since 2009.") (license license:lgpl2.1))) + +(define-public apparmor + (let ((base libapparmor)) + (package + (inherit base) + (name "apparmor") + (arguments + (append + (list #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + "USE_SYSTEM=1" + ;; No need to run the linter + "PYFLAKES=true")) + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'configure) + ;; apparmor-binutils + (replace 'change-directory + (lambda _ + (chdir "binutils"))) + + ;; apparmor-parser + (add-after 'install 'chdir-parser + (lambda _ + (chdir "../parser"))) + (add-after 'chdir-parser 'patch-source-shebangs-parser + (assoc-ref %standard-phases 'patch-source-shebangs)) + (add-after 'patch-source-shebangs-parser 'build-parser + (assoc-ref %standard-phases 'build)) + (add-after 'build-parser 'check-parser + (assoc-ref %standard-phases 'check)) + (add-after 'check-parser 'install-parser + (assoc-ref %standard-phases 'install)) + + ;; apparmor-utils + ;; FIXME: Tests required Python library from this package + ;; (itself). + (add-after 'install-parser 'chdir-utils + (lambda _ + (chdir "../utils") + ;; Fix paths to installed policygroups and templates for + ;; easyprof. + (substitute* "easyprof/easyprof.conf" + (("/usr") #$output)))) + (add-after 'chdir-utils 'build-utils + (assoc-ref %standard-phases 'build)) + (add-after 'build-utils 'install-utils + (assoc-ref %standard-phases 'install)) + + ;; apparmor-profiles + ;; FIXME: Tests need an AppArmor-enabled system. + (add-after 'install-utils 'chdir-profiles + (lambda _ + (chdir "../profiles"))) + (add-after 'chdir-profiles 'build-profiles + (assoc-ref %standard-phases 'build)) + (add-after 'check-build 'install-profiles + (assoc-ref %standard-phases 'install))))))) + (propagated-inputs + (list libapparmor)) + ;; Python module `readline' needed + (native-inputs + (list bison flex gettext-minimal perl python which)) + (license license:gpl2)))) From patchwork Fri Nov 18 04:30:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44582 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 CCB0727BBEC; Fri, 18 Nov 2022 04:32:22 +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 481C727BBE9 for ; Fri, 18 Nov 2022 04:32:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovt2s-00013p-LY; Thu, 17 Nov 2022 23:32:06 -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 1ovt2o-000139-9f for guix-patches@gnu.org; Thu, 17 Nov 2022 23:32:05 -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 1ovt2o-0004du-1D for guix-patches@gnu.org; Thu, 17 Nov 2022 23:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovt2n-0007RF-SV for guix-patches@gnu.org; Thu, 17 Nov 2022 23:32:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59336] [PATCH v2 3/3] gnu: Add pam-apparmor. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Nov 2022 04:32:01 +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 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166874588528548 (code B ref -1); Fri, 18 Nov 2022 04:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2022 04:31:25 +0000 Received: from localhost ([127.0.0.1]:34876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovt2D-0007QO-38 for submit@debbugs.gnu.org; Thu, 17 Nov 2022 23:31:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:45550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovt2C-0007QH-Gd for submit@debbugs.gnu.org; Thu, 17 Nov 2022 23:31:24 -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 1ovt2B-00010p-Dh for guix-patches@gnu.org; Thu, 17 Nov 2022 23:31:24 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovt29-0004Wz-Vg for guix-patches@gnu.org; Thu, 17 Nov 2022 23:31:23 -0500 Date: Fri, 18 Nov 2022 12:30:50 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668745880; 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=kvmh7ooj7q6cd3K5jvawjJTPBzaDDpdOqqiPbJf2hYc=; b=K81ZCIWg9blFQcETwXfTNcNa7sY5hOpw3clDNOFUqDGPPe7934CNCzrOeTF7bIxZ0zfZ4D M9dEnr4SgE2vtUit0UCFOtd1C/xL0S3Uq+wzUvG/NQqbpGIW1QF6LK3f93QGRQxuJtXmLI C+JO2M/uwDjEbR3dTII+vqL+6gPSoSk0u+8L8ePVntw1TyMahmTZM4o1btgC76upd6uLr4 IhQtzWAvTNL6tsLKs+BLGdEIxKqc+BlH+EkphEMaaKbTBArWSwELJyhYQxFXdk8ANEy2V6 /SiHpbIJ0Y4yoc35fuyUqtxDIaGfo4ypm5Z85mySrQDaj925PBr/1RYv1NelqQ== 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 Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 (pam-apparmor): New variable. --- gnu/packages/apparmor.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/apparmor.scm b/gnu/packages/apparmor.scm index 82c00ebb0e..3136091747 100644 --- a/gnu/packages/apparmor.scm +++ b/gnu/packages/apparmor.scm @@ -176,3 +176,21 @@ (define-public apparmor (native-inputs (list bison flex gettext-minimal perl python which)) (license license:gpl2)))) + +(define-public pam-apparmor + (let ((base apparmor)) + (package + (inherit base) + (name "pam-apparmor") + (arguments + (append + (list #:tests? #f) ;no tests + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'change-directory + (lambda _ + (chdir "changehat/pam_apparmor")))))))) + (native-inputs (list pkg-config which)) + (inputs (list libapparmor linux-pam)) + (license license:bsd-3))))