Browse code
Update gnutls to 3.4.11 and disable openssl-compatibility.
Change-Id: Ibcb78b9e1a4b84b65ba5cf0fbf1e4b49b4668a2c
Reviewed-on: http://photon-jenkins.eng.vmware.com/759
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
(cherry picked from commit 27ea6d32c87c41e6f2ec01cbf7ed5e7d18f5edcc)
Reviewed-on: http://photon-jenkins.eng.vmware.com/843
Reviewed-by: Sharath George
xiaolin-vmware authored on 2016/04/30 04:04:21Showing 2 changed files
| ... | ... |
@@ -1,11 +1,12 @@ |
| 1 | 1 |
Summary: The GnuTLS Transport Layer Security Library |
| 2 | 2 |
Name: gnutls |
| 3 |
-Version: 3.4.9 |
|
| 4 |
-Release: q%{?dist}
|
|
| 3 |
+Version: 3.4.11 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: GPLv3+ and LGPLv2+ |
| 6 | 6 |
URL: http://www.gnutls.org |
| 7 | 7 |
Source0: http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/gnutls/v3.4/%{name}-%{version}.tar.xz
|
| 8 |
-%define sha1 gnutls=04df5ec2bb1282704e99b15fd64892026fb95f1c |
|
| 8 |
+%define sha1 gnutls=55f73d1ea2b3335fea514fad6faa1e72006ae9f9 |
|
| 9 |
+Patch0: gnutls_3.4.11_default_priority.patch |
|
| 9 | 10 |
Group: System Environment/Libraries |
| 10 | 11 |
Vendor: VMware, Inc. |
| 11 | 12 |
Distribution: Photon |
| ... | ... |
@@ -35,11 +36,13 @@ developing applications that use gnutls. |
| 35 | 35 |
|
| 36 | 36 |
%prep |
| 37 | 37 |
%setup -q |
| 38 |
+%patch0 -p1 |
|
| 38 | 39 |
%build |
| 39 | 40 |
./configure \ |
| 40 | 41 |
--prefix=%{_prefix} \
|
| 41 | 42 |
--without-p11-kit \ |
| 42 |
- --enable-openssl-compatibility |
|
| 43 |
+ --disable-openssl-compatibility \ |
|
| 44 |
+ --with-system-priority-file=%{_sysconfdir}/gnutls/default-priorities
|
|
| 43 | 45 |
make %{?_smp_mflags}
|
| 44 | 46 |
%install |
| 45 | 47 |
make DESTDIR=%{buildroot} install
|
| ... | ... |
@@ -68,6 +71,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 68 | 68 |
%{_libdir}/*.so
|
| 69 | 69 |
%{_libdir}/pkgconfig/*.pc
|
| 70 | 70 |
%changelog |
| 71 |
+* Wed Apr 27 2016 Xiaolin Li <xiaolinl@vmware.com> 3.4.11-1 |
|
| 72 |
+- Updated to version 3.4.11 |
|
| 71 | 73 |
* Thu Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 3.4.9-1 |
| 72 | 74 |
- Updated to version 3.4.9 |
| 73 | 75 |
* Thu Jan 14 2016 Xiaolin Li <xiaolinl@vmware.com> 3.4.8-1 |
| 74 | 76 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,32 @@ |
| 0 |
+diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c |
|
| 1 |
+index 50d3d09..8c32d1c 100644 |
|
| 2 |
+--- a/lib/gnutls_priority.c |
|
| 3 |
+@@ -1066,6 +1066,8 @@ gnutls_priority_init(gnutls_priority_t * priority_cache, |
|
| 4 |
+ rmadd_func *fn; |
|
| 5 |
+ bulk_rmadd_func *bulk_fn; |
|
| 6 |
+ bulk_rmadd_func *bulk_given_fn; |
|
| 7 |
++ unsigned int default_set = 0; |
|
| 8 |
++ |
|
| 9 |
+ const cipher_entry_st *centry; |
|
| 10 |
+ |
|
| 11 |
+ if (err_pos) |
|
| 12 |
+@@ -1084,10 +1086,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache, |
|
| 13 |
+ (*priority_cache)->sr = SR_PARTIAL; |
|
| 14 |
+ (*priority_cache)->min_record_version = 1; |
|
| 15 |
+ |
|
| 16 |
+- if (priorities == NULL) |
|
| 17 |
+- priorities = "NORMAL"; |
|
| 18 |
++ if (priorities == NULL) {
|
|
| 19 |
++ priorities = "@SYSTEM"; |
|
| 20 |
++ default_set = 1; |
|
| 21 |
++ } |
|
| 22 |
+ |
|
| 23 |
+ darg = resolve_priorities(priorities); |
|
| 24 |
++ if (darg == NULL && default_set == 1) {
|
|
| 25 |
++ priorities = "NORMAL"; |
|
| 26 |
++ darg = resolve_priorities(priorities); |
|
| 27 |
++ } |
|
| 28 |
+ if (darg == NULL) {
|
|
| 29 |
+ gnutls_assert(); |
|
| 30 |
+ goto error; |