From fb1b8c68533bcc29d5f753b9c64617b601fd5f9c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 05 2015 13:21:24 +0000
Subject: import python-urlgrabber-3.10-6.el7


---

diff --git a/SOURCES/BZ-1082648-curl-77-error-message.patch b/SOURCES/BZ-1082648-curl-77-error-message.patch
new file mode 100644
index 0000000..951d4d3
--- /dev/null
+++ b/SOURCES/BZ-1082648-curl-77-error-message.patch
@@ -0,0 +1,18 @@
+commit e19463a8781fa5de74e62a09684259309b2f89cf
+Author: Valentina Mukhamedzhanova <vmukhame@redhat.com>
+Date:   Mon Sep 22 14:45:10 2014 +0200
+
+    Add a comprehensive error message to pycurl error 77. BZ 1082648
+
+diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
+index fd31123..961d18a 100644
+--- a/urlgrabber/grabber.py
++++ b/urlgrabber/grabber.py
+@@ -1576,6 +1576,7 @@ class PyCurlFileObject(object):
+                              67 : _("Authentication failure"),
+                              70 : _("Out of disk space on server"),
+                              73 : _("Remove file exists"),
++                             77 : _("Problem with the SSL CA cert (path? access rights?)"),
+                               }
+                 errstr = str(e.args[1]) or pyerr2str.get(errcode, '<Unknown>')
+                 if code and not 200 <= code <= 299:
diff --git a/SOURCES/BZ-1099101-revert-curl-ctrl-c.patch b/SOURCES/BZ-1099101-revert-curl-ctrl-c.patch
new file mode 100644
index 0000000..79b462b
--- /dev/null
+++ b/SOURCES/BZ-1099101-revert-curl-ctrl-c.patch
@@ -0,0 +1,19 @@
+commit 545eb9bbc325a2f59803dfb199ef64dec6db8774
+Author: Valentina Mukhamedzhanova <vmukhame@redhat.com>
+Date:   Wed Sep 10 10:04:10 2014 +0200
+
+    Revert bf0a0be71373dec515bbb54e0613a3b9b0c00b04 - curl error codes.
+
+diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
+index 69cd113..fd31123 100644
+--- a/urlgrabber/grabber.py
++++ b/urlgrabber/grabber.py
+@@ -1524,7 +1524,7 @@ class PyCurlFileObject(object):
+                 err.url = errurl
+                 raise err
+                 
+-            elif errcode in (42, 55, 56):
++            elif errcode == 42:
+                 # this is probably wrong but ultimately this is what happens
+                 # we have a legit http code and a pycurl 'writer failed' code
+                 # which almost always means something aborted it from outside
diff --git a/SPECS/python-urlgrabber.spec b/SPECS/python-urlgrabber.spec
index 74fa13e..e84e036 100644
--- a/SPECS/python-urlgrabber.spec
+++ b/SPECS/python-urlgrabber.spec
@@ -3,11 +3,15 @@
 Summary: A high-level cross-protocol url-grabber
 Name: python-urlgrabber
 Version: 3.10
-Release: 4%{?dist}
+Release: 6%{?dist}
 Source0: http://urlgrabber.baseurl.org/download/urlgrabber-%{version}.tar.gz
 Patch1: BZ-853432-single-conn-reset.patch
 Patch2: BZ-1017491-respond-to-ctrl-c.patch
 
+# rhel-7.1.0
+Patch10: BZ-1099101-revert-curl-ctrl-c.patch
+Patch11: BZ-1082648-curl-77-error-message.patch
+
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -27,6 +31,10 @@ authentication, proxies and more.
 %patch1 -p1
 %patch2 -p1
 
+# rhel-7.1.0
+%patch10 -p1
+%patch11 -p1
+
 %build
 python setup.py build
 
@@ -46,6 +54,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{_libexecdir}/urlgrabber-ext-down
 
 %changelog
+* Wed Sep 24 2014 Valentina Mukhamedzhanova <vmukhame@redhat.com> - 3.10-6
+- Add a comprehensive error message to curl error 77.
+- Resolves: bug#1082648
+
+* Wed Sep 10 2014 Valentina Mukhamedzhanova <vmukhame@redhat.com> - 3.10-5
+- Revert treating curl errcodes 55 and 56 as Ctrl-C.
+- Resolves: bug#1099101
+
 * Tue Feb 4 2014 Valentina Mukhamedzhanova <vmukhame@redhat.com> - 3.10-4
 - Treat curl errcodes 55 and 56 as Ctrl-C.
 - Resolves: bug#1017491