From 4b619d168d411e84ed78ad3d195bed0a7b7dc781 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 05 2015 13:23:43 +0000
Subject: import yum-rhn-plugin-2.0.1-5.el7


---

diff --git a/SOURCES/yum-rhn-plugin-2.0.1-4-el7-to-yum-rhn-plugin-2.0.1-5-el7.patch b/SOURCES/yum-rhn-plugin-2.0.1-4-el7-to-yum-rhn-plugin-2.0.1-5-el7.patch
new file mode 100644
index 0000000..f4fe661
--- /dev/null
+++ b/SOURCES/yum-rhn-plugin-2.0.1-4-el7-to-yum-rhn-plugin-2.0.1-5-el7.patch
@@ -0,0 +1,53 @@
+diff --git a/rhnplugin.py b/rhnplugin.py
+index 3cbd355..88fb354 100644
+--- a/rhnplugin.py
++++ b/rhnplugin.py
+@@ -8,6 +8,7 @@ and XMLRPC calls.
+ import os
+ import sys
+ import urllib
++import locale
+ 
+ from yum.plugins import TYPE_CORE
+ from yum.yumRepo import YumRepository
+@@ -79,10 +80,11 @@ def init_hook(conduit):
+     try:
+         proxy_url = get_proxy_url(up2date_cfg)
+         if proxy_url:
++            proxy_url = proxy_url.encode(locale.getpreferredencoding())
+             if up2date_cfg['useNoSSLForPackages']:
+-                proxy_dict = {'HTTP' : proxy_url}
++                proxy_dict = {'http' : proxy_url}
+             else:
+-                proxy_dict = {'HTTPS' : proxy_url}
++                proxy_dict = {'https' : proxy_url}
+     except BadProxyConfig:
+         rhn_enabled = False
+         PROXY_ERROR =  _("There was an error parsing the Red Hat Proxy settings.")
+diff --git a/yum-rhn-plugin.spec b/yum-rhn-plugin.spec
+index 5bf7dfa..006b9b1 100644
+--- a/yum-rhn-plugin.spec
++++ b/yum-rhn-plugin.spec
+@@ -1,7 +1,7 @@
+ Summary: Spacewalk support for yum
+ Name: yum-rhn-plugin
+ Version: 2.0.1
+-Release: 4%{?dist}
++Release: 5%{?dist}
+ License: GPLv2
+ Group: System Environment/Base
+ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
+@@ -70,6 +70,13 @@ fi
+ %doc LICENSE
+ 
+ %changelog
++* Wed Sep 17 2014 Stephen Herr <sherr@redhat.com> 2.0.1-5
++- Related: #1115516 - don't encode proxy url if not set (mzazrivec@redhat.com)
++- Related: #1115516 - encode proxy url when passing it to urlgrabber
++  (mzazrivec@redhat.com)
++- Resolves: #1115516 - correctly initialize proxy settings for URLGrabber
++  (mzazrivec@redhat.com)
++
+ * Mon Feb 03 2014 Milan Zazrivec <mzazrivec@redhat.com> 2.0.1-4
+ - Related: #1043850 - avoid insecure use of /var/tmp
+ 
diff --git a/SPECS/yum-rhn-plugin.spec b/SPECS/yum-rhn-plugin.spec
index 17fc2bd..4f89955 100644
--- a/SPECS/yum-rhn-plugin.spec
+++ b/SPECS/yum-rhn-plugin.spec
@@ -1,13 +1,14 @@
 Summary: Spacewalk support for yum
 Name: yum-rhn-plugin
 Version: 2.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 Patch0: yum-rhn-plugin-2.0.1-1-to-yum-rhn-plugin-2.0.1-2-el7.patch
 Patch1: yum-rhn-plugin-2.0.1-2-el7-to-yum-rhn-plugin-2.0.1-3-el7.patch
 Patch2: yum-rhn-plugin-2.0.1-3-el7-to-yum-rhn-plugin-2.0.1-4-el7.patch
+Patch3: yum-rhn-plugin-2.0.1-4-el7-to-yum-rhn-plugin-2.0.1-5-el7.patch
 URL:     https://fedorahosted.org/spacewalk
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
@@ -36,6 +37,7 @@ software updates.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 make -f Makefile.yum-rhn-plugin
@@ -76,6 +78,13 @@ fi
 %doc LICENSE
 
 %changelog
+* Wed Sep 17 2014 Stephen Herr <sherr@redhat.com> 2.0.1-5
+- Related: #1115516 - don't encode proxy url if not set (mzazrivec@redhat.com)
+- Related: #1115516 - encode proxy url when passing it to urlgrabber
+  (mzazrivec@redhat.com)
+- Resolves: #1115516 - correctly initialize proxy settings for URLGrabber
+  (mzazrivec@redhat.com)
+
 * Mon Feb 03 2014 Milan Zazrivec <mzazrivec@redhat.com> 2.0.1-4
 - Related: #1043850 - avoid insecure use of /var/tmp