profiles: replace x11 socket blacklist with disable-X11.inc #6286
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rusty-snake
approved these changes
Mar 23, 2024
kmk3
force-pushed
the
x11-none-improvements
branch
from
1c4a080
to
e47861b
Compare
kmk3
changed the title
kmk3
force-pushed
the
x11-none-improvements
branch
from
e47861b
to
110d2c1
Compare
kmk3
changed the title
|
Note: I did not manage to call |
glitsj16
approved these changes
Mar 23, 2024
glitsj16
reviewed
Mar 23, 2024
glitsj16
reviewed
Mar 23, 2024
Move disable-X11.inc before disable-xdg.inc for consistency with other profiles. Added on commit 73a6fce ("New profile: ssmtp (netblue30#5544)", 2022-12-21).
kmk3
added a commit
that referenced
this pull request
Mar 23, 2024
It is a GUI program. It was apparently added by accident on commit 73321c5 ("Fixes (#2816)", 2019-07-01). Reported by @glitsj16 at #6286 (comment)
kmk3
force-pushed
the
x11-none-improvements
branch
from
110d2c1
to
afc6762
Compare
Replace all occurrences of `blacklist /tmp/.X11-unix` with
`include disable-X11.inc`, which blacklists more X11-related files.
Commands used to search and replace:
$ git grep -Ilz '^blacklist /tmp/.X11-unix' -- \
etc/profile*/*.profile | xargs -0 perl -0 -pi -e '\
s/\nblacklist \/tmp\/.X11-unix\n/\n/; \
s/(\ninclude disable-xdg.inc\n)/\ninclude disable-X11.inc$1/; \
s/(\ninclude disable-[^Xx\n]+\n)(\n|# )/$1include disable-X11.inc\n$2/'
Note: The following files were also edited manually:
* etc/profile-a-l/erd.profile
* etc/profile-a-l/links-common.profile
* etc/profile-m-z/termshark.profile
* etc/profile-m-z/tmux.profile
* etc/profile-m-z/tshark.profile
Relates to netblue30#4462 netblue30#4854.
kmk3
force-pushed
the
x11-none-improvements
branch
from
afc6762
to
04efbb2
Compare
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Mar 24, 2024
See etc/templates/profile.template. This is a follow-up to netblue30#6286.
kmk3
added a commit
that referenced
this pull request
Mar 25, 2024
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Mar 26, 2024
That is, make "X11" lowercase so that the order of the includes in the
disable- section remain the same when sorted with `LC_ALL=C`, as is the
case for most of the other sections. That is also likely to be the
default in text editors (such as in vim on Arch), so this should make
the disable- section more consistent and easier to sort when editing the
profile.
Also, keep the old include as a redirect to the new one for now to avoid
breakage.
Commands used to search and replace:
git mv etc/inc/disable-X11.inc etc/inc/disable-x11.inc
git grep -Ilz 'disable-X11' -- etc | xargs -0 \
perl -pi -e 's/disable-X11/disable-x11/'
Relates to netblue30#4462 netblue30#4854 netblue30#6070 netblue30#6289.
This is a follow-up to netblue30#6286.
kmk3
added a commit
that referenced
this pull request
Mar 27, 2024
See etc/templates/profile.template. This is a follow-up to #6286.
kmk3
added a commit
that referenced
this pull request
Mar 27, 2024
That is, make "X11" lowercase so that the order of the includes in the
disable- section remain the same when sorted with `LC_ALL=C`, as is the
case for most of the other sections. That is also likely to be the
default in text editors (such as in vim on Arch), so this should make
the disable- section more consistent and easier to sort when editing the
profile.
Also, keep the old include as a redirect to the new one for now to avoid
breakage.
Commands used to search and replace:
git mv etc/inc/disable-X11.inc etc/inc/disable-x11.inc
git grep -Ilz 'disable-X11' -- etc | xargs -0 \
perl -pi -e 's/disable-X11/disable-x11/'
Relates to #4462 #4854 #6070 #6289.
This is a follow-up to #6286.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replace all occurrences of
blacklist /tmp/.X11-unixwithinclude disable-X11.inc, which blacklists more X11-related files.Commands used to search and replace:
Note: The following files were also edited manually:
Relates to #4462 #4854 #5544.