Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "private-etc: big profile changes" #5645

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Revert "private-etc: big profile changes" #5645

wants to merge 13 commits into from

Commits on Feb 7, 2023

  1. Revert "private-etc: big profile changes" 

    This reverts commit 5d0822c and later
commits that touch the same files (which is necessary in order to revert
the commit in question).

There seems to be a non-trivial amount of changes done in error in the
big refactor from commit 5d0822c ("private-etc: big profile changes",
2023-02-05).  For example, there are profiles for CLI programs
(including man.profile) and servers that now contain the @X11 group:

    $ git grep -l '^private-etc .*@X11' -- etc
    # [...]
    etc/profile-a-l/email-common.profile:private-etc @tls-ca,@X11,gnupg,hosts.conf,mailname,timezone
    etc/profile-m-z/man.profile:private-etc @X11,groff,man_db.conf,manpath.config,sysless
    etc/profile-m-z/mutt.profile:private-etc @tls-ca,@X11,Mutt,Muttrc,Muttrc.d,gai.conf,gnupg,gnutls,hosts.conf,mail,mailname,nntpserver,terminfo
    etc/profile-m-z/neomutt.profile:private-etc @tls-ca,@X11,Mutt,Muttrc,Muttrc.d,gnupg,hosts.conf,mail,mailname,neomuttrc,neomuttrc.d,nntpserver
    etc/profile-m-z/nextcloud.profile:private-etc @tls-ca,@X11,Nextcloud,host.conf,os-release
    etc/profile-m-z/nodejs-common.profile:private-etc @tls-ca,@X11,host.conf,mime.types,rpc,services

Note: These are just the ones that I immediately noticed; it is possible
that there are many that I missed.

Part of the issue is that the groups appear to be inconsistent and
rather broad.  For example, paths related to 3D graphics (vulkan) and
audio (openal) are in the @games group, which are not used only by games
and not all games use those standards/libraries.  As another example,
the @X11 group contains paths related to GTK, KDE and GPU hardware
acceleration, even though those are not necessarily tied to X11 (and
even though hardware acceleration may be used by headless programs).
Replacing the known paths with groups that are not very granular results
in loss of information about what exactly a profile actually needs and
so makes the profiles less self-documenting.  Note also that a given
path could potentially belong to multiple groups, which would preclude
using the "etc-cleanup" tool (in its current form at least), as it would
not know which is the correct group to replace the path with.

Command used to revert the changes:

    $ git revert \
      1be9bb3 \
      e889db0 \
      e6f2374 \
      acb0154 \
      740f502 \
      5649bd4 \
      2e4e9d1 \
      0f996ea \
      5d0822c

Note: This reverts commits from PRs netblue30#5641 netblue30#5642 netblue30#5643, most of which are
later re-applied.

Relates to netblue30#5610.
    @kmk3
    kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    9c29f6e View commit details
    Browse the repository at this point in the history

  2. private-etc: cleanup tool changes 

    (cherry picked from commit 5d0822c)

Committer note: This only applies the changes from src/.
    @netblue30 @kmk3
    netblue30 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    2d15f33 View commit details
    Browse the repository at this point in the history

  3. private-etc: groups modified 

    (cherry picked from commit 0f996ea)

Committer note: This only applies the changes from src/.
    @netblue30 @kmk3
    netblue30 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    c6c901b View commit details
    Browse the repository at this point in the history

  4. private-etc: pushing vulkan into games group 

    (cherry picked from commit acb0154)

Committer note: This only applies the changes from src/.
    @netblue30 @kmk3
    netblue30 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    214aa6d View commit details
    Browse the repository at this point in the history

  5. aria2c: fix private-etc 

    There is no `/etc/groups` AFAIK. Existing typo likely caused this.

Committer note: The original commit is part of PR netblue30#5641.

(cherry picked from commit 001f541)
    @glitsj16 @kmk3
    glitsj16 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    003f751 View commit details
    Browse the repository at this point in the history

  6. discord-common: fix private-etc 

    There is no `/etc/password` AFAIK. Existing typo likely caused this.

Committer note: The original commit is part of PR netblue30#5641.

(cherry picked from commit 5f01eb1)
    @glitsj16 @kmk3
    glitsj16 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    2f40a1d View commit details
    Browse the repository at this point in the history

  7. email-common: fix private-etc 

    There is no `/etc/groups` AFAIK. Existing typo likely caused this.

Committer note: The original commit is part of PR netblue30#5641.

(cherry picked from commit 2588d51)
    @glitsj16 @kmk3
    glitsj16 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    7219608 View commit details
    Browse the repository at this point in the history

  8. ghostwriter: fix private-etc 

    There is no `/etc/groups` AFAIK. Existing typo likely caused this.

Committer note: The original commit is part of PR netblue30#5641.

(cherry picked from commit aea2109)
    @glitsj16 @kmk3
    glitsj16 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    310c8cc View commit details
    Browse the repository at this point in the history

  9. marker: fix private-etc 

    `dconfgtk-3.0` is missing a `,`.

Committer note: The original commit is part of PR netblue30#5641.

(cherry picked from commit 81f8847)
    @glitsj16 @kmk3
    glitsj16 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    99d0b44 View commit details
    Browse the repository at this point in the history

  10. xiphos: fix private-etc 

    There is no `/etc/ssli` AFAIK. Existing typo likely caused this.

Committer note: The original commit is part of PR netblue30#5641.

(cherry picked from commit f9c009e)
    @glitsj16 @kmk3
    glitsj16 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    06f9d36 View commit details
    Browse the repository at this point in the history

  11. private-etc: java directory fixes 

    (cherry picked from commit 2e4e9d1)
    @netblue30 @kmk3
    netblue30 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    e7570c3 View commit details
    Browse the repository at this point in the history

  12. installing etc-cleanup tool in /usr/lib/firejail directory 

    (cherry picked from commit e6f2374)
    @netblue30 @kmk3
    netblue30 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    8011b7a View commit details
    Browse the repository at this point in the history

  13. build fix 

    (cherry picked from commit e889db0)
    @netblue30 @kmk3
    netblue30 authored and kmk3 committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    92b78d2 View commit details
    Browse the repository at this point in the history