From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from vulpes.veloxis.de ([85.10.192.253])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <dennis.herbrich@hytera.de>) id 1UFRod-0000Lf-VE
	for ptxdist@pengutronix.de; Tue, 12 Mar 2013 17:12:43 +0100
From: Dennis Herbrich <dennis.herbrich@hytera.de>
Date: Tue, 12 Mar 2013 17:12:19 +0100
Message-Id: <1363104739-26416-2-git-send-email-dennis.herbrich@hytera.de>
In-Reply-To: <1363104739-26416-1-git-send-email-dennis.herbrich@hytera.de>
References: <1363104739-26416-1-git-send-email-dennis.herbrich@hytera.de>
Subject: [ptxdist] [PATCH 2/2] ptxdist: Added HTTPS proxy and exception
	configuration
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de
Cc: Dennis Herbrich <dennis.herbrich@hytera.de>


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