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: support more msmtp configuration paths #6060

Merged
merged 1 commit into from
Oct 22, 2023

Conversation

glitsj16
Copy link
Collaborator

@glitsj16 glitsj16 commented Oct 22, 2023

Since version 1.8.6 msmtp supports per-user configuration at either
~/.msmtprc (already supported by firejail) or
$XDG_CONFIG_HOME/msmtp/config. System-wide support can be placed at
/etc/msmtprc.

This adds the missing paths to the relevant .inc and .profile files.

Note that blacklist ${HOME}/.msmtprc is present on both
disable-common.inc and disable-programs.inc, so the new paths are added
to both files.

References:

https://wiki.archlinux.org/title/Msmtp#Basic_setup
https://marlam.de/msmtp/msmtp.html#Configuration-files

@kmk3 kmk3 changed the title support more msmtp configuration profiles: support more msmtp configuration paths Oct 22, 2023
Since version 1.8.6 msmtp supports per-user configuration at either
~/.msmtprc (already supported by firejail) or
`$XDG_CONFIG_HOME/msmtp/config`. System-wide support can be placed at
/etc/msmtprc.

This adds the missing paths to the relevant .inc and .profile files.

Note that `blacklist ${HOME}/.msmtprc` is present on both
disable-common.inc and disable-programs.inc, so the new paths are added
to both files.

References:

https://wiki.archlinux.org/title/Msmtp#Basic_setup
https://marlam.de/msmtp/msmtp.html#Configuration-files
@glitsj16 glitsj16 merged commit 2e2c232 into netblue30:master Oct 22, 2023
3 checks passed
@glitsj16 glitsj16 deleted the msmtp-configs branch October 22, 2023 23:51
kmk3 added a commit to kmk3/firejail that referenced this pull request Oct 23, 2023
They are already present in disable-common.inc.

Added in the following commits:

* 6bf6d5e ("updated program files", 2016-12-02) / PR netblue30#951
* 4928019 ("various hardening (netblue30#3394)", 2020-05-02)
* 2e2c232 ("profiles: support more msmtp configuration paths (netblue30#6060)",
  2023-10-22)

Misc: This was noticed on PR netblue30#6060.
kmk3 added a commit to kmk3/firejail that referenced this pull request Oct 24, 2023
They are already present in disable-common.inc.

Added in the following commits:

* 6bf6d5e ("updated program files", 2016-12-02) / PR netblue30#951
* 4928019 ("various hardening (netblue30#3394)", 2020-05-02)
* 2e2c232 ("profiles: support more msmtp configuration paths (netblue30#6060)",
  2023-10-22)

Misc: This was noticed on PR netblue30#6060.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants