@@ -1,12 +1,11 @@

 Summary:        The GnuTLS Transport Layer Security Library

 Name:           gnutls

-Version:        3.4.11

-Release:        4%{?dist}

+Version:        3.5.10

+Release:        1%{?dist}

 License:        GPLv3+ and LGPLv2+

 URL:            http://www.gnutls.org

-Source0:        http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/gnutls/v3.4/%{name}-%{version}.tar.xz

-%define sha1    gnutls=55f73d1ea2b3335fea514fad6faa1e72006ae9f9

-Patch0:         gnutls_3.4.11_default_priority.patch

+Source0:        https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/%{name}-%{version}.tar.xz

+%define sha1    gnutls=4a8afbda93d48e4cdbcb562a420e0f4e9f3361e9

 Group:          System Environment/Libraries

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -21,6 +20,7 @@ Requires:       libtasn1

 Requires:       openssl

 Requires:       ca-certificates

 Requires:       gmp

+

 %description

 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.

@@ -36,7 +36,7 @@ developing applications that use gnutls.

 %prep

 %setup -q

-%patch0 -p1

+

 %build

 # check for trust store file presence

 [ -f %{_sysconfdir}/pki/tls/certs/ca-bundle.crt ] || exit 1

@@ -45,9 +45,11 @@ developing applications that use gnutls.

     --prefix=%{_prefix} \

     --without-p11-kit \

     --disable-openssl-compatibility \

+    --with-included-unistring \

     --with-system-priority-file=%{_sysconfdir}/gnutls/default-priorities \

     --with-default-trust-store-file=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt

 make %{?_smp_mflags}

+

 %install

 make DESTDIR=%{buildroot} install

 rm %{buildroot}%{_infodir}/*

@@ -68,6 +70,8 @@ make %{?_smp_mflags} check

 %{_bindir}/*

 %{_mandir}/man1/*

 %{_datadir}/locale/*

+%{_docdir}/gnutls/*.png

+

 %files devel

 %defattr(-,root,root)

 %{_includedir}/%{name}/*.h

@@ -76,6 +80,8 @@ make %{?_smp_mflags} check

 %{_mandir}/man3/*

 %changelog

+*   Thu Apr 13 2017 Danut Moraru <dmoraru@vmware.com> 3.5.10-1

+-   Update to version 3.5.10

 *   Sun Dec 18 2016 Alexey Makhalov <amakhalov@vmware.com> 3.4.11-4

 -   configure to use default trust store file

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 3.4.11-3

deleted file mode 100644

@@ -1,32 +0,0 @@

-diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c

-index 50d3d09..8c32d1c 100644

-+++ b/lib/gnutls_priority.c

-@@ -1066,6 +1066,8 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,

- 	rmadd_func *fn;

- 	bulk_rmadd_func *bulk_fn;

- 	bulk_rmadd_func *bulk_given_fn;

-+	unsigned int default_set = 0;

-+

- 	const cipher_entry_st *centry;

- 

- 	if (err_pos)

-@@ -1084,10 +1086,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,

- 	(*priority_cache)->sr = SR_PARTIAL;

- 	(*priority_cache)->min_record_version = 1;

- 

--	if (priorities == NULL)

--		priorities = "NORMAL";

-+	if (priorities == NULL) {

-+		priorities = "@SYSTEM";

-+		default_set = 1;

-+	}

- 

- 	darg = resolve_priorities(priorities);

-+	if (darg == NULL && default_set == 1) {

-+		priorities = "NORMAL";

-+		darg = resolve_priorities(priorities);

-+	}

- 	if (darg == NULL) {

- 		gnutls_assert();

- 		goto error;

@@ -1,23 +1,27 @@

 Summary:	Gperf-3.0.4

 Name:		gperf

-Version:	3.0.4

-Release:	2%{?dist}

+Version:	3.1

+Release:	1%{?dist}

 License:	GPLv3+

 URL:		http://freedesktop.org/wiki/Software/%{name}l/

 Source0:	http://ftp.gnu.org/gnu/gperf/%{name}-%{version}.tar.gz

-%define sha1 gperf=e32d4aff8f0c730c9a56554377b2c6d82d0951b8

+%define sha1 gperf=e3c0618c2d2e5586eda9498c867d5e4858a3b0e2

 Group:		Development/Tools

 Vendor:		VMware, Inc.

 Distribution: 	Photon

+

 %description

 Gperf generates a perfect hash function from a key set.

+

 %prep

 %setup -q

+

 %build

 ./configure \

 	--prefix=%{_prefix} \

 	--docdir=%{_defaultdocdir}/%{name}-%{version}

 make %{?_smp_mflags}

+

 %install

 make DESTDIR=%{buildroot} install

 install -v -m644 doc/gperf.{dvi,ps,pdf} %{buildroot}/%{_docdir}/%{name}-%{version}

@@ -36,7 +40,10 @@ make %{?_smp_mflags} check

 %{_mandir}/man1/*

 %{_datadir}/info/*

 %{_bindir}/*

+

 %changelog

+*	Thu Apr 13 2017 Danut Moraru <dmoraru@vmware.com> 3.1-1

+-	Updated to version 3.1

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.0.4-2

 -	GA - Bump release of all rpms

 *	Thu Oct 23 2014 Divya Thaluru <dthaluru@vmware.com> 3.0.4-1

@@ -1,18 +1,19 @@

 Summary:	High-Level Crypto API

 Name:		gpgme

-Version:	1.6.0

-Release:	3%{?dist}

+Version:	1.9.0

+Release:	1%{?dist}

 License:	GPLv2+

 URL:		https://www.gnupg.org/(it)/related_software/gpgme/index.html

 Group:		System Environment/Security

 Vendor:		VMware, Inc.

 Distribution:	Photon

-Source0:	ftp://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.bz2

-%define sha1 gpgme=21510323495f6220f8f67610c3c27a23d761d43d

+Source0:	https://www.gnupg.org/ftp/gcrypt/%{name}/%{name}-%{version}.tar.bz2

+%define sha1 gpgme=870719cd3d2ef6a7fcb1d6af9ce5446edba7bfc3

 Requires:	libassuan

 Requires:	libgpg-error

 BuildRequires:	libgpg-error-devel

 BuildRequires:	libassuan >= 2.2.0

+

 %description

 The GPGME package is a C language library that allows to add support for cryptography to a program. It is designed to make access to public key crypto engines like GnuPG or GpgSM easier for applications. GPGME provides a high-level crypto API for encryption, decryption, signing, signature verification and key management.  

@@ -21,17 +22,20 @@ Group:          Development/Libraries

 Summary:        Static libraries and header files from GPGME, GnuPG Made Easy.

 Requires:	%{name} = %{version}-%{release}

 Requires:	libgpg-error-devel

+

 %description 	devel

 Static libraries and header files from GPGME, GnuPG Made Easy.

 %prep

 %setup -q

+

 %build

 ./configure \

 	--prefix=%{_prefix} \

  	--disable-fd-passing \

         --disable-gpgsm-test

 make %{?_smp_mflags}

+

 %install

 make DESTDIR=%{buildroot} install

 rm %{buildroot}/%{_libdir}/*.la

@@ -41,20 +45,29 @@ rm -rf %{buildroot}/%{_infodir}

 cd tests && make check-TESTS

 %post	-p /sbin/ldconfig

+

 %postun	-p /sbin/ldconfig

+

 %files 

 %defattr(-,root,root)

 %{_libdir}/*.so.*

 %{_datadir}/common-lisp/source/gpgme/*.lisp

 %{_datadir}/common-lisp/source/gpgme/gpgme.asd

+

 %files devel

 %defattr(-,root,root)

 %{_bindir}/*

 %{_includedir}/*.h

+%{_includedir}/gpgme++/*.h

+%{_includedir}/gpgme++/interfaces/*.h

 %{_libdir}/*.so*

+%{_libdir}/cmake/Gpgmepp/*

 %{_datadir}/aclocal/*

 %{_datadir}/common-lisp/source/gpgme/*

+

 %changelog

+*   Thu Apr 13 2017 Danut Moraru <dmoraru@vmware.com> 1.9.0-1

+-   Update to version 1.9.0

 *   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 1.6.0-3

 -   Required libgpg-error-devel.

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.6.0-2