From 71e36997587dfb45b6b688cf1bb9673ab34159cc Mon Sep 17 00:00:00 2001
From: rusty-snake <41237666+rusty-snake@users.noreply.github.com>
Date: Sun, 21 Mar 2021 21:02:36 +0100
Subject: [PATCH] =?UTF-8?q?Rename=20chromium-common-hardened=20and=20feh-n?=
 =?UTF-8?q?etwork=20=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…again

I am still not really happy about the rename from #4028, #4029, #4030
and #4031. I've no problem with moving away .inc but I don't like the
result. So here's a proposal to make this better:

| NAME                      | DESCRIPTION                                                  |
| ------------------------- | ------------------------------------------------------------ |
| `*-addons.profile`        | (include) Allow external addons                              |
| `*-common.profile`        | (include) Common parts across multiple profiles              |
| `*-hardened.inc.profile`  | Further hardening which can not be made default              |
| `*-network.inc.profile`   | Allow optional network access                                |
| `*-whitelist.inc.profile` | Enabled whitelisting (which can not be made default) ¹       |
| `*.inc.profile`           | Other profile specific includes                              |
| `*.profile`               | A profile for a program                                      |
| `allow-*.inc`             | Multiple `noblacklist`s  that should always be used together |
| `disable-*.inc`           | `blacklist`ing                                               |
| `whitelist-*-common.inc`  | common `whitelist`s                                          |
| `*.inc`                   | Other generic includes                                       |
| `globals.local`           | User overrides for all profiles                              |
| `*.local`                 | Per profile user overrides                                   |

¹ can be used for programs like KeePassXC or editors.
---
 ...on-hardened.profile => chromium-common-hardened.inc.profile} | 2 +-
 .../{feh-network.profile => feh-network.inc.profile}            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename etc/profile-a-l/{chromium-common-hardened.profile => chromium-common-hardened.inc.profile} (81%)
 rename etc/profile-a-l/{feh-network.profile => feh-network.inc.profile} (88%)

diff --git a/etc/profile-a-l/chromium-common-hardened.profile b/etc/profile-a-l/chromium-common-hardened.inc.profile
similarity index 81%
rename from etc/profile-a-l/chromium-common-hardened.profile
rename to etc/profile-a-l/chromium-common-hardened.inc.profile
index d756eec50..19addd285 100644
--- a/etc/profile-a-l/chromium-common-hardened.profile
+++ b/etc/profile-a-l/chromium-common-hardened.inc.profile
@@ -1,6 +1,6 @@
 # This file is overwritten during software install.
 # Persistent customizations should go in a .local file.
-include chromium-common-hardened.local
+include chromium-common-hardened.inc.local
 
 caps.drop all
 nonewprivs
diff --git a/etc/profile-a-l/feh-network.profile b/etc/profile-a-l/feh-network.inc.profile
similarity index 88%
rename from etc/profile-a-l/feh-network.profile
rename to etc/profile-a-l/feh-network.inc.profile
index f35facd64..690b39171 100644
--- a/etc/profile-a-l/feh-network.profile
+++ b/etc/profile-a-l/feh-network.inc.profile
@@ -1,6 +1,6 @@
 # This file is overwritten during software install.
 # Persistent customizations should go in a .local file.
-include feh-network.local
+include feh-network.inc.local
 
 ignore net none
 netfilter