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.

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

profiles: replace x11 socket blacklist with disable-X11.inc #6286

Merged
merged 2 commits into from
Mar 24, 2024

Commits on Mar 23, 2024

  1. sstmp.profile: sort disable includes

    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 committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    5ec7c22 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. profiles: replace x11 socket blacklist with disable-X11.inc

    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 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    04efbb2 View commit details
    Browse the repository at this point in the history