+1
-1
maintainers/maintainer-list.nix
+1
-1
maintainers/maintainer-list.nix
+17
nixos/doc/manual/release-notes/rl-2105.xml
+17
nixos/doc/manual/release-notes/rl-2105.xml
···+for the <link xlink:href="https://gitlab.com/apparmor/apparmor/-/wikis/Documentation">AppArmor</link>+The most notable change on the user-side is the new option <xref linkend="opt-security.apparmor.policies"/>,+Security-minded users may also want to enable <xref linkend="opt-security.apparmor.killUnconfinedConfinables"/>,The GNOME desktop manager once again installs <package>gnome3.epiphany</package> by default.
+34
nixos/modules/config/fonts/fontconfig.nix
+34
nixos/modules/config/fonts/fontconfig.nix
···
+7
nixos/modules/config/malloc.nix
+7
nixos/modules/config/malloc.nix
···
-1
nixos/modules/module-list.nix
-1
nixos/modules/module-list.nix
+1
nixos/modules/profiles/hardened.nix
+1
nixos/modules/profiles/hardened.nix
-49
nixos/modules/security/apparmor-suid.nix
-49
nixos/modules/security/apparmor-suid.nix
···-(mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ])
+205
-48
nixos/modules/security/apparmor.nix
+205
-48
nixos/modules/security/apparmor.nix
···+(mkRemovedOptionModule [ "security" "apparmor" "confineSUIDApplications" ] "Please use the new options: `security.apparmor.policies.<policy>.enable'.")+(mkRemovedOptionModule [ "security" "apparmor" "profiles" ] "Please use the new option: `security.apparmor.policies'.")+environment.etc."apparmor/severity.db".source = pkgs.apparmor-utils + "/etc/apparmor/severity.db";+custom_includes = /etc/apparmor.d ${concatMapStringsSep " " (p: "${p}/etc/apparmor.d") cfg.packages}+${pkgs.jq}/bin/jq --raw-output '.processes | .[] | .[] | select (.status == "unconfined") | .pid' |+commonOpts = p: "--verbose --show-cache ${optionalString (!p.enforce) "--complain "}${p.profile}";+ExecStart = mapAttrsToList (n: p: "${pkgs.apparmor-parser}/bin/apparmor_parser --add ${commonOpts p}") enabledPolicies;+mapAttrsToList (n: p: "${pkgs.apparmor-parser}/bin/apparmor_parser --replace ${commonOpts p}") enabledPolicies ++
+317
nixos/modules/security/apparmor/includes.nix
+317
nixos/modules/security/apparmor/includes.nix
···+${lib.optionalString (pkgs.glibcLocales != null) "r ${pkgs.glibcLocales}/lib/locale/locale-archive,"}
+11
nixos/modules/security/apparmor/profiles.nix
+11
nixos/modules/security/apparmor/profiles.nix
···+config.security.apparmor.policies."bin.ping".profile = lib.mkIf apparmor.policies."bin.ping".enable ''
+4
nixos/modules/security/misc.nix
+4
nixos/modules/security/misc.nix
···+(lib.mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ])
+75
nixos/modules/security/pam.nix
+75
nixos/modules/security/pam.nix
···
+8
nixos/modules/security/wrappers/default.nix
+8
nixos/modules/security/wrappers/default.nix
···
+34
-90
nixos/modules/services/torrent/transmission.nix
+34
-90
nixos/modules/services/torrent/transmission.nix
·········
+15
nixos/modules/tasks/network-interfaces.nix
+15
nixos/modules/tasks/network-interfaces.nix
···+security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter ''
+8
-4
nixos/modules/virtualisation/lxc.nix
+8
-4
nixos/modules/virtualisation/lxc.nix
···
+11
-5
nixos/modules/virtualisation/lxd.nix
+11
-5
nixos/modules/virtualisation/lxd.nix
···
+1
nixos/tests/all-tests.nix
+1
nixos/tests/all-tests.nix
···
+82
nixos/tests/apparmor.nix
+82
nixos/tests/apparmor.nix
···
+27
pkgs/applications/networking/p2p/transmission/default.nix
+27
pkgs/applications/networking/p2p/transmission/default.nix
·········
+65
-17
pkgs/os-specific/linux/apparmor/default.nix
+65
-17
pkgs/os-specific/linux/apparmor/default.nix
···-url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";+url = "https://launchpad.net/apparmor/${lib.versions.majorMinor apparmor-version}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";···-url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";···substituteInPlace ./utils/apparmor/easyprof.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser"substituteInPlace ./utils/apparmor/aa.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser"substituteInPlace ./utils/logprof.conf --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser"···installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" "VIM_INSTALL_PATH=$(out)/share" "PYPREFIX=" ];-for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-status aa-unconfined ; do+for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; dowrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"+--replace "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions"······substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages"···+do printf >>$out "%s,\n" ${lib.concatMapStringsSep " " (x: "\"${x}\"") (baseRules ++ additionalRules)}···
+32
pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh
+32
pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh
···
+22
pkgs/os-specific/linux/iputils/default.nix
+22
pkgs/os-specific/linux/iputils/default.nix
·········
+21
-1
pkgs/tools/networking/inetutils/default.nix
+21
-1
pkgs/tools/networking/inetutils/default.nix
·········
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix
···