From c854175a0e0163aa6cde88271aece2ae01c1ebbd Mon Sep 17 00:00:00 2001 From: Schueni1 <33635234+Schueni1@users.noreply.github.com> Date: Sun, 22 Sep 2019 13:26:18 +0200 Subject: [PATCH 01/15] Update domains.csv (#290) --- share/domains.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/domains.csv b/share/domains.csv index df08b17..625abc1 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -238,7 +238,7 @@ tlu.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 tquad.ai,imap.mail.eu-west-1.awsapps.com,993,smtp.mail.eu-west-1.awsapps.com,465 tu-harburg.de,mail.tu-harburg.de,993,mail.tu-harburg.de,587 tuhh.de,mail.tu-harburg.de,993,mail.tu-harburg.de,587 -tuwien.at,mail.student.tuwien.ac.at,993,mail.student.tuwien.ac.at,587 +student.tuwien.ac.at,mail.student.tuwien.ac.at,993,mail.student.tuwien.ac.at,587 txstate.edu,outlook.office365.com,993,smtp.office365.com,587 ua.pt,outlook.office365.com,993,mail.ua.pt,25 uach.mx,imap.gmail.com,993,smtp.gmail.com,587 From ecc1b593b9d7cc7d1d1e78526b2ccbae44364eff Mon Sep 17 00:00:00 2001 From: Schueni1 <33635234+Schueni1@users.noreply.github.com> Date: Sun, 22 Sep 2019 14:02:39 +0200 Subject: [PATCH 02/15] Update domains.csv (#291) --- share/domains.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/domains.csv b/share/domains.csv index 625abc1..37a670b 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -224,6 +224,7 @@ stud.tu-darmstadt.de,imap.stud.tu-darmstadt.de,993,smtp.tu-darmstadt.de,465 stud.uis.no,outlook.office365.com,993,smtp.office365.com,587 stud.uni-bamberg.de,outlook.office365.com,993,smtp.office365.com,587 student.rmit.edu.au,outlook.office365.com,993,smtp.office365.com,587 +student.tuwien.ac.at,mail.student.tuwien.ac.at,993,mail.student.tuwien.ac.at,587 students.southwales.ac.uk,imap.gmail.com,993,smtp.gmail.com,587 studserv.uni-leipzig.de,studserv.uni-leipzig.de,993,studserv.uni-leipzig.de,25 subvertising.org,mail.autistici.org,993,smtp.autistici.org,465 @@ -238,7 +239,6 @@ tlu.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 tquad.ai,imap.mail.eu-west-1.awsapps.com,993,smtp.mail.eu-west-1.awsapps.com,465 tu-harburg.de,mail.tu-harburg.de,993,mail.tu-harburg.de,587 tuhh.de,mail.tu-harburg.de,993,mail.tu-harburg.de,587 -student.tuwien.ac.at,mail.student.tuwien.ac.at,993,mail.student.tuwien.ac.at,587 txstate.edu,outlook.office365.com,993,smtp.office365.com,587 ua.pt,outlook.office365.com,993,mail.ua.pt,25 uach.mx,imap.gmail.com,993,smtp.gmail.com,587 From 04c029545f33fc13cd9cd1834ea1c3472e70b152 Mon Sep 17 00:00:00 2001 From: alexbrenvero <41145983+alexbrenvero@users.noreply.github.com> Date: Wed, 25 Sep 2019 20:25:07 +0200 Subject: [PATCH 03/15] Update domains.csv (#295) Updated domains from mail.outlook.com to outlook.office365.com for hotmail.fr domain --- share/domains.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/domains.csv b/share/domains.csv index 37a670b..3b1101c 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -129,7 +129,7 @@ hotmail.de,outlook.office365.com,993,smtp.office365.com,587 hotmail.dk,outlook.office365.com,993,smtp.office365.com,587 hotmail.es,outlook.office365.com,993,smtp.office365.com,587 hotmail.fi,outlook.office365.com,993,smtp.office365.com,587 -hotmail.fr,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 +hotmail.fr,outlook.office365.com,993,smtp.office365.com,587 hotmail.gr,outlook.office365.com,993,smtp.office365.com,587 hotmail.hu,outlook.office365.com,993,smtp.office365.com,587 hotmail.it,outlook.office365.com,993,smtp.office365.com,587 From ed0a0b35c417dd6e0b043fbd468811fc172ba577 Mon Sep 17 00:00:00 2001 From: xorcc <46181536+xorcc@users.noreply.github.com> Date: Wed, 25 Sep 2019 18:35:45 +0000 Subject: [PATCH 04/15] macro index O runs mbsync, not offlineimap (#294) --- share/mutt-wizard.muttrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc index ad4d2fe..03154e3 100644 --- a/share/mutt-wizard.muttrc +++ b/share/mutt-wizard.muttrc @@ -62,7 +62,7 @@ bind editor complete-query macro index,pager a "|abook --add-email\n" 'add sender to abook' macro index \Cr "T~UN." "mark all messages as read" -macro index O "mailsync -Va" "run offlineimap to sync all mail" +macro index O "mailsync -Va" "run mbsync to sync all mail" macro index \Cf "unset wait_keyread -p 'Enter a search term to find with notmuch: ' x; echo \$x >~/.cache/mutt_terms~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"" "show only messages matching a notmuch pattern" macro index A "all\n" "show all messages (undo limit)" From a2aae10c6b7212d691660f118a01c43db9421d96 Mon Sep 17 00:00:00 2001 From: someotherkyle Date: Wed, 25 Sep 2019 14:42:09 -0400 Subject: [PATCH 05/15] Updated Gmail accounts warning to current standard. (#292) --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index e1e58e7..c2b1172 100644 --- a/README.md +++ b/README.md @@ -110,8 +110,7 @@ mutt-wizard is free/libre software, licensed under the GPLv3. - In `/usr/share/mutt-wizard` are several global config files, including `mutt-wizard`'s default settings. You can overwride this in your `muttrc` if you wish. ## Watch out for these things: - -- For Gmail accounts, remember also to enable third-party ("""less secure""") applications before attempting installation. You might also need to manually "Enable IMAP" in the settings. +- Gmail accounts can now create 'App Password' to use with """less secure""" applications. This password is single use (ie. for setup) and will be stored and encrypted locally. Enabling third-party applications requires turning off two-factor authentication and this will circumvent that. You might also need to manually "Enable IMAP" in the settings. - Protonmail accounts will require you to set up "Protonmail Bridge" to access PM's IMAP and SMTP servers. Configure that before running mutt-wizard. - If you have a university email, or enterprise-hosted email for work, there might be other hurdles or two-factor authentication you have to jump through. Some, for example, will want you to create a separate IMAP password, etc. - `isync` is not fully UTF-8 compatible, so non-Latin characters may be garbled (although sync should succeed). `mw` will also not autocreate mailbox shortcuts since it is looking for English mailbox names. I strongly recommend you to set your email language to English on your mail server to avoid these problems. From b66fb80f3ccd440f6901db99f997f8de0ee194d6 Mon Sep 17 00:00:00 2001 From: Merlini Adrien Date: Wed, 2 Oct 2019 19:50:04 +0200 Subject: [PATCH 06/15] Add polito.it domain (#300) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 3b1101c..f51618d 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -272,3 +272,4 @@ yandex.net,imap.yandex.com,993,smtp.yandex.com,587 yandex.ru,imap.yandex.com,993,smtp.yandex.com,587 yandex.ua,imap.yandex.com,993,smtp.yandex.com,587 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 +polito.it,mail.polito.it,993,mail.polito.it,465 From 2783088fff994cb426a592a5b8c1a48a2392ad88 Mon Sep 17 00:00:00 2001 From: Tyler Kaminski <52117562+durcor@users.noreply.github.com> Date: Sat, 12 Oct 2019 07:21:26 -0400 Subject: [PATCH 07/15] Fixed stevens.edu imap/smtp server info (#303) --- share/domains.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/domains.csv b/share/domains.csv index f51618d..6eb73a0 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -218,7 +218,7 @@ sapo.pt,imap.sapo.pt,993,smtp.sapo.pt,587 smail.inf.h-brs.de,imap.inf.h-brs.de,993,smtp.inf.h-brs.de,587 southwales.ac.uk,imap.gmail.com,993,smtp.gmail.com,587 spoko.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 -stevens.edu,imap-mail.outlook.com,993,smpt-mail.outlook.com,587 +stevens.edu,imap.outlook.com,993,smtp.outlook.com,587 stronzi.org,mail.autistici.org,993,smtp.autistici.org,465 stud.tu-darmstadt.de,imap.stud.tu-darmstadt.de,993,smtp.tu-darmstadt.de,465 stud.uis.no,outlook.office365.com,993,smtp.office365.com,587 From 6d8c90e3685235b22ba73bffcdee42ca7358d97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20K=C5=99emel?= Date: Mon, 14 Oct 2019 23:48:27 +0200 Subject: [PATCH 08/15] Fixed national diacritics for adding sender to abook (#304) --- share/mutt-wizard.muttrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc index 03154e3..e006e3f 100644 --- a/share/mutt-wizard.muttrc +++ b/share/mutt-wizard.muttrc @@ -60,7 +60,7 @@ bind pager \031 previous-line # Mouse wheel bind pager \005 next-line # Mouse wheel bind editor complete-query -macro index,pager a "|abook --add-email\n" 'add sender to abook' +macro index,pager a "set my_pipe_decode=\$pipe_decode pipe_decodeabook --add-emailset pipe_decode=\$my_pipe_decode; unset my_pipe_decode" "add the sender address to abook" macro index \Cr "T~UN." "mark all messages as read" macro index O "mailsync -Va" "run mbsync to sync all mail" macro index \Cf "unset wait_keyread -p 'Enter a search term to find with notmuch: ' x; echo \$x >~/.cache/mutt_terms~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"" "show only messages matching a notmuch pattern" From 19949642f4e3943fa268f4e2393b2baf4417d942 Mon Sep 17 00:00:00 2001 From: Jannusch Bigge <32895092+Jannusch@users.noreply.github.com> Date: Thu, 17 Oct 2019 20:39:44 +0200 Subject: [PATCH 09/15] =?UTF-8?q?add=20Technische=20Universit=C3=A4t=20Dre?= =?UTF-8?q?sden=20to=20the=20domains.csv=20(#306)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 6eb73a0..0898367 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -170,6 +170,7 @@ mail.mcgill.ca,outlook.office365.com,993,smtp.office365.com,587 mail.polimi.it,outlook.office365.com,993,smtp.office365.com,587 mail.ru,imap.mail.ru,993,smtp.mail.ru,465 mailbox.org,imap.mailbox.org,993,smtp.mailbox.org,587 +mailbox.tu-dresden.de,msx.tu-dresden.de,993,msx.tu-dresden.de,587 mailo.com,mail.mailo.com,993,mail.mailo.com,465 memeware.net,mail.cock.li,993,mail.cock.li,587 ml1.net,imap.fastmail.com,993,smtp.fastmail.com,465 From bb38c15bf500c353f2c15f3a1b9b0f31fadf16b3 Mon Sep 17 00:00:00 2001 From: Kipras Melnikovas Date: Sat, 26 Oct 2019 19:44:26 +0300 Subject: [PATCH 10/15] Makefile uninstall: Remove `mw.1` (#308) --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 68db4ff..20c82d1 100644 --- a/Makefile +++ b/Makefile @@ -30,5 +30,6 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/$$script; \ done rm -rf $(DESTDIR)$(PREFIX)/share/mutt-wizard + rm -f $(DESTDIR)$(MANPREFIX)/man1/mw.1 .PHONY: install uninstall From 76b1de00f07d948788e6d7fdc1ecd4d55a9b7603 Mon Sep 17 00:00:00 2001 From: Vlad Doster Date: Wed, 30 Oct 2019 06:34:25 -0400 Subject: [PATCH 11/15] Update domains.csv (#315) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 0898367..b819996 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -260,6 +260,7 @@ wanadoo.fr,imap.orange.fr,993,smtp.orange.fr,465 wants.dicksinhisan.us,mail.cock.li,993,mail.cock.li,587 wants.dicksinmyan.us,mail.cock.li,993,mail.cock.li,587 web.de,imap.web.de,993,smtp.web.de,587 +wit.edu,outlook.office365.com,993,smtp.office365.com,587 wp.pl,imap.wp.pl,993,smtp.wp.pl,465 writeme.com,imap.mail.com,993,smtp.mail.com,587 ya.ru,imap.yandex.com,993,smtp.yandex.com,587 From 1ed5c67f75dbe580b3c517ac78eea7e15b96c606 Mon Sep 17 00:00:00 2001 From: Roberto Polverelli Monti <33606222+rpolve@users.noreply.github.com> Date: Thu, 31 Oct 2019 14:51:44 +0100 Subject: [PATCH 12/15] Update domains.csv (#316) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index b819996..850c4ee 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -275,3 +275,4 @@ yandex.ru,imap.yandex.com,993,smtp.yandex.com,587 yandex.ua,imap.yandex.com,993,smtp.yandex.com,587 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 polito.it,mail.polito.it,993,mail.polito.it,465 +studio.unibo.it,outlook.office365.com,993,smtp.office365.com,587 From a3b1bed62686966f8ba5fcc0f3c3371522c40169 Mon Sep 17 00:00:00 2001 From: "trevDev()" Date: Fri, 1 Nov 2019 10:27:53 -0700 Subject: [PATCH 13/15] Protonmail Config Fixes (#313) * Run serverinfo query based on if proton or not * If domain is already protonmail don't ask if it is * Fix protonmail fingerprint extraction * Update docs re: protonmail bridge timing out --- README.md | 1 + bin/mw | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c2b1172..3a67982 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,7 @@ mutt-wizard is free/libre software, licensed under the GPLv3. ## Watch out for these things: - Gmail accounts can now create 'App Password' to use with """less secure""" applications. This password is single use (ie. for setup) and will be stored and encrypted locally. Enabling third-party applications requires turning off two-factor authentication and this will circumvent that. You might also need to manually "Enable IMAP" in the settings. - Protonmail accounts will require you to set up "Protonmail Bridge" to access PM's IMAP and SMTP servers. Configure that before running mutt-wizard. +- Protonmail bridge is prone to timing out. Watch out for this while adding an account. If the bridge times out, try again. - If you have a university email, or enterprise-hosted email for work, there might be other hurdles or two-factor authentication you have to jump through. Some, for example, will want you to create a separate IMAP password, etc. - `isync` is not fully UTF-8 compatible, so non-Latin characters may be garbled (although sync should succeed). `mw` will also not autocreate mailbox shortcuts since it is looking for English mailbox names. I strongly recommend you to set your email language to English on your mail server to avoid these problems. diff --git a/bin/mw b/bin/mw index 8712bf0..a89d5ef 100755 --- a/bin/mw +++ b/bin/mw @@ -134,8 +134,22 @@ askinfo() { \ printf "\033[0m" done domain="$(echo "$fulladdr" | sed "s/.*@//")" + search_query=$domain + case "$domain" in + protonmail.com|protonmail.ch|pm.me) + search_query='protonmail.com' && break;; + *) + while : ; do + printf "\nIs your email hosted with Protonmail? [yes/no] " + read -r is_protonmail + case $is_protonmail in + [Yy][Ee][Ss]) search_query='protonmail.com' && break;; + [Nn][Oo]) break;; + *) printf 'Please answer Yes or No' + esac; done; + esac printf "\\nSearching for \033[32m%s\033[0m in \033[34m\`domains.csv\`\033[0m..." "$domain" - serverinfo="$(grep "^$domain" "$muttshare/domains.csv" 2>/dev/null)" + serverinfo="$(grep "^$search_query" "$muttshare/domains.csv" 2>/dev/null)" if [ -z "$serverinfo" ]; then printf "Your email domain is not in mutt-wizard's database yet.\\nmutt-wizard will still autoconfigure everything, but you will have to manually type in your service's IMAP and SMTP server information.\\nYou can usually quickly find this by internet searching for it.\\n" printf "Insert the IMAP server for your email provider (excluding the port number)\\n\033[36m\t" @@ -194,7 +208,7 @@ EOF } protonfinger() { printf "Getting Protonmail bridge fingerprint...\\n" - fingerprint="$(msmtp --serverinfo --host=127.0.0.1 --port=1025 --tls --tls-certcheck=off)" || return 1 + fingerprint="$(msmtp --serverinfo --host=127.0.0.1 --port=1025 --tls --tls-certcheck=off | grep SHA256: | sed 's/^.*: //')" sed -ibu "s/account $title/&\ntls_trust_file\ntls_fingerprint $fingerprint/" "$msmtprc" ; rm -f "$msmtprc"bu } From a92c01e13121f42b9f9b8962ae2c07b0a0ce5d4d Mon Sep 17 00:00:00 2001 From: Niklas Date: Tue, 5 Nov 2019 12:03:10 +0100 Subject: [PATCH 14/15] Update domains.csv (#321) Updated datentopf.org and added humbug.pw and resch.pw --- share/domains.csv | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/domains.csv b/share/domains.csv index 850c4ee..970a321 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -60,7 +60,7 @@ counsellor.com,imap.mail.com,993,smtp.mail.com,587 cryptolab.net,mail.autistici.org,993,smtp.autistici.org,465 cumallover.me,mail.cock.li,993,mail.cock.li,587 cyberservices.com,imap.mail.com,993,smtp.mail.com,587 -datentopf.org,mail.datentopf.org,993,mail.datentopf.org,587 +datentopf.org,imap.migadu.com,993,smtp.migadu.com,587 deliveryman.com,imap.mail.com,993,smtp.mail.com,587 dicksinhisan.us,mail.cock.li,993,mail.cock.li,587 dicksinmyan.us,mail.cock.li,993,mail.cock.li,587 @@ -143,6 +143,7 @@ hotmail.rs,outlook.office365.com,993,smtp.office365.com,587 hotmail.se,outlook.office365.com,993,smtp.office365.com,587 hotmail.sg,outlook.office365.com,993,smtp.office365.com,587 hotmail.sk,outlook.office365.com,993,smtp.office365.com,587 +humbug.pw,imap.migadu.com,993,smtp.migadu.com,587 hushmail.com,imap.hushmail.com,993,smtp.hushmail.com,465 illinois.edu, imap.gmail.com,993,smtp.gmail.com,465 iname.com,imap.mail.com,993,smtp.mail.com,587 @@ -213,6 +214,7 @@ protonmail.ch,127.0.0.1,1143,127.0.0.1,1025 protonmail.com,127.0.0.1,1143,127.0.0.1,1025 rape.lol,mail.cock.li,993,mail.cock.li,587 redchan.it,mail.cock.li,993,mail.cock.li,587 +resch.pw,imap.migadu.com,993,smtp.migadu.com,587 runbox.com,mail.runbox.com,993,mail.runbox.com,587 rwth-aachen.de,mail.rwth-aachen.de,993,mail.rwth-aachen.de,587 sapo.pt,imap.sapo.pt,993,smtp.sapo.pt,587 From ff57bd2eb785ea393fd569751c47b93339af7861 Mon Sep 17 00:00:00 2001 From: Wayne Reeves Date: Fri, 8 Nov 2019 19:01:41 -0600 Subject: [PATCH 15/15] Fix Malformed UTF-8 Character in Mailsync fixes #322 (#323) * line 5 defined the variable DBUS_SESSION_BUS_ADDRESS before exporting it in the next line * change the pgrep line * Revert "Update domains.csv (#321)" This reverts commit a92c01e13121f42b9f9b8962ae2c07b0a0ce5d4d. * Revert "Revert "Update domains.csv (#321)"" This reverts commit af0c0826b9a699780256dc8492e74a157cab2a85. * Revert "line 5 defined the variable DBUS_SESSION_BUS_ADDRESS before exporting it in the next line" This reverts commit ca64a6ae56a31ead28cc638d8d8dac7e28f9df68. * Revert "Revert "line 5 defined the variable DBUS_SESSION_BUS_ADDRESS before exporting it in the next line"" This reverts commit 4304eb731c109289251e06ef86377d372cef07e4. --- bin/mailsync | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/mailsync b/bin/mailsync index d79507d..c56ccb2 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -2,12 +2,13 @@ # Sync mail and give notification if there is new mail. export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus +DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus +export DBUS_SESSION_BUS_ADDRESS export DISPLAY=:0.0 [ -d "$HOME/.local/share/password-store" ] && export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" # Run only if user logged in (prevent cron errors) -pgrep -u "$USER" >/dev/null || { echo "$USER not logged in; sync will not run."; exit ;} +pgrep -u "${USER:=$LOGNAME}" >/dev/null || { echo "$USER not logged in; sync will not run."; exit ;} # Run only if not already running in other instance pgrep -x mbsync >/dev/null && { echo "mbsync is already running." ; exit ;}