Switch to new aa-lsm-hook, update copyright

DataDrake · DataDrake · commit 2d1f67a8ba61 · 2019-11-03T15:20:30.000-05:00
diff --git a/README.md b/README.md
@@ -56,6 +56,6 @@ The two cert handlers will eventually merge to use a full system trust store tha
 
 ## Authors
 
-Copyright © 2017-2018 Solus Project
+Copyright © 2017-2019 Solus Project
 
 `usysconf` is available under the terms of the `GPL-2.0` license.
diff --git a/src/cli/cli.h b/src/cli/cli.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/cli/main.c b/src/cli/main.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/cli/triggers.c b/src/cli/triggers.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/cli/version.c b/src/cli/version.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/context.c b/src/context.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/context.h b/src/context.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/files.c b/src/files.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/files.h b/src/files.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers.h b/src/handlers.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/hwdb.c b/src/handlers/hwdb.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/kernel/apparmor.c b/src/handlers/kernel/apparmor.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 static const char *apparmor_paths[] = {
         "/etc/apparmor.d",
+        "/var/lib/snapd/apparmor/profiles",
 };
 
 /**
@@ -26,30 +27,18 @@ static const char *apparmor_paths[] = {
  */
 static UscHandlerStatus usc_handler_apparmor_exec(UscContext *ctx, __usc_unused__ const char *path)
 {
-        char *compile_command[] = {
-                "/usr/sbin/aa-lsm-hook-compile", NULL, /* Terminator */
-        };
-        char *load_command[] = {
-                "/usr/sbin/aa-lsm-hook-load", NULL, /* Terminator */
+        char *aa_lsm_command[] = {
+                "/usr/sbin/aa-lsm-hook", NULL, /* Terminator */
         };
 
-        usc_context_emit_task_start(ctx, "Compiling AppArmor profiles");
+        usc_context_emit_task_start(ctx, "Compiling and Reloading AppArmor profiles");
         if (usc_context_has_flag(ctx, USC_FLAGS_CHROOTED)) {
                 usc_context_emit_task_finish(ctx, USC_HANDLER_SKIP);
                 return USC_HANDLER_SKIP | USC_HANDLER_BREAK;
         }
 
-        /* Compile */
-        int ret = usc_exec_command(compile_command);
-        if (ret != 0) {
-                usc_context_emit_task_finish(ctx, USC_HANDLER_FAIL);
-                return USC_HANDLER_FAIL;
-        }
-        usc_context_emit_task_finish(ctx, USC_HANDLER_SUCCESS);
-
-        /* Load */
-        usc_context_emit_task_start(ctx, "Reloading AppArmor profiles");
-        ret = usc_exec_command(load_command);
+        /* Compile & Reload */
+        int ret = usc_exec_command(aa_lsm_command);
         if (ret != 0) {
                 usc_context_emit_task_finish(ctx, USC_HANDLER_FAIL);
                 return USC_HANDLER_FAIL;
@@ -63,7 +52,7 @@ static UscHandlerStatus usc_handler_apparmor_exec(UscContext *ctx, __usc_unused_
 const UscHandler usc_handler_apparmor = {
         .name = "apparmor",
         .description = "Compile AppArmor profiles",
-        .required_bin = "/usr/sbin/aa-lsm-hook-compile",
+        .required_bin = "/usr/sbin/aa-lsm-hook",
         .exec = usc_handler_apparmor_exec,
         .paths = apparmor_paths,
         .n_paths = ARRAY_SIZE(apparmor_paths),
diff --git a/src/handlers/kernel/clr-boot-manager.c b/src/handlers/kernel/clr-boot-manager.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/kernel/depmod.c b/src/handlers/kernel/depmod.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/ldconfig.c b/src/handlers/ldconfig.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/linux-driver-management.c b/src/handlers/linux-driver-management.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/mandb.c b/src/handlers/mandb.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/mono-certs.c b/src/handlers/mono-certs.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/openssh.c b/src/handlers/openssh.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/qol-assist.c b/src/handlers/qol-assist.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/ssl.c b/src/handlers/ssl.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/systemd/reexec.c b/src/handlers/systemd/reexec.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/systemd/reload.c b/src/handlers/systemd/reload.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/systemd/sysusers.c b/src/handlers/systemd/sysusers.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/systemd/tmpfiles.c b/src/handlers/systemd/tmpfiles.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/systemd/vbox-restart.c b/src/handlers/systemd/vbox-restart.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/udev-rules.c b/src/handlers/udev-rules.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/xdg/dconf.c b/src/handlers/xdg/dconf.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/xdg/desktop-files.c b/src/handlers/xdg/desktop-files.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/xdg/fonts.c b/src/handlers/xdg/fonts.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/xdg/gconf.c b/src/handlers/xdg/gconf.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/xdg/glib2.c b/src/handlers/xdg/glib2.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/xdg/gtk2_immodules.c b/src/handlers/xdg/gtk2_immodules.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/xdg/gtk3_immodules.c b/src/handlers/xdg/gtk3_immodules.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/xdg/icon-cache.c b/src/handlers/xdg/icon-cache.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/handlers/xdg/mime.c b/src/handlers/xdg/mime.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/state.c b/src/state.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/state.h b/src/state.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of usysconf.
  *
- * Copyright © 2017-2018 Solus Project
+ * Copyright © 2017-2019 Solus Project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/util.c b/src/util.c
diff --git a/src/util.h b/src/util.h

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* This file is part of usysconf.`
`3`	`3`	`*`
`4`		`- * Copyright © 2017-2018 Solus Project`
	`4`	`+ * Copyright © 2017-2019 Solus Project`
`5`	`5`	`*`
`6`	`6`	`* This program is free software; you can redistribute it and/or modify`
`7`	`7`	`* it under the terms of the GNU General Public License as published by`