aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2021-06-16 12:21:20 +0200
committerUlrich Müller <ulm@gentoo.org>2021-06-16 12:21:20 +0200
commitde54e471209f68a2e4f19dcb001ec196e76401e1 (patch)
treedd5bbb0d8e90355749afa38d1bb3f9e9778e43a9
parentInclude Noah Friedman's patches in the patchset. (diff)
downloademacs-patches-de54e471209f68a2e4f19dcb001ec196e76401e1.tar.gz
emacs-patches-de54e471209f68a2e4f19dcb001ec196e76401e1.tar.bz2
emacs-patches-de54e471209f68a2e4f19dcb001ec196e76401e1.zip
27.2: Add Libera.Chat to ERC servicesemacs-27.2-patches-1
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--emacs/27.2/01_all_erc-libera.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/emacs/27.2/01_all_erc-libera.patch b/emacs/27.2/01_all_erc-libera.patch
new file mode 100644
index 0000000..ecc69a7
--- /dev/null
+++ b/emacs/27.2/01_all_erc-libera.patch
@@ -0,0 +1,53 @@
+Add Libera.Chat to ERC services
+
+This backports and consolidates the following commits from upstream git:
+
+commit 86e4d770a833538f3cb711eb42d8fd8d764a4635
+Author: Amin Bandali <bandali@gnu.org>
+Date: Mon May 24 23:25:27 2021 -0400
+
+ * lisp/erc/erc-services.el: Fix newly-added Libera.Chat entry (bug#48529).
+
+commit a70a344941713baf08dc0c093bdf25cf36b09858
+Author: Corwin Brust <corwin@bru.st>
+Date: Mon May 24 23:36:01 2021 +0200
+
+ Add Libera.chat to `erc-nickserv-alist'
+
+--- emacs-27.2/lisp/erc/erc-services.el
++++ emacs-27.2/lisp/erc/erc-services.el
+@@ -32,8 +32,8 @@
+
+ ;; As a default, ERC has the data for the official nickname services on
+ ;; the networks Austnet, BrasNET, Dalnet, freenode, GalaxyNet, GRnet,
+-;; and Slashnet. You can add more by using M-x customize-variable RET
+-;; erc-nickserv-alist.
++;; Libera.Chat and Slashnet. You can add more by using
++;; M-x customize-variable RET erc-nickserv-alist.
+
+ ;; Usage:
+ ;;
+@@ -190,6 +190,7 @@
+ (const GalaxyNet)
+ (const GRnet)
+ (const iip)
++ (const Libera.Chat)
+ (const OFTC)
+ (const QuakeNet)
+ (const Rizon)
+@@ -257,6 +258,15 @@
+ "type\\s-/squery\\s-Trent\\s-identify\\s-<password>"
+ "Trent@anon.iip"
+ "IDENTIFY" nil "SQUERY" nil)
++ (Libera.Chat
++ "NickServ!NickServ@services.libera.chat"
++ ;; Libera.Chat also accepts a password at login, see the `erc'
++ ;; :password argument.
++ "This\\s-nickname\\s-is\\s-registered.\\s-Please\\s-choose"
++ "NickServ"
++ "IDENTIFY" nil nil
++ ;; See also the 901 response code message.
++ "You\\s-are\\s-now\\s-identified\\s-for\\s-")
+ (OFTC
+ "NickServ!services@services.oftc.net"
+ ;; OFTC's NickServ doesn't ask you to identify anymore.