From 3ccc692acd6162071950bfbba8230fa8c16dbe839243a78d7d0cb6d38f37af08 Mon Sep 17 00:00:00 2001
From: Jan Matejek <ja+suse@matejcik.cz>
Date: Mon, 8 Aug 2011 17:58:02 +0000
Subject: [PATCH] - strip whitespace from NO_PROXY entries (bnc#710736)

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=104
---
 python-2.7.1-urllib-noproxy.patch | 12 ++++++++++++
 python-base.changes               |  5 +++++
 python-base.spec                  |  2 ++
 3 files changed, 19 insertions(+)
 create mode 100644 python-2.7.1-urllib-noproxy.patch

diff --git a/python-2.7.1-urllib-noproxy.patch b/python-2.7.1-urllib-noproxy.patch
new file mode 100644
index 0000000..e104c8a
--- /dev/null
+++ b/python-2.7.1-urllib-noproxy.patch
@@ -0,0 +1,12 @@
+Index: Python-2.7.1/Lib/urllib.py
+===================================================================
+--- Python-2.7.1.orig/Lib/urllib.py
++++ Python-2.7.1/Lib/urllib.py
+@@ -1350,6 +1350,7 @@ def proxy_bypass_environment(host):
+     hostonly, port = splitport(host)
+     # check if the host ends with any of the DNS suffixes
+     for name in no_proxy.split(','):
++        name = name.strip()
+         if name and (hostonly.endswith(name) or host.endswith(name)):
+             return 1
+     # otherwise, don't bypass
diff --git a/python-base.changes b/python-base.changes
index db9b46d..5e480f7 100644
--- a/python-base.changes
+++ b/python-base.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  8 17:03:03 UTC 2011 - jmatejek@novell.com
+
+- strip whitespace from NO_PROXY entries (bnc#710736)
+
 -------------------------------------------------------------------
 Fri Jul 22 13:03:49 UTC 2011 - idonmez@novell.com
 
diff --git a/python-base.spec b/python-base.spec
index 5dd9871..9a6ce4b 100644
--- a/python-base.spec
+++ b/python-base.spec
@@ -53,6 +53,7 @@ Patch13:        python-2.7.1-fix_date_time_compiler.patch
 Patch14:        python-2.7-CVE-2011-1521-fileurl.patch
 Patch15:        python-2.7-fix-parallel-make.patch
 Patch16:        python-2.7.1-linux3.patch
+Patch17:        python-2.7.1-urllib-noproxy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
 Provides:       %{name} = %{python_version}
@@ -150,6 +151,7 @@ Authors:
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 # drop Autoconf version requirement
 sed -i 's/^version_required/dnl version_required/' configure.in