From patchwork Thu Nov 17 16:30:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44560 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 C3F5D27BBED; Thu, 17 Nov 2022 16:31:05 +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 8B45027BBE9 for ; Thu, 17 Nov 2022 16:31:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovhn5-0002lZ-HF; Thu, 17 Nov 2022 11:31:03 -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 1ovhn4-0002km-07 for guix-patches@gnu.org; Thu, 17 Nov 2022 11:31:02 -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 1ovhn3-0002aX-NG for guix-patches@gnu.org; Thu, 17 Nov 2022 11:31:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovhn3-0003ff-Im for guix-patches@gnu.org; Thu, 17 Nov 2022 11:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59336] [PATCH 1/6] gnu: Add libapparmor. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 16:31: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 Received: via spool by 59336-submit@debbugs.gnu.org id=B59336.166870264114085 (code B ref 59336); Thu, 17 Nov 2022 16:31:01 +0000 Received: (at 59336) by debbugs.gnu.org; 17 Nov 2022 16:30:41 +0000 Received: from localhost ([127.0.0.1]:34112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhmj-0003f6-CT for submit@debbugs.gnu.org; Thu, 17 Nov 2022 11:30:41 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:50884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhmg-0003et-C5 for 59336@debbugs.gnu.org; Thu, 17 Nov 2022 11:30:40 -0500 Date: Fri, 18 Nov 2022 00:30:02 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668702632; 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=ftv+eeURXUBnv9G64zqBS6RGajoQ7Ibj7g9dTfnopDk=; b=tNL8WZRNrWvAHB57+7/5Z/4h5LKO1fxQhhW1GWxVc8AU3m6ubiKU5rkw38bcfgCF39z3a8 59DyCxSVgn2M9t5c2tEo1AN4ueNCeIPI34ZN/xhyhLv884kE1FRlNjxnW8CPQf5ZzVNwuB n2wJhQZ4koIIbpJyQJ2MUcEDCMdnQiKU5j3GVr/JaAMY3MVHgjFA1Na0KL2cq9bFt4LYfr Eq73FMQ4UBoOOaRU59fKYT+/hUkutaCTEbvncoYV+BGLJU9UkU28DVmJk+dPiBVHyRjLGj W/pp7/83+FWiMgJ3Fjeqdnd/rX+DjqVowrsBSGxyoTEv1JWhWteli/jXYfaiEA== 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: New file. (libapparmor): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add the file. --- gnu/local.mk | 1 + gnu/packages/apparmor.scm | 90 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 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..8cb4c7e94d --- /dev/null +++ b/gnu/packages/apparmor.scm @@ -0,0 +1,90 @@ +;;; 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") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "libraries/libapparmor")))))) + (native-inputs + (list autoconf + automake + bison + dejagnu + flex + libtool + perl + python-minimal + 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 Thu Nov 17 16:30:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44561 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 E5D1D27BBEC; Thu, 17 Nov 2022 16:32:30 +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 1634927BBE9 for ; Thu, 17 Nov 2022 16:32:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovhoC-0002xr-2x; Thu, 17 Nov 2022 11:32:13 -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 1ovho2-0002wd-Gy for guix-patches@gnu.org; Thu, 17 Nov 2022 11:32: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 1ovho1-0002gN-UI for guix-patches@gnu.org; Thu, 17 Nov 2022 11:32:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovho1-0003hI-Qh for guix-patches@gnu.org; Thu, 17 Nov 2022 11:32:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59336] [PATCH 2/6] gnu: Add apparmor. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 16: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 Received: via spool by 59336-submit@debbugs.gnu.org id=B59336.166870268514167 (code B ref 59336); Thu, 17 Nov 2022 16:32:01 +0000 Received: (at 59336) by debbugs.gnu.org; 17 Nov 2022 16:31:25 +0000 Received: from localhost ([127.0.0.1]:34116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhnQ-0003gQ-Vg for submit@debbugs.gnu.org; Thu, 17 Nov 2022 11:31:25 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:56414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhnP-0003gE-Om for 59336@debbugs.gnu.org; Thu, 17 Nov 2022 11:31:24 -0500 Date: Fri, 18 Nov 2022 00:30:48 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668702678; 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=gszaZmmBEUArVXGIjagIh9mJqQGqecSnWkXC4+lm5Pc=; b=rkaayiTDuUyZvMkpZXqnfHNU5wChhMkSXdRCtPajWjP5C6jwkYEubOj3/l5/CmtdWiCsgz urD9Flb1wTq1t61mGLy9LvzxDxbLkDTJvG63dwnyxi9dmP957vWapoXHK3bFcp8i/FFsmO XlZQX9S36LbVkgNTUrR3DCE6CAoXNisw15h3wZ4qEHFBzfVaBu56/nKt8Z02hWAvPN1OHP q+6CUR6tGAa/6ZKESB3srmUSP2PQFhI5jH8ydic9ONST7Zab6iik38PATTSKyPW494/Kuc gwbEYUMbI6vCMGywmxDiHj1d0zNQ5TFCrG0OdBKp84XIuqCeDSNWS74FYFE82Q== 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): New variable. --- gnu/packages/apparmor.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/apparmor.scm b/gnu/packages/apparmor.scm index 8cb4c7e94d..742414e18b 100644 --- a/gnu/packages/apparmor.scm +++ b/gnu/packages/apparmor.scm @@ -88,3 +88,40 @@ (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 + (package + (inherit libapparmor) + (name "apparmor") + (arguments + (list #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + "USE_SYSTEM=1") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-makefile-paths + (lambda _ + (for-each patch-shebang + '("common/list_af_names.sh" + "common/list_capabilities.sh")) + (for-each (lambda (file) + (substitute* file + (("/usr/bin/\\<(pod2man|pod2html|prove)\\>" all cmd) cmd) + (("/usr") ""))) + '("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-makefile-paths 'change-directory + (lambda _ + (chdir "binutils")))))) + (native-inputs (list gettext-minimal perl which)) + (inputs (list libapparmor)) + (license license:gpl2))) From patchwork Thu Nov 17 16:31:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44562 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 6583927BBEE; Thu, 17 Nov 2022 16:33:43 +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 76B8427BBEC for ; Thu, 17 Nov 2022 16:33:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovhp4-00039b-I7; Thu, 17 Nov 2022 11:33: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 1ovhp1-000392-LW 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 1ovhp0-0002of-WC 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 1ovhp0-0003jY-Rd for guix-patches@gnu.org; Thu, 17 Nov 2022 11:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59336] [PATCH 3/6] gnu: Add apparmor-parser. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 16:33: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 Received: via spool by 59336-submit@debbugs.gnu.org id=B59336.166870272314244 (code B ref 59336); Thu, 17 Nov 2022 16:33:02 +0000 Received: (at 59336) by debbugs.gnu.org; 17 Nov 2022 16:32:03 +0000 Received: from localhost ([127.0.0.1]:34120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovho3-0003hg-Eh for submit@debbugs.gnu.org; Thu, 17 Nov 2022 11:32:03 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:54398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovho1-0003h5-MW for 59336@debbugs.gnu.org; Thu, 17 Nov 2022 11:32:02 -0500 Date: Fri, 18 Nov 2022 00:31:26 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668702716; 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=V+M/WId5bnTq4tuM6k7nQKdQd2Vw7107CanPJ7yRTi4=; b=qCVDwXCF1iQkOxeDnXM+b21Limo8TUxEQc76WQxQZfuiX80AWB8mYxaFaT/Zl+xpWLhNJh lLGCTexXkSI7sdPXx6KEOSZfqczoQ9R9YU0ZgkErDqj/wKqzCwO+FEJ9q55PfuRma+UgcW ZwRjVG+Aq+TY7uisUm/T2S07682L9kmCpGdqBtjeXu17ZNT6eKbgsWViBnATdnHNsxfJ0u 2ZUpPHMqAOSCq2xLyqhJDJw3Ip+nOUTZIFTDLxGEzJOahk4KEeQhVRW1glzOJJRtisutr5 eBfWMrtiTAjti0Neaimf1jrXTGNs4kHm1vQIR7JKKdravBbxtCFr+DBR4Gt16g== 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-parser): New variable. --- gnu/packages/apparmor.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/apparmor.scm b/gnu/packages/apparmor.scm index 742414e18b..8648a2213f 100644 --- a/gnu/packages/apparmor.scm +++ b/gnu/packages/apparmor.scm @@ -125,3 +125,24 @@ (define-public apparmor (native-inputs (list gettext-minimal perl which)) (inputs (list libapparmor)) (license license:gpl2))) + +(define-public apparmor-parser + (let ((base apparmor)) + (package + (inherit base) + (name "apparmor-parser") + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'change-directory + (lambda _ + (chdir "parser"))) + (add-after 'change-directory 'fix-kernel-header-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("/include/linux/capability.h" path) + (search-input-file inputs path))))))))) + (native-inputs + (modify-inputs (package-native-inputs base) + (append bison flex python-minimal)))))) 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)))))) From patchwork Thu Nov 17 16:32:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44565 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 F422827BBED; Thu, 17 Nov 2022 16:34:29 +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 889E127BBE9 for ; Thu, 17 Nov 2022 16:34:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovhq2-0003YT-G3; Thu, 17 Nov 2022 11:34: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 1ovhpz-0003Xa-Hk for guix-patches@gnu.org; Thu, 17 Nov 2022 11:34: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 1ovhpx-00034V-Po for guix-patches@gnu.org; Thu, 17 Nov 2022 11:34:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovhpx-0003li-MJ for guix-patches@gnu.org; Thu, 17 Nov 2022 11:34:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59336] [PATCH 5/6] gnu: Add apparmor-profiles. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 16:34: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 Received: via spool by 59336-submit@debbugs.gnu.org id=B59336.166870279614415 (code B ref 59336); Thu, 17 Nov 2022 16:34:01 +0000 Received: (at 59336) by debbugs.gnu.org; 17 Nov 2022 16:33:16 +0000 Received: from localhost ([127.0.0.1]:34133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhpE-0003kR-1a for submit@debbugs.gnu.org; Thu, 17 Nov 2022 11:33:16 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:60084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhpC-0003kC-5Y for 59336@debbugs.gnu.org; Thu, 17 Nov 2022 11:33:14 -0500 Date: Fri, 18 Nov 2022 00:32:39 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668702788; 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=uUA4fMqwcQxkTaNDuLIstdPOC6kIYKMGKXdPko/1ywI=; b=P1KD9Z7apKay/NZoeBFrUaRvQCyUslHdzV/ecDDH1qI0h+GcF2GgbvUZytd20VGNaaqqqp 9RmXdHIRnsb5DnwG+AbMY1LMXXdfopxZ6CS7oFAL7MGfGX+QkW7TN6mugvcBNfZooQ5uTT cGGKbYNOhTny80klbUYjPowDhXabqj5gGbO5VBdEFHtSkhquH6ytxul56gym+b6CoYikUz BJtSGQsl1QgoEgXs1juM7Pozu4mT3fSmpwUXPN4rPzQmmAmpZSGBBTcBlJvDsfrmSc5L+e gZH3H5huWwhrFdtEI59z6iZ6MYZ774PGd/bOy1C5zcRIcpnxbDdo9vBQ7eso/g== 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-profiles): New variable. --- gnu/packages/apparmor.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/apparmor.scm b/gnu/packages/apparmor.scm index b753ffc88a..573666c27f 100644 --- a/gnu/packages/apparmor.scm +++ b/gnu/packages/apparmor.scm @@ -182,3 +182,20 @@ (define-public apparmor-utils (inputs (modify-inputs (package-inputs base) (append apparmor-parser)))))) + +(define-public apparmor-profiles + (let ((base apparmor)) + (package + (inherit base) + (name "apparmor-profiles") + (arguments + (append + (list #:tests? #f) ;Needs an AppArmor-enabled system. + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'change-directory + (lambda _ + (chdir "profiles")))))))) + (native-inputs (list which)) + (inputs '())))) From patchwork Thu Nov 17 16:33:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44564 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 16DD627BBED; Thu, 17 Nov 2022 16:34:27 +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 3CA7827BBEC for ; Thu, 17 Nov 2022 16:34:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovhq1-0003Y8-95; Thu, 17 Nov 2022 11:34:05 -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 1ovhpz-0003XZ-I8 for guix-patches@gnu.org; Thu, 17 Nov 2022 11:34: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 1ovhpy-00034b-6W for guix-patches@gnu.org; Thu, 17 Nov 2022 11:34:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovhpy-0003lp-1w for guix-patches@gnu.org; Thu, 17 Nov 2022 11:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59336] [PATCH 6/6] gnu: Add pam-apparmor. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 16:34: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 Received: via spool by 59336-submit@debbugs.gnu.org id=B59336.166870282714461 (code B ref 59336); Thu, 17 Nov 2022 16:34:02 +0000 Received: (at 59336) by debbugs.gnu.org; 17 Nov 2022 16:33:47 +0000 Received: from localhost ([127.0.0.1]:34136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhpj-0003lB-Bp for submit@debbugs.gnu.org; Thu, 17 Nov 2022 11:33:47 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:34020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovhph-0003kz-G7 for 59336@debbugs.gnu.org; Thu, 17 Nov 2022 11:33:45 -0500 Date: Fri, 18 Nov 2022 00:33:10 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668702819; 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=dzaqkRYYko+O8MggJcmVKPCmqA2powTt8OF9yTTK0nA=; b=YEyVvBX0DIeSXwoCTTNXtEQz98tS53trY057enJptG8lmZdcHjP0zXF5gCbyWkLUDsv+1T mCbxUztnSrfQ5J+B7vY9baOzNw2KNk9EjI/FF+rKSYNxCwRh1sdCpwa0B8JhQHZr5lTYCr NfgEUylpI6D76R+wekZ/sJ7//LQds486G62vdS7F5ul5hN34KjyC1CenTL3rnwYSFu6Gn3 SZoRrJPo99hzHvzQ6+Tg7Yae3fj46Zzvs9DMkHbtFywRbwdpZYpl1xJjESNl4dQ4oY/Pw6 7JfQihglHZ14BWGh52z9XNCSsAXuOQZGhTN05mvqkE4xYf/8oezXx6r4L2i7tA== 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 (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 573666c27f..85f3e9c6ae 100644 --- a/gnu/packages/apparmor.scm +++ b/gnu/packages/apparmor.scm @@ -199,3 +199,21 @@ (define-public apparmor-profiles (chdir "profiles")))))))) (native-inputs (list which)) (inputs '())))) + +(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))))