cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #233850 from helsinki-systems/upd/apparmor

Browse source 
apparmor: 3.1.3 -> 3.1.4
This commit is contained in:
ajs124 2023-05-31 12:12:30 +02:00 committed by GitHub
commit 957db96d53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/tests/apparmor.nix
View file

@ -1,4 +1,4 @@
import ./make-test-python.nix ({ pkgs, ... } : { import ./make-test-python.nix ({ pkgs, lib, ... } : {
name = "apparmor"; name = "apparmor";
meta.maintainers = with lib.maintainers; [ julm ]; meta.maintainers = with lib.maintainers; [ julm ];
@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ... } : {
# 4. Using `diff` against the expected output. # 4. Using `diff` against the expected output.
with subtest("apparmorRulesFromClosure"): with subtest("apparmorRulesFromClosure"):
machine.succeed( machine.succeed(
"${pkgs.diffutils}/bin/diff ${pkgs.writeText "expected.rules" '' "${pkgs.diffutils}/bin/diff -u ${pkgs.writeText "expected.rules" ''
mr ${pkgs.bash}/lib/**.so*, mr ${pkgs.bash}/lib/**.so*,
r ${pkgs.bash}, r ${pkgs.bash},
r ${pkgs.bash}/etc/**, r ${pkgs.bash}/etc/**,
@ -64,6 +64,12 @@ import ./make-test-python.nix ({ pkgs, ... } : {
r ${pkgs.libunistring}/lib/**, r ${pkgs.libunistring}/lib/**,
r ${pkgs.libunistring}/share/**, r ${pkgs.libunistring}/share/**,
x ${pkgs.libunistring}/foo/**, x ${pkgs.libunistring}/foo/**,
mr ${pkgs.glibc.libgcc}/lib/**.so*,
r ${pkgs.glibc.libgcc},
r ${pkgs.glibc.libgcc}/etc/**,
r ${pkgs.glibc.libgcc}/lib/**,
r ${pkgs.glibc.libgcc}/share/**,
x ${pkgs.glibc.libgcc}/foo/**,
''} ${pkgs.runCommand "actual.rules" { preferLocalBuild = true; } '' ''} ${pkgs.runCommand "actual.rules" { preferLocalBuild = true; } ''
${pkgs.gnused}/bin/sed -e 's:^[^ ]* ${builtins.storeDir}/[^,/-]*-\([^/,]*\):\1 \0:' ${ ${pkgs.gnused}/bin/sed -e 's:^[^ ]* ${builtins.storeDir}/[^,/-]*-\([^/,]*\):\1 \0:' ${
pkgs.apparmorRulesFromClosure { pkgs.apparmorRulesFromClosure {

4
pkgs/os-specific/linux/apparmor/default.nix
View file

@ -22,7 +22,7 @@
}: }:
let let
apparmor-version = "3.1.3"; apparmor-version = "3.1.4";
apparmor-meta = component: with lib; { apparmor-meta = component: with lib; {
homepage = "https://apparmor.net/"; homepage = "https://apparmor.net/";
@ -36,7 +36,7 @@ let
owner = "apparmor"; owner = "apparmor";
repo = "apparmor"; repo = "apparmor";
rev = "v${apparmor-version}"; rev = "v${apparmor-version}";
hash = "sha256-6N1BStOXKui6BxSriWVoOkvyGRUJ4btsloHh/SsG/JE="; hash = "sha256-YWPdIUd+2x74tqiW+YX8NKh3jxSKhD+5zdiDMjhPzpE=";
}; };
aa-teardown = writeShellScript "aa-teardown" '' aa-teardown = writeShellScript "aa-teardown" ''