Commit Graph

41 Commits

Author SHA1 Message Date
Ding Xiang Fei
63fcc2a0a9 apparmor: make apparmor cross-compile 2019-06-29 19:17:21 +08:00
Matthew Bauer
498ad3e8c0 apparmor: use stdenv.lib.getDev for headers 2019-02-24 17:00:48 -05:00
volth
bb9557eb7c lib.makePerlPath -> perlPackages.makePerlPath 2018-12-15 03:50:31 +00:00
Will Dietz
e82d79b679 libapparmor: drop conflicting patch, fix build w/musl 2018-11-29 08:48:27 -06:00
Joachim Fasting
6bd6c97ae8
apparmor: 2.12.0 -> 2.13.1 2018-10-22 20:36:34 +02:00
Tuomas Tynkkynen
50d0360888 apparmor: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
John Ericson
34da7e2ce2 treewide: Remove stdenv.isCross
I *want* cross-specific overrides to be verbose, so I rather not have
this shorthand. This makes the syntactic overhead more proportional to
the maintainence cost. Hopefully this pushes people towards fewer
conditionals and more abstractions.
2018-08-02 15:01:58 -04:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Shea Levy
e21300a6ae
libapparmor: Fix cross-compilation. 2018-02-25 09:38:55 -05:00
Will Dietz
3b5e1131a7 libapparmor: Add musl patches from Alpine
(update: drop patches no longer needed on updated version)
2018-02-13 09:44:49 -06:00
corpix
0db68e5d42 apparmor: updating utilities to fresh python (#34049)
* apparmor: updating utilities to fresh python

* apparmor: better way to depend on python

* apparmor: override python derivation on the top-level
2018-01-20 09:29:03 +01:00
adisbladis
d672a9a5cd
apparmor: 2.10 -> 2.12.0 2017-12-31 16:40:19 +01:00
Vladimír Čunát
6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Eelco Dolstra
e05c4c6541 libapparmor: Move python stuff to a separate output
This prevents systemd and by extension a zillion other packages from
having Python 2.7 in their closure. For example, the closure of
systemd dropped from 133 MiB to 85 MiB.
2016-09-01 18:57:43 +02:00
Joachim Fasting
192a1ada24
apparmor: cleanups
- Move build tools to nativeBuildInputs
- capability.h should come from linuxHeaders not glibc
- Delete v2.9
2016-04-18 02:21:12 +02:00
Vladimír Čunát
9d19ac7d0d apparmor: fixup to use some multiple-output paths 2015-10-03 16:37:26 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Joachim Fasting
fdb4633e4b apparmor-utils: wrap python and perl scripts
This allows all utilties to at least run, though most still fail
because they expect to be able to read a non-existent config file.

Also, aa-notify refuses to run due to a self-check on the filename,
which cannot be preceded by a '.'. This has to be patched or we
need to set PERL5LIB some other way.
2015-08-26 22:58:12 +02:00
Joachim Fasting
ed5f6be317 apparmor: use standard phase hooks 2015-08-26 22:58:12 +02:00
Joachim Fasting
1dd8dd4ca8 apparmor: 2.9.1 -> 2.10
An incremental release, including several fixes to the parser, library, and
userspace management tools. See [1] for a comprehensive changelog.

[1]: http://wiki.apparmor.net/index.php/ReleaseNotes_2_10
2015-08-26 22:58:12 +02:00
Austin Seipp
9c0f3d8829 nixpkgs: apparmor - remove dbus dependency
This was untested and didn't function without a dbus patch which wasn't
applied to the system dbus package, so it wasn't used at all.

Also, it creates a weird cyclic dependency if we want systemd to depend
on libapparmor (for AppArmorProfiles= support), because libapparmor then
wants dbus, and dbus wants systemd. Oof.

Luckily, this feature and whatnot will probably all be irrelevant in the
glorious kdbus-based future, and the dbus patches aren't even upstream I
think. So we can just drop it.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-26 22:58:11 +02:00
Austin Seipp
cbacab73ed nixpkgs: default to apparmor 2.9 (#7220)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-26 22:58:00 +02:00
Vladimír Čunát
8c2f7fcfed apparmor: don't depend on tetex
It seemed unused - no mention in the log, and builds without it.
/cc maintainers: @phreedom, @thoughtpolice.
2015-08-26 20:38:41 +02:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Joachim Fasting
029514b513 apparmor: 2.9.1 -> 2.9.2
Bugfixes & minor improvements
2015-04-24 12:42:58 +02:00
Joachim Fasting
d3ea6abf0e libapparmor: build perl bindings
There are still a few utils which use Perl, though most have been ported to
Python. Note that SWIG v2 is required to avoid the `error: 'bool' undeclared`
build failure with Perl >=5.16 [1].

[1]: 4305a3cef9
2015-04-07 11:05:54 +02:00
Joachim Fasting
38dc021b16 apparmor: use base32 digest 2015-04-07 10:21:40 +02:00
Joachim Fasting
b0698d4342 apparmor: fixup install locations
This patch fixes install locations for man pages, python modules
and vim scripts. This patch improves but does not fix the user-land
AppArmor utilities (i.e., they can now import the modules they need
but are broken in other ways still).
2015-03-18 12:11:02 +01:00
Joachim Fasting
dc71d5b602 apparmor: factor out common prePatch 2015-03-18 12:08:11 +01:00
Joachim Fasting
a470b2748b Cleanup apparmor expression
Remove excessive whitespace & comments.
2015-03-18 12:07:49 +01:00
Joachim Fasting
e3b1b09779 Add AppArmor 2.9
The 2.9 series brings features such as support for dbus, unix
abstract sockets, ptrace mediation, and replaces Perl tools
with equivalents implemented in Python. See [1] for details.

The package expression has been changed to build each component
(library, parser) separately. Additionally, Perl is now only
used to build man pages and locale support has been removed.

The user-land tools are currently broken (fail to import the Python module),
but this isn't really a regression, as only two or three of the tools
installed by the previous version were functional. The most important
tool, aa-status, works, however.

Lastly, dbus support is compiled in, but is untested and probably
requires patching of dbus.

[1]: http://wiki.apparmor.net/index.php/ReleaseNotes_2_9_0
2015-03-12 11:45:53 +01:00
Vladimír Čunát
62e5e2a880 apparmor: fix build by using older perl
This is work around #5270.
Also bogus path in wrapper got fixed.

CC: maintainers @phreedom, @thoughtpolice.
It would be better to test this as well by someone who actually uses it.
2014-12-10 16:11:29 +01:00
Evgeny Egorochkin
d4b190cc4c apparmor: update from 2.8.3 to 2.8.4 2014-11-15 22:20:16 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Austin Seipp
f7123982c2 apparmor: 2.8.2 -> 2.8.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 14:09:09 -05:00
Nixpkgs Monitor
741b202d72 apparmor: update from 2.8.1 to 2.8.2 2013-12-09 11:04:25 +02:00
Bjørn Forsman
28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Evgeny Egorochkin
1ee86005b9 Apparmor: minor cleanup 2013-05-11 21:14:35 +03:00
Evgeny Egorochkin
a9459797e2 AppArmor: fix silent build breakage. 2013-05-11 08:50:33 +03:00
Evgeny Egorochkin
0ef509b1e0 Apparmor: update to 2.8.1 2013-05-10 16:36:11 +03:00
Evgeny Egorochkin
cf8d3fa4b9 Apparmor: packaged
svn path=/nixpkgs/trunk/; revision=32695
2012-02-29 13:30:10 +00:00