1. photon
  2. Commit 56b87748b35768c8a5783dd2282ad74a9a71febd
Browse code

Upgrade curl to 7.51.0

Change-Id: If23bea11238b7ca4ec264fba2d001c2f5026f88e
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1622
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

suezzelur authored on 2016/11/03 02:22:58
Showing 2 changed files
SPECS/curl/curl.spec
History View file @ 56b8774
... ... 
@@ -1,16 +1,14 @@
1 1 
 Summary:	An URL retrieval utility and library
2 2 
 Name:		curl
3 
-Version:	7.47.1
4 
-Release:	4%{?dist}
3 
+Version:	7.51.0
4 
+Release:	1%{?dist}
5 5 
 License:	MIT
6 6 
 URL:		http://curl.haxx.se
7 7 
 Group:		System Environment/NetworkingLibraries
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution: Photon
10 10 
 Source0:	http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
11 
-Patch0:         CVE-2016-7167.patch
12 
-Patch1:         CVE-2016-5421.patch
13 
-%define sha1 curl=07d8f7a4c7c9ad3293ee3d87f5c2683dd6cc1ca4
11 
+%define sha1 curl=19bf2c1e60a513910355cc9769c6371ea2ff5d1f
14 12 
 Requires:	ca-certificates
15 13 
 BuildRequires:	ca-certificates
16 14 
 Requires:	openssl
... ... 
@@ -25,8 +23,6 @@ functions like streaming media.
25 25 
 %prep
26 26 
 %setup -q
27 27 
 sed -i '/--static-libs)/{N;s#echo .*#echo #;}' curl-config.in
28 
-%patch0 -p1
29 
-%patch1 -p1
30 28 
 %build
31 29 
 ./configure \
32 30 
 	CFLAGS="%{optflags}" \
... ... 
@@ -62,16 +58,17 @@ rm -rf %{buildroot}/*
62 62 
 %{_mandir}/man3/*
63 63 
 %{_datarootdir}/aclocal/libcurl.m4
64 64 
 %{_docdir}/%{name}-%{version}
65 
-%{_datadir}/zsh/site-functions/_curl
66 65 
 %changelog
67 
-*   Thu Oct 27 2016 Anish Swaminathan <anishs@vmware.com> 7.47.1-4
68 
--   Patch for CVE-2016-5421
69 
-*   Mon Sep 19 2016 Xiaolin Li <xiaolinl@vmware.com> 7.47.1-3
70 
--   Applied CVE-2016-7167.patch.
66 
+*   	Wed Nov 02 2016 Anish Swaminathan <anishs@vmware.com> 7.51.0-1
67 
+-   	Upgrade curl to 7.51.0
68 
+*   	Thu Oct 27 2016 Anish Swaminathan <anishs@vmware.com> 7.47.1-4
69 
+-   	Patch for CVE-2016-5421
70 
+*   	Mon Sep 19 2016 Xiaolin Li <xiaolinl@vmware.com> 7.47.1-3
71 
+-   	Applied CVE-2016-7167.patch.
71 72 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 7.47.1-2
72 73 
 -	GA - Bump release of all rpms
73 
-*   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 7.47.1-1
74 
--   Updated to version 7.47.1
74 
+*   	Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 7.47.1-1
75 
+-   	Updated to version 7.47.1
75 76 
 * 	Thu Jan 14 2016 Xiaolin Li <xiaolinl@vmware.com> 7.46.0-1
76 77 
 - 	Updated to version 7.46.0
77 78 
 *	Thu Aug 13 2015 Divya Thaluru <dthaluru@vmware.com> 7.43.0-1
SPECS/perl-WWW-Curl/perl-WWW-Curl.spec
History View file @ 56b8774
... ... 
@@ -7,29 +7,33 @@
7 7 
 Summary:        Perl extension interface for libcurl
8 8 
 Name:           perl-WWW-Curl
9 9 
 Version:        4.17
10 
-Release:        2%{?dist}
10 
+Release:        3%{?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 15 
 %define sha1 WWW-Curl=8ec7b7b39bd653539671fb02fbb7d0ff4863e636
16 
-Vendor:		VMware, Inc.
17 
-Distribution:	Photon
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
30 31
31 32 
 %build
32 33 
 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
33 37 
 make %{?_smp_mflags}
34 38
35 39 
 %install
... ... 
@@ -59,8 +63,10 @@ make test
59 59 
 %{_mandir}/man3/*
60 60
61 61 
 %changelog
62 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.17-2
63 
--	GA - Bump release of all rpms
64 
-*	Fri Apr 3 2015 Divya Thaluru <dthaluru@vmware.com> 4.17-1
65 
--	Initial version.
62 
+*   Thu Sep 15 2016 Xiaolin Li <xiaolinl@vmware.com> 4.17-3
63 
+-   Build WWW-Curl with curl 7.50.3
64 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.17-2
65 
+-   GA - Bump release of all rpms
66 
+*   Fri Apr 3 2015 Divya Thaluru <dthaluru@vmware.com> 4.17-1
67 
+-   Initial version.
66 68