[ptxdist] [PATCH 1/2] ptxdist: Keep https_proxy and no_proxy in environment

[ptxdist] [PATCH 1/2] ptxdist: Keep https_proxy and no_proxy in environment

[Dennis Herbrich]

Signed-off-by: Dennis Herbrich <dennis.herbrich@hytera.de>
---
 bin/ptxdist |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ptxdist b/bin/ptxdist
index 579cedb..a28681d 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -2015,7 +2015,7 @@ setup_env() {
 
 	unset $(/usr/bin/env | \
 		sed -n -e "s/^\([^=[:space:]]\+\)=.*$/\1/p" | \
-		egrep -v "^(PTXDIST_PTXRC|PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|ftp_proxy${whitelist})$" )
+		egrep -v "^(PTXDIST_PTXRC|PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|https_proxy|ftp_proxy|no_proxy${whitelist})$" )
 
 	######## the environment is clean now ########
 
-- 
1.7.9.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] ptxdist: Added HTTPS proxy and exception configuration

[Dennis Herbrich]

Signed-off-by: Dennis Herbrich <dennis.herbrich@hytera.de>
---
 bin/ptxdist          |    7 +++++++
 config/setup/Kconfig |   21 +++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/bin/ptxdist b/bin/ptxdist
index a28681d..95382e6 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -2155,10 +2155,17 @@ setup_config() {
 		export http_proxy="${PTXCONF_SETUP_HTTP_PROXY}"
 	fi
 
+	if [ -n "${PTXCONF_SETUP_HTTPS_PROXY}" ]; then
+		export https_proxy="${PTXCONF_SETUP_HTTPS_PROXY}"
+	fi
+
 	if [ -n "${PTXCONF_SETUP_FTP_PROXY}" ]; then
 		export ftp_proxy="${PTXCONF_SETUP_FTP_PROXY}"
 	fi
 
+	if [ -n "${PTXCONF_SETUP_NO_PROXY}" ]; then
+		export no_proxy="${PTXCONF_SETUP_NO_PROXY}"
+	fi
 
 	#
 	# setup PARALLELMFLAGS
diff --git a/config/setup/Kconfig b/config/setup/Kconfig
index 266e942..508c89b 100644
--- a/config/setup/Kconfig
+++ b/config/setup/Kconfig
@@ -56,6 +56,27 @@ config SETUP_HTTP_PROXY
 
 	              http://your.proxy.org:80
 
+config SETUP_HTTPS_PROXY
+	prompt "HTTPS Proxy"
+	string
+	default ""
+	help
+	  If you have to use a proxy for HTTPS transfers, please add the
+	  proxy URL here. Example:
+
+	              https://your.proxy.org:80
+
+config SETUP_NO_PROXY
+	prompt "Proxy Exceptions"
+	string
+	default ""
+	help
+	  If you generally require a proxy, but need to add exceptions for
+	  certain hosts, please add those as a comma-separated list here.
+	  Example:
+
+	              .localdomain,127.0.0.1
+
 endmenu
 
 menu "Project Searchpath"
-- 
1.7.9.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de