update to 7.19.0.1
This commit is contained in:
parent
ffa845d400
commit
205ad20ffb
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
pycurl-7.19.0.tar.gz
|
pycurl-7.19.0.tar.gz
|
||||||
|
/pycurl-7.19.0.1.tar.gz
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,26 +0,0 @@
|
|||||||
From dc431c729b9639485a45dbd91e020c5c95508c90 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Thu, 8 Aug 2013 12:51:48 +0200
|
|
||||||
Subject: [PATCH 1/2] do_curl_getinfo: fix misplaced #endif
|
|
||||||
|
|
||||||
---
|
|
||||||
src/pycurl.c | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/pycurl.c b/src/pycurl.c
|
|
||||||
index c8b8402..87dac7e 100644
|
|
||||||
--- a/src/pycurl.c
|
|
||||||
+++ b/src/pycurl.c
|
|
||||||
@@ -2481,8 +2481,8 @@ do_curl_getinfo(CurlObject *self, PyObject *args)
|
|
||||||
return convert_certinfo(clist);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- }
|
|
||||||
#endif
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* Got wrong option on the method call */
|
|
||||||
PyErr_SetString(PyExc_ValueError, "invalid argument to getinfo");
|
|
||||||
--
|
|
||||||
1.7.1
|
|
||||||
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
From 9540e6097563ea754b8619fe85ba010071a67244 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Thu, 8 Aug 2013 12:54:53 +0200
|
|
||||||
Subject: [PATCH 2/2] runwsgi.py: start the server explicitly at 127.0.0.1
|
|
||||||
|
|
||||||
Otherwise it may start on ::1, which would consequently break self-test.
|
|
||||||
---
|
|
||||||
tests/runwsgi.py | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/runwsgi.py b/tests/runwsgi.py
|
|
||||||
index c9bc236..096038c 100644
|
|
||||||
--- a/tests/runwsgi.py
|
|
||||||
+++ b/tests/runwsgi.py
|
|
||||||
@@ -85,7 +85,7 @@ class ServerThread(threading.Thread):
|
|
||||||
self.app = app
|
|
||||||
self.port = port
|
|
||||||
self.server_kwargs = server_kwargs
|
|
||||||
- self.server = server(host='localhost', port=self.port, **self.server_kwargs)
|
|
||||||
+ self.server = server(host='127.0.0.1', port=self.port, **self.server_kwargs)
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
bottle.run(self.app, server=self.server, quiet=True)
|
|
||||||
--
|
|
||||||
1.7.1
|
|
||||||
|
|
||||||
@ -1,8 +1,8 @@
|
|||||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||||
|
|
||||||
Name: python-pycurl
|
Name: python-pycurl
|
||||||
Version: 7.19.0
|
Version: 7.19.0.1
|
||||||
Release: 18.20130315git8d654296%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A Python interface to libcurl
|
Summary: A Python interface to libcurl
|
||||||
|
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
@ -10,13 +10,6 @@ License: LGPLv2+ or MIT
|
|||||||
URL: http://pycurl.sourceforge.net/
|
URL: http://pycurl.sourceforge.net/
|
||||||
Source0: http://pycurl.sourceforge.net/download/pycurl-%{version}.tar.gz
|
Source0: http://pycurl.sourceforge.net/download/pycurl-%{version}.tar.gz
|
||||||
|
|
||||||
# sync with upstream's 8d654296
|
|
||||||
Patch0: 0000-pycurl-7.19.7-8d654296.patch
|
|
||||||
|
|
||||||
# get the test-suite running
|
|
||||||
Patch1: 0001-do_curl_getinfo-fix-misplaced-endif.patch
|
|
||||||
Patch2: 0002-runwsgi.py-start-the-server-explicitly-at-127.0.0.1.patch
|
|
||||||
|
|
||||||
Requires: keyutils-libs
|
Requires: keyutils-libs
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: curl-devel >= 7.19.0
|
BuildRequires: curl-devel >= 7.19.0
|
||||||
@ -47,16 +40,6 @@ of features.
|
|||||||
%prep
|
%prep
|
||||||
%setup0 -q -n pycurl-%{version}
|
%setup0 -q -n pycurl-%{version}
|
||||||
|
|
||||||
# drop CVS stuff that would prevent git patches from being applied
|
|
||||||
find -type f | xargs sed -i 's/\$Id: [^$]*\$/$Id$/'
|
|
||||||
|
|
||||||
# upstream patches
|
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
# patches not yet upstream
|
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
# remove a test specific to OpenSSL-powered libcurl
|
# remove a test specific to OpenSSL-powered libcurl
|
||||||
rm -f tests/certinfo_test.py
|
rm -f tests/certinfo_test.py
|
||||||
|
|
||||||
@ -79,6 +62,9 @@ rm -rf %{buildroot}%{_datadir}/doc/pycurl
|
|||||||
%{python_sitearch}/*
|
%{python_sitearch}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 25 2013 Kamil Dudka <kdudka@redhat.com> - 7.19.0.1-1
|
||||||
|
- update to 7.19.0.1
|
||||||
|
|
||||||
* Thu Aug 08 2013 Kamil Dudka <kdudka@redhat.com> - 7.19.0-18.20130315git8d654296
|
* Thu Aug 08 2013 Kamil Dudka <kdudka@redhat.com> - 7.19.0-18.20130315git8d654296
|
||||||
- sync with upstream 8d654296
|
- sync with upstream 8d654296
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user