diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 3 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 34 | ||||
| -rw-r--r-- | lisp/net/netrc.el | 1 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 1 | ||||
| -rw-r--r-- | lisp/net/rcompile.el | 4 | ||||
| -rw-r--r-- | lisp/net/soap-client.el | 1 | ||||
| -rw-r--r-- | lisp/net/socks.el | 9 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
8 files changed, 45 insertions, 10 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 4338cdff3cd..2a44148e4ce 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1390,6 +1390,9 @@ only return the directory part of FILE." (run-hooks 'find-file-hook) (setq buffer-file-name nil) (goto-char (point-min)) + (while (search-forward-regexp "^[ \t]*#.*$" nil t) + (replace-match "")) + (goto-char (point-min)) (skip-chars-forward " \t\r\n") (while (not (eobp)) (ange-ftp-parse-netrc-group)) diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 17fef277736..1bc319c796e 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -39,6 +39,7 @@ (defgroup gnutls nil "Emacs interface to the GnuTLS library." + :version "24.1" :prefix "gnutls-" :group 'net-utils) @@ -46,8 +47,23 @@ "If non-nil, this should be a TLS priority string. For instance, if you want to skip the \"dhe-rsa\" algorithm, set this variable to \"normal:-dhe-rsa\"." + :group 'gnutls :type '(choice (const nil) - string)) + string)) + +(defcustom gnutls-trustfiles + '( + "/etc/ssl/certs/ca-certificates.crt" ; Debian, Ubuntu, Gentoo and Arch Linux + "/etc/pki/tls/certs/ca-bundle.crt" ; Fedora and RHEL + "/etc/ssl/ca-bundle.pem" ; Suse + "/usr/ssl/certs/ca-bundle.crt" ; Cygwin + ) + "List of CA bundle location filenames or a function returning said list. +The files may be in PEM or DER format, as per the GnuTLS documentation. +The files may not exist, in which case they will be ignored." + :group 'gnutls + :type '(choice (function :tag "Function to produce list of bundle filenames") + (repeat (file :tag "Bundle filename")))) ;;;###autoload (defcustom gnutls-min-prime-bits nil @@ -116,7 +132,7 @@ TYPE is `gnutls-x509pki' (default) or `gnutls-anon'. Use nil for the default. PROCESS is a process returned by `open-network-stream'. HOSTNAME is the remote hostname. It must be a valid string. PRIORITY-STRING is as per the GnuTLS docs, default is \"NORMAL\". -TRUSTFILES is a list of CA bundles. +TRUSTFILES is a list of CA bundles. It defaults to `gnutls-trustfiles'. CRLFILES is a list of CRL files. KEYLIST is an alist of (client key file, client cert file) pairs. MIN-PRIME-BITS is the minimum acceptable size of Diffie-Hellman keys @@ -154,18 +170,20 @@ here's a recent version of the list. It must be omitted, a number, or nil; if omitted or nil it defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT." (let* ((type (or type 'gnutls-x509pki)) - (default-trustfile "/etc/ssl/certs/ca-certificates.crt") (trustfiles (or trustfiles - (when (file-exists-p default-trustfile) - (list default-trustfile)))) + (delq nil + (mapcar (lambda (f) (and f (file-exists-p f) f)) + (if (functionp gnutls-trustfiles) + (funcall gnutls-trustfiles) + gnutls-trustfiles))))) (priority-string (or priority-string (cond ((eq type 'gnutls-anon) "NORMAL:+ANON-DH:!ARCFOUR-128") ((eq type 'gnutls-x509pki) - (if gnutls-algorithm-priority - (upcase gnutls-algorithm-priority) - "NORMAL"))))) + (if gnutls-algorithm-priority + (upcase gnutls-algorithm-priority) + "NORMAL"))))) (min-prime-bits (or min-prime-bits gnutls-min-prime-bits)) (params `(:priority ,priority-string :hostname ,hostname diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index 070b32a63d0..16d9203ba04 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -39,6 +39,7 @@ (defcustom netrc-file "~/.authinfo" "File where user credentials are stored." + :version "24.1" :type 'file :group 'netrc) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index b8bf270d87c..1c74e6190dc 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -2384,6 +2384,7 @@ keywords when no KEYWORD is given." (delete-region (match-beginning 1) (match-end 1)) (goto-char (match-beginning 1))) ;; remove the ^O characters now + (goto-char (point-min)) (while (re-search-forward "\C-o+" nil t) (delete-region (match-beginning 0) (match-end 0)))) diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el index d5815468a05..09677a654c0 100644 --- a/lisp/net/rcompile.el +++ b/lisp/net/rcompile.el @@ -1,8 +1,8 @@ ;;; rcompile.el --- run a compilation on a remote machine -;; Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc. -;; Author: Albert <alon@milcse.rtsg.mot.com> +;; Author: Alon Albert <alon@milcse.rtsg.mot.com> ;; Maintainer: FSF ;; Created: 1993 Oct 6 ;; Keywords: tools, processes diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index dfa2b76899a..e17b283c55f 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -55,6 +55,7 @@ (defgroup soap-client nil "Access SOAP web services from Emacs." + :version "24.1" :group 'tools) ;;;; Support for parsing XML documents with namespaces diff --git a/lisp/net/socks.el b/lisp/net/socks.el index b9431bdeed7..3c94e7d1b22 100644 --- a/lisp/net/socks.el +++ b/lisp/net/socks.el @@ -35,6 +35,8 @@ (require 'wid-edit)) (require 'custom) +;; FIXME this is bad practice, and who is it for anyway, since Emacs +;; has split-string since at least 21.1. (if (not (fboundp 'split-string)) (defun split-string (string &optional pattern) "Return a list of substrings of STRING which are separated by PATTERN. @@ -335,10 +337,17 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." (declare-function socks-original-open-network-stream "socks") ; fset +;; FIXME this is a terrible idea. +;; It is not even compatible with the argument spec of open-network-stream +;; in 24.1. If this is really necessary, open-network-stream +;; could get a wrapper hook, or defer to open-network-stream-function. + (defvar socks-override-functions nil "*Whether to overwrite the open-network-stream function with the SOCKSified version.") +(require 'network-stream) + (if (fboundp 'socks-original-open-network-stream) nil ; Do nothing, we've been here already (defalias 'socks-original-open-network-stream diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index f13315bc662..851b11629f4 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -181,6 +181,7 @@ See the variable `tramp-encoding-shell' for more information." (unless (string-match "cmd\\.exe" tramp-encoding-shell) "-i") "*Use this switch together with `tramp-encoding-shell' for interactive shells. See the variable `tramp-encoding-shell' for more information." + :version "24.1" :group 'tramp :type '(choice (const nil) string)) @@ -463,6 +464,7 @@ the remote shell.") (defcustom tramp-local-end-of-line (if (memq system-type '(windows-nt)) "\r\n" "\n") "*String used for end of line in local processes." + :version "24.1" :group 'tramp :type 'string) |