Browse code
Backout commit 7d1a8e: Update curl to version 7.50.3 (bug 1729038)
Change-Id: Ie8eb22356b8423848c5d8fc17313d397a09f4f43
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1419
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>
Tested-by: Divya Thaluru <dthaluru@vmware.com>
xiaolin-vmware authored on 2016/09/20 09:33:13Showing 3 changed files
| ... | ... |
@@ -1,20 +1,20 @@ |
| 1 |
-Summary: An URL retrieval utility and library |
|
| 2 |
-Name: curl |
|
| 3 |
-Version: 7.50.3 |
|
| 4 |
-Release: 1%{?dist}
|
|
| 5 |
-License: MIT |
|
| 6 |
-URL: http://curl.haxx.se |
|
| 7 |
-Group: System Environment/NetworkingLibraries |
|
| 8 |
-Vendor: VMware, Inc. |
|
| 9 |
-Distribution: Photon |
|
| 10 |
-Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
|
|
| 11 |
-%define sha1 curl=8280372593be1b6452599cbbc58bd3eac23cdf9c |
|
| 12 |
-Requires: ca-certificates |
|
| 1 |
+Summary: An URL retrieval utility and library |
|
| 2 |
+Name: curl |
|
| 3 |
+Version: 7.47.1 |
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 |
+License: MIT |
|
| 6 |
+URL: http://curl.haxx.se |
|
| 7 |
+Group: System Environment/NetworkingLibraries |
|
| 8 |
+Vendor: VMware, Inc. |
|
| 9 |
+Distribution: Photon |
|
| 10 |
+Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
|
|
| 11 |
+%define sha1 curl=07d8f7a4c7c9ad3293ee3d87f5c2683dd6cc1ca4 |
|
| 12 |
+Requires: ca-certificates |
|
| 13 | 13 |
BuildRequires: ca-certificates |
| 14 |
-Requires: openssl |
|
| 15 |
-Requires: krb5 |
|
| 14 |
+Requires: openssl |
|
| 15 |
+Requires: krb5 |
|
| 16 | 16 |
BuildRequires: openssl-devel |
| 17 |
-BuildRequires: krb5 |
|
| 17 |
+BuildRequires: krb5 |
|
| 18 | 18 |
%description |
| 19 | 19 |
The cURL package contains an utility and a library used for |
| 20 | 20 |
transferring files with URL syntax to any of the following |
| ... | ... |
@@ -61,10 +61,8 @@ rm -rf %{buildroot}/*
|
| 61 | 61 |
%{_mandir}/man3/*
|
| 62 | 62 |
%{_datarootdir}/aclocal/libcurl.m4
|
| 63 | 63 |
%{_docdir}/%{name}-%{version}
|
| 64 |
- |
|
| 64 |
+%{_datadir}/zsh/site-functions/_curl
|
|
| 65 | 65 |
%changelog |
| 66 |
-* Thu Sep 15 2016 Xiaolin Li <xiaolinl@vmware.com> 7.50.3-1 |
|
| 67 |
-- Update curl to version 7.50.3. |
|
| 68 | 66 |
* Tue Aug 23 2016 Xiaolin Li <xiaolinl@vmware.com> 7.47.1-3 |
| 69 | 67 |
- Enable gssapi in curl. |
| 70 | 68 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 7.47.1-2 |
| ... | ... |
@@ -7,33 +7,29 @@ |
| 7 | 7 |
Summary: Perl extension interface for libcurl |
| 8 | 8 |
Name: perl-WWW-Curl |
| 9 | 9 |
Version: 4.17 |
| 10 |
-Release: 3%{?dist}
|
|
| 10 |
+Release: 2%{?dist}
|
|
| 11 | 11 |
License: MIT |
| 12 | 12 |
Group: Development/Libraries |
| 13 | 13 |
URL: http://search.cpan.org/dist/WWW-Curl/ |
| 14 | 14 |
Source0: http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
|
| 15 |
-%define sha1 WWW-Curl=8ec7b7b39bd653539671fb02fbb7d0ff4863e636 |
|
| 16 |
-Vendor: VMware, Inc. |
|
| 17 |
-Distribution: Photon |
|
| 15 |
+%define sha1 WWW-Curl=8ec7b7b39bd653539671fb02fbb7d0ff4863e636 |
|
| 16 |
+Vendor: VMware, Inc. |
|
| 17 |
+Distribution: Photon |
|
| 18 | 18 |
BuildRequires: perl |
| 19 |
-BuildRequires: perl-Module-Install |
|
| 20 |
-BuildRequires: perl-YAML-Tiny |
|
| 19 |
+BuildRequires: perl-Module-Install |
|
| 20 |
+BuildRequires: perl-YAML-Tiny |
|
| 21 | 21 |
BuildRequires: curl |
| 22 |
-Requires: perl |
|
| 23 |
-Requires: curl |
|
| 22 |
+Requires: perl |
|
| 23 |
+Requires: curl |
|
| 24 | 24 |
%description |
| 25 | 25 |
WWW::Curl is a Perl extension interface for libcurl. |
| 26 | 26 |
|
| 27 | 27 |
%prep |
| 28 | 28 |
%setup -q -n WWW-Curl-%{version}
|
| 29 | 29 |
rm -rf inc && sed -i -e '/^inc\//d' MANIFEST |
| 30 |
-sed -i 's/_LASTENTRY\\z/_LASTENTRY\\z|CURL_DID_MEMORY_FUNC_TYPEDEFS\\z/' Makefile.PL |
|
| 31 | 30 |
|
| 32 | 31 |
%build |
| 33 | 32 |
perl Makefile.PL INSTALLDIRS=vendor |
| 34 |
-sed -i '/CURL_STRICTER/d' curlopt-constants.c |
|
| 35 |
-sed -i 's/CURLAUTH_ANY/(int)CURLAUTH_ANY/' curlopt-constants.c |
|
| 36 |
-sed -i 's/CURLAUTH_ANYSAFE/(int)CURLAUTH_ANYSAFE/' curlopt-constants.c |
|
| 37 | 33 |
make %{?_smp_mflags}
|
| 38 | 34 |
|
| 39 | 35 |
%install |
| ... | ... |
@@ -63,10 +59,8 @@ make test |
| 63 | 63 |
%{_mandir}/man3/*
|
| 64 | 64 |
|
| 65 | 65 |
%changelog |
| 66 |
-* Thu Sep 15 2016 Xiaolin Li <xiaolinl@vmware.com> 4.17-3 |
|
| 67 |
-- Build WWW-Curl with curl 7.50.3 |
|
| 68 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.17-2 |
|
| 69 |
-- GA - Bump release of all rpms |
|
| 70 |
-* Fri Apr 3 2015 Divya Thaluru <dthaluru@vmware.com> 4.17-1 |
|
| 71 |
-- Initial version. |
|
| 66 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.17-2 |
|
| 67 |
+- GA - Bump release of all rpms |
|
| 68 |
+* Fri Apr 3 2015 Divya Thaluru <dthaluru@vmware.com> 4.17-1 |
|
| 69 |
+- Initial version. |
|
| 72 | 70 |
|
| ... | ... |
@@ -331,7 +331,7 @@ class SpecParser(object): |
| 331 | 331 |
strUtils = StringUtils() |
| 332 | 332 |
line=pkg.decodeContents(line) |
| 333 | 333 |
data = line.strip(); |
| 334 |
- words=data.split() |
|
| 334 |
+ words=data.split(" ")
|
|
| 335 | 335 |
nrWords = len(words) |
| 336 | 336 |
if (nrWords != 3): |
| 337 | 337 |
print "Error: Unable to parse line: "+line |