Browse code

Update gnuplot gnutls and nettle

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

suezzelur authored on 2018/09/07 07:40:14
Showing 5 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:        Gnuplot is a portable command-line driven graphing utility.
2 2
 Name:           gnuplot
3
-Version:        5.0.6
3
+Version:        5.2.4
4 4
 Release:        1%{?dist}
5 5
 License:        Freeware
6 6
 URL:            http://www.gnuplot.info/
... ...
@@ -8,7 +8,7 @@ Group:          Applications
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
11
-%define sha1    gnuplot=f7b8948166b22e5bd658d5cf7579716f4821dba0
11
+%define sha1    gnuplot=e31e8d9875216f65f9ed0e57b2f62d9dfb0f0714
12 12
 
13 13
 %description
14 14
 Gnuplot is a portable command-line driven graphing utility for Linux, OS/2, MS Windows, OSX, VMS, and many other platforms. The source code is copyrighted but freely distributed (i.e., you don't have to pay for it). It was originally created to allow scientists and students to visualize mathematical functions and data interactively, but has grown to support many non-interactive uses such as web scripting. It is also used as a plotting engine by third-party applications like Octave. Gnuplot has been supported and under active development since 1986.
... ...
@@ -35,6 +35,8 @@ make DESTDIR=%{buildroot} install
35 35
 
36 36
 
37 37
 %changelog
38
+*   Thu Sep 06 2018 Anish Swaminathan <anishs@vmware.com> 5.2.4-1
39
+-   Update version to 5.2.4
38 40
 *   Wed Apr 12 2017 Danut Moraru <dmoraru@vmware.com> 5.0.6-1
39 41
 -   Update version to 5.0.6
40 42
 *   Tue Nov 29 2016 Xiaolin Li <xiaolinl@vmware.com> 5.0.5-1
... ...
@@ -1,26 +1,30 @@
1 1
 Summary:        The GnuTLS Transport Layer Security Library
2 2
 Name:           gnutls
3
-Version:        3.5.15
4
-Release:        2%{?dist}
3
+Version:        3.6.3
4
+Release:        1%{?dist}
5 5
 License:        GPLv3+ and LGPLv2+
6 6
 URL:            http://www.gnutls.org
7 7
 Source0:        https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/%{name}-%{version}.tar.xz
8
-%define sha1    gnutls=9b7466434332b92dc3ca704b9211370370814fac
8
+%define sha1    gnutls=ac96787a7fbd550a2b201e64c0e752821e90fed7
9 9
 Group:          System Environment/Libraries
10 10
 Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
12
-Patch0:         gnutls_3.5.15_default_priority.patch
12
+Patch0:         gnutls_3.6.3_default_priority.patch
13 13
 BuildRequires:  nettle-devel
14 14
 BuildRequires:  autogen-libopts-devel
15 15
 BuildRequires:  libtasn1-devel
16 16
 BuildRequires:  ca-certificates
17 17
 BuildRequires:  openssl-devel
18
+BuildRequires:  guile-devel
19
+BuildRequires:  gc-devel
18 20
 Requires:       nettle
19 21
 Requires:       autogen-libopts
20 22
 Requires:       libtasn1
21 23
 Requires:       openssl
22 24
 Requires:       ca-certificates
23 25
 Requires:       gmp
26
+Requires:       guile
27
+Requires:       gc
24 28
 
25 29
 %description
26 30
 GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them. It provides a simple C language application programming interface (API) to access the secure communications protocols as well as APIs to parse and write X.509, PKCS #12, OpenPGP and other required structures. It is aimed to be portable and efficient with focus on security and interoperability.
... ...
@@ -72,6 +76,9 @@ make %{?_smp_mflags} check
72 72
 %{_mandir}/man1/*
73 73
 %{_datadir}/locale/*
74 74
 %{_docdir}/gnutls/*.png
75
+%{_libdir}/guile/2.0/*.so*
76
+%{_libdir}/guile/2.0/site-ccache/gnutls*
77
+%{_datadir}/guile/site/2.0/gnutls*
75 78
 
76 79
 %files devel
77 80
 %defattr(-,root,root)
... ...
@@ -81,6 +88,8 @@ make %{?_smp_mflags} check
81 81
 %{_mandir}/man3/*
82 82
 
83 83
 %changelog
84
+*   Thu Sep 06 2018 Anish Swaminathan <anishs@vmware.com> 3.6.3-1
85
+-   Update version to 3.6.3
84 86
 *   Fri Feb 09 2018 Xiaolin Li <xiaolinl@vmware.com> 3.5.15-2
85 87
 -   Add default_priority.patch.
86 88
 *   Tue Oct 10 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.15-1
87 89
deleted file mode 100644
... ...
@@ -1,30 +0,0 @@
1
-diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
2
-index 50d3d09..8c32d1c 100644
3
-+++ b/lib/priority.c
4
-@@ -1217,6 +1217,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
5
- 	rmadd_func *fn;
6
- 	bulk_rmadd_func *bulk_fn;
7
- 	bulk_rmadd_func *bulk_given_fn;
8
-+	unsigned int default_set = 0;
9
- 	const cipher_entry_st *centry;
10
- 
11
- 	if (err_pos)
12
-@@ -1236,9 +1237,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
13
- 	(*priority_cache)->min_record_version = 1;
14
- 
15
- 	if (priorities == NULL)
16
--		priorities = DEFAULT_PRIORITY_STRING;
17
-+	{
18
-+		priorities = "@SYSTEM";
19
-+		default_set = 1;
20
-+	}
21
- 
22
- 	darg = _gnutls_resolve_priorities(priorities);
23
-+	if (darg == NULL && default_set == 1) {
24
-+		priorities = "NORMAL";
25
-+		darg = _gnutls_resolve_priorities(priorities);
26
-+	}
27
- 	if (darg == NULL) {
28
- 		gnutls_assert();
29
- 		goto error;
30 1
new file mode 100644
... ...
@@ -0,0 +1,29 @@
0
+diff -rup gnutls-3.6.3-orig/lib/priority.c gnutls-3.6.3/lib/priority.c
1
+--- gnutls-3.6.3-orig/lib/priority.c	2018-09-06 01:14:34.395975850 -0700
2
+@@ -1577,6 +1577,7 @@ gnutls_priority_init(gnutls_priority_t *
3
+ 	rmadd_func *fn;
4
+ 	bulk_rmadd_func *bulk_fn;
5
+ 	bulk_rmadd_func *bulk_given_fn;
6
++    unsigned int default_set = 0;
7
+ 	const cipher_entry_st *centry;
8
+ 
9
+ 	if (err_pos)
10
+@@ -1597,9 +1598,16 @@ gnutls_priority_init(gnutls_priority_t *
11
+ 	gnutls_atomic_init(&(*priority_cache)->usage_cnt);
12
+ 
13
+ 	if (priorities == NULL)
14
+-		priorities = DEFAULT_PRIORITY_STRING;
15
++    {
16
++        priorities = "@SYSTEM";
17
++        default_set = 1;
18
++    }
19
+ 
20
+ 	darg = _gnutls_resolve_priorities(priorities);
21
++    if (darg == NULL && default_set == 1) {
22
++        priorities = "NORMAL";
23
++        darg = _gnutls_resolve_priorities(priorities);
24
++    }
25
+ 	if (darg == NULL) {
26
+ 		gnutls_assert();
27
+ 		goto error;
... ...
@@ -1,11 +1,11 @@
1 1
 Summary:	Low level cryptographic libraries
2 2
 Name:		nettle
3
-Version:	3.3
3
+Version:	3.4
4 4
 Release:	1%{?dist}
5 5
 License:	LGPLv3+ or GPLv2+
6 6
 URL:            http://www.lysator.liu.se/~nisse/nettle/
7 7
 Source0: 	https://ftp.gnu.org/gnu/nettle/%{name}-%{version}.tar.gz
8
-%define sha1 nettle=bf2b4d3a41192ff6177936d7bc3bee4cebeb86c4
8
+%define sha1 nettle=f3c8495b7c43cba9cdd19503e7567095c680b490
9 9
 Group: 		Development/Libraries
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
... ...
@@ -63,16 +63,18 @@ make %{?_smp_mflags} check
63 63
 %{_libdir}/pkgconfig/*.pc
64 64
 
65 65
 %changelog
66
-*	Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3-1
67
--	Update to 3.3
68
-*       Mon Oct 04 2016 ChangLee <changLee@vmware.com> 3.2-3
69
--       Modified %check
70
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.2-2
71
--	GA - Bump release of all rpms
72
-*       Mon Feb 22 2016 XIaolin Li <xiaolinl@vmware.com> 3.2-1
73
--       Updated to version 3.2
74
-*       Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 3.1.1-2
75
--       Moving static lib files to devel package.
76
-*	Thu Jun 18 2015 Divya Thaluru <dthaluru@vmware.com> 3.1.1-1
77
--	Initial build. First version
66
+*   Thu Sep 06 2018 Anish Swaminathan <anishs@vmware.com> 3.4-1
67
+-   Update version to 3.4
68
+*   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3-1
69
+-   Update to 3.3
70
+*   Mon Oct 04 2016 ChangLee <changLee@vmware.com> 3.2-3
71
+-   Modified %check
72
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.2-2
73
+-   GA - Bump release of all rpms
74
+*   Mon Feb 22 2016 XIaolin Li <xiaolinl@vmware.com> 3.2-1
75
+-   Updated to version 3.2
76
+*   Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 3.1.1-2
77
+-   Moving static lib files to devel package.
78
+*   Thu Jun 18 2015 Divya Thaluru <dthaluru@vmware.com> 3.1.1-1
79
+-   Initial build. First version
78 80