Commit Graph

102 Commits

Author SHA1 Message Date
ajs124
991ec05997
Merge pull request #285915 from herrwiese/for-master/fix-273164
apparmor-utils: fix aa-remove-unknown read check
2024-02-25 15:16:23 +01:00
ajs124
635e64ed17 apparmor: 3.1.6 -> 3.1.7
https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.7
2024-02-09 10:13:43 +01:00
Andreas Wiese
b69ffeb3a2 apparmor-utils: fix aa-remove-unknown read check
let aaru = "aa-remove-unknown"; in

aaru tests whether /sys/kernel/security/apparmor/profiles can be opened.
Even though the file's permissions usually are 0444, open() still might
return `EPERM`, as this is a virtual filesystem.  Thus, using `test -r`
doesn't suffice for this check.

What aaru does to solve this is (approximately)

  if ! read … < /sys/kernel/security/apparmor/profiles; then
    echo "Meh";
  fi

In principal this works just fine.  When looking closer, it doesn't
(which is the root cause of #273164).  Careful readers will notice that
the actual access check (for `open()`) isn't actually related to the
`read` invocation, but the shell's input redirection, which works
totally fine:

If the file can't be opened, the shell will return an error and the test
fails.  `read` won't even be invoked.  The culprit is, the `read` shell
builtin might potentially jeopardize the *successful* test result
(`open()` succeeding): When no profiles are loaded, the file will be
empty and `read` will return 1 for `EOF`.

As the `if`'s command is only invoked after the actual test succeeded,
`true` is the command of choice here.

I would prefer fixing this upstream, but I refuse to register an account
there because GitLab.com wants me to validate an email address (sure), a
phone number (why?) and a valid payment method ([redacted]).

This fixes #273164 (»Apparmor service fails to start after nixos-rebuild
switch«).
2024-02-05 09:50:58 +01:00
ajs124
7b6580dba4 maintainers/teams: init and add helsinki-systems 2023-11-30 19:11:08 +01:00
Artturi
4564732311
Merge pull request #246644 from amjoseph-nixpkgs/pr/apparmor/fix-withPython-false 2023-08-28 21:56:49 +03:00
ajs124
bf4d2e6c1e
Merge pull request #242538 from tnias/fix/apparmor
apparmor: add some policies and improve abstractions and utils
2023-08-04 13:05:52 +02:00
Adam Joseph
65988b2546 apparmor: fix invalid reference when withPython=false
This commit fixes a bug exposed by #25322.
2023-08-01 14:02:17 -07:00
Philipp Bartsch
1256178263 apparmor: fix python import issues
With buildPythonApplication the PYTHONPATH is now populated properly,
which should address the ModuleNotFoundError issue.

I also moved some of the substitutions from postInstall to prePatch, so
they don't conflict with the wrapped executables.

Because upstream does not seem to hardcode binary paths in the utils
anymore, some of the old substituteInPlace rules could be removed.

Partial fix for nixpkgs#169056
2023-07-12 21:38:31 +02:00
ajs124
c83df39b80 apparmor: 3.1.5 -> 3.1.6
https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.6
2023-06-22 14:09:09 +02:00
ajs124
cf5bf9b41a apparmor: fix licenses and add myself as maintainer 2023-06-22 13:34:40 +02:00
ajs124
7eb8fc54d1 apparmor: 3.1.4 -> 3.1.5
https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.5
2023-06-09 17:05:32 +02:00
ajs124
ab59da8955 apparmor: 3.1.3 -> 3.1.4
https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.4
Fixes CVE-2016-1585
2023-05-24 18:39:06 +02:00
Martin Weinelt
7729b44895
Merge pull request #218793 from helsinki-systems/upd/apparmor
apparmor: 3.1.2 -> 3.1.3
2023-03-04 00:56:40 +00:00
ajs124
2fffdddd69 apparmor: 3.1.2 -> 3.1.3
https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.3
2023-02-28 12:37:23 +01:00
Mario Rodas
2e600361c1 apparmor-parser: fix pname 2023-01-28 04:20:00 +00:00
ajs124
dba9750e76 apparmor: 3.1.1 -> 3.1.2
https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.2
2022-11-08 12:36:34 +01:00
Franz Pletz
2c2fde951c
apparmor: fix build with libxcrypt 2022-10-09 18:09:40 +02:00
ajs124
a1801d7cb3 apparmor: 3.0.7 -> 3.1.1
https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1
2022-09-27 22:16:11 +02:00
ajs124
9ea219186d apparmor: 3.0.4 -> 3.0.7 2022-08-09 19:57:57 +02:00
Ben Siraphob
259fa13d53 treewide: remove nativeBuildInputs that are in stdenv 2022-04-16 21:46:46 +03:00
ajs124
68cf28cec7 apparmor: clean-up python path 2022-02-25 01:42:59 +01:00
ajs124
4322a39763 apparmor: 3.0.3 -> 3.0.4 2022-02-25 01:40:15 +01:00
zowoq
da1a40da75 Revert "apparmor: 3.0.3 -> 3.0.4"
This reverts commit bcf2265fea.

Causes mass rebuild on master
2022-02-24 11:16:20 +10:00
ajs124
f6ada535c9
Merge pull request #160070 from helsinki-systems/upd/apparmor
apparmor: 3.0.3 -> 3.0.4
2022-02-24 00:23:32 +01:00
Andrew Marshall
8027aebf37
apparmor: fix typo in comment; improve formatting
(#158630)
* apparmor: Fix typo in comment

* apparmor: Formatting

- Normal line length
- Idiomatic Nix
- More clearly separate “code”
2022-02-18 14:53:17 +01:00
ajs124
bcf2265fea apparmor: 3.0.3 -> 3.0.4 2022-02-15 01:05:22 +01:00
Sandro Jäckel
cbfc50722f
maintainers: drop phreedom 2021-12-19 07:30:50 +01:00
Sandro Jäckel
0f2734ac04
apparmor: switch to pname+version, minor formatting, cleanups 2021-11-07 18:01:32 +01:00
Artturin
7782153abb apparmor: enable strictDeps for apparmor-utils
checked with diffoscope
2021-11-05 19:57:03 +02:00
Artturin
bef48d172a apparmor: disable strictDeps explicitly for libapparmor
do not override python to python3 in all-packages
2021-11-05 19:57:03 +02:00
ajs124
cb2ed1c0ab apparmor: 3.0.1 -> 3.0.3 2021-08-18 17:36:39 -04:00
Felix Buehler
2839056206 apparmor-kernel-patches: deprecate phases 2021-08-02 20:50:52 +02:00
github-actions[bot]
e21fb16f9a
Merge master into staging-next 2021-05-08 06:20:05 +00:00
Silvan Mosberger
08d94fd2b0
Merge pull request #114374 from oxalica/lib/platform-support-check
lib.meta: introduce `availableOn` to check package availability on given platform
2021-05-08 03:54:36 +02:00
Julien Moutinho
45e5d726b2 nixos/apparmor: improve code readability 2021-04-23 07:20:19 +02:00
Julien Moutinho
7996dfb1a1 apparmor: 3.0.0 -> 3.0.1 2021-04-23 07:17:57 +02:00
Julien Moutinho
8f9b29d168 apparmor: 2.13.5 -> 3.0.0 2021-04-23 07:17:56 +02:00
Julien Moutinho
05d334cfe2 Revert "Revert "apparmor: fix and improve the service""
This reverts commit 420f89ceb2.
2021-04-23 07:17:55 +02:00
oxalica
354d262db8
lib.meta: introduce availableOn 2021-04-02 19:20:23 +08:00
rnhmjoj
61b7cab481
treewide: use perl.withPackages when possible
Since 03eaa48 added perl.withPackages, there is a canonical way to
create a perl interpreter from a list of libraries, for use in script
shebangs or generic build inputs. This method is declarative (what we
are doing is clear), produces short shebangs[1] and needs not to wrap
existing scripts.

Unfortunately there are a few exceptions that I've found:

  1. Scripts that are calling perl with the -T switch. This makes perl
  ignore PERL5LIB, which is what perl.withPackages is using to inform
  the interpreter of the library paths.

  2. Perl packages that depends on libraries in their own path. This
  is not possible because perl.withPackages works at build time. The
  workaround is to add `-I $out/${perl.libPrefix}` to the shebang.

In all other cases I propose to switch to perl.withPackages.

[1]: https://lwn.net/Articles/779997/
2021-03-31 21:35:37 +02:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob
16d91ee628 pkgs/os-specific: stdenv.lib -> lib 2021-01-17 23:26:08 +07:00
ajs124
e60919c3d3 apparmor: 2.13.5 -> 2.13.6 2020-12-17 07:32:24 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
ajs124
b2602d1a39 apparmor: 2.13.4 -> 2.13.5 2020-10-20 21:03:28 +02:00
Vladimír Čunát
420f89ceb2
Revert "apparmor: fix and improve the service"
This reverts commit fb6d63f3fd.

I really hope this finally fixes #99236: evaluation on Hydra.
This time I really did check basically the same commit on Hydra:
https://hydra.nixos.org/eval/1618011

Right now I don't have energy to find what exactly is wrong in the
commit, and it doesn't seem important in comparison to nixos-unstable
channel being stuck on a commit over one week old.
2020-10-07 12:22:18 +02:00
Julien Moutinho
fb6d63f3fd apparmor: fix and improve the service 2020-09-06 07:43:03 +02:00
Sascha Grunert
372edacef2
apparmor: fix apparmor_parser path for utils package
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-23 20:42:59 +02:00