diff options
| -rw-r--r-- | Library/Homebrew/dev-cmd/audit.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/manpages/brew.1.md.erb | 10 | ||||
| -rwxr-xr-x | bin/brew | 2 | ||||
| -rw-r--r-- | docs/Manpage.md | 10 | ||||
| -rw-r--r-- | manpages/brew.1 | 10 |
5 files changed, 25 insertions, 9 deletions
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index da80c42ad..657487f3c 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -189,8 +189,6 @@ class FormulaAuditor swig ].freeze - FILEUTILS_METHODS = FileUtils.singleton_methods(false).map { |m| Regexp.escape(m) }.join "|" - def initialize(formula, options = {}) @formula = formula @new_formula = options[:new_formula] diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb index eaded21ed..508c90f2d 100644 --- a/Library/Homebrew/manpages/brew.1.md.erb +++ b/Library/Homebrew/manpages/brew.1.md.erb @@ -247,6 +247,10 @@ can take several different forms: Sets the HTTPS proxy to be used by `curl`, `git` and `svn` when downloading through Homebrew. + * `all_proxy`: + Sets the SOCKS5 proxy to be used by `curl`, `git` and `svn` when downloading + through Homebrew. + * `ftp_proxy`: Sets the FTP proxy to be used by `curl`, `git` and `svn` when downloading through Homebrew. @@ -256,12 +260,14 @@ can take several different forms: by `curl`, `git` and `svn` when downloading through Homebrew. ## USING HOMEBREW BEHIND A PROXY -Use the `http_proxy`, `https_proxy`, `no_proxy` and/or `ftp_proxy` documented above. +Use the `http_proxy`, `https_proxy`, `all_proxy`, `no_proxy` and/or `ftp_proxy` documented above. -For example for an unauthenticated HTTP proxy: +For example for an unauthenticated HTTP or SOCKS5 proxy: export http_proxy=http://<host>:<port> + export all_proxy=socks5://<host>:<port> + And for an authenticated HTTP proxy: export http_proxy=http://<user>:<password>@<host>:<port> @@ -67,7 +67,7 @@ then FILTERED_ENV=() # Filter all but the specific variables. for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS SSH_AUTH_SOCK SUDO_ASKPASS \ - http_proxy https_proxy ftp_proxy no_proxy HTTPS_PROXY FTP_PROXY \ + http_proxy https_proxy ftp_proxy no_proxy all_proxy HTTPS_PROXY FTP_PROXY ALL_PROXY \ "${!HOMEBREW_@}" "${!TRAVIS_@}" "${!JENKINS_@}" do # Skip if variable value is empty. diff --git a/docs/Manpage.md b/docs/Manpage.md index 28379b03c..53c41873b 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1086,6 +1086,10 @@ can take several different forms: Sets the HTTPS proxy to be used by `curl`, `git` and `svn` when downloading through Homebrew. + * `all_proxy`: + Sets the SOCKS5 proxy to be used by `curl`, `git` and `svn` when downloading + through Homebrew. + * `ftp_proxy`: Sets the FTP proxy to be used by `curl`, `git` and `svn` when downloading through Homebrew. @@ -1095,12 +1099,14 @@ can take several different forms: by `curl`, `git` and `svn` when downloading through Homebrew. ## USING HOMEBREW BEHIND A PROXY -Use the `http_proxy`, `https_proxy`, `no_proxy` and/or `ftp_proxy` documented above. +Use the `http_proxy`, `https_proxy`, `all_proxy`, `no_proxy` and/or `ftp_proxy` documented above. -For example for an unauthenticated HTTP proxy: +For example for an unauthenticated HTTP or SOCKS5 proxy: export http_proxy=http://`host`:`port` + export all_proxy=socks5://`host`:`port` + And for an authenticated HTTP proxy: export http_proxy=http://`user`:`password`@`host`:`port` diff --git a/manpages/brew.1 b/manpages/brew.1 index 5dfe230e7..3e91e0a82 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1107,6 +1107,10 @@ Sets the HTTP proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downl Sets the HTTPS proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\. . .TP +\fBall_proxy\fR +Sets the SOCKS5 proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\. +. +.TP \fBftp_proxy\fR Sets the FTP proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\. . @@ -1115,16 +1119,18 @@ Sets the FTP proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downlo Sets the comma\-separated list of hostnames and domain names that should be excluded from proxying by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\. . .SH "USING HOMEBREW BEHIND A PROXY" -Use the \fBhttp_proxy\fR, \fBhttps_proxy\fR, \fBno_proxy\fR and/or \fBftp_proxy\fR documented above\. +Use the \fBhttp_proxy\fR, \fBhttps_proxy\fR, \fBall_proxy\fR, \fBno_proxy\fR and/or \fBftp_proxy\fR documented above\. . .P -For example for an unauthenticated HTTP proxy: +For example for an unauthenticated HTTP or SOCKS5 proxy: . .IP "" 4 . .nf export http_proxy=http://<host>:<port> + +export all_proxy=socks5://<host>:<port> . .fi . |