diff --git a/.gitignore b/.gitignore index bd1c570..65fd401 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ gnupg-2.0.16.tar.bz2.sig /gnupg-2.1.13.tar.bz2.sig /gnupg-2.1.16.tar.bz2 /gnupg-2.1.16.tar.bz2.sig +/gnupg-2.1.17.tar.bz2 +/gnupg-2.1.17.tar.bz2.sig diff --git a/gnupg-2.1.12-build.patch b/gnupg-2.1.17-build.patch similarity index 54% rename from gnupg-2.1.12-build.patch rename to gnupg-2.1.17-build.patch index fefaa3d..c53aec2 100644 --- a/gnupg-2.1.12-build.patch +++ b/gnupg-2.1.17-build.patch @@ -1,7 +1,7 @@ -diff -up gnupg-2.1.12/configure.ac.build gnupg-2.1.12/configure.ac ---- gnupg-2.1.12/configure.ac.build 2016-05-04 11:43:16.000000000 +0200 -+++ gnupg-2.1.12/configure.ac 2016-05-05 12:05:07.314698224 +0200 -@@ -90,8 +90,8 @@ AC_GNU_SOURCE +diff -up gnupg-2.1.17/configure.ac.build gnupg-2.1.17/configure.ac +--- gnupg-2.1.17/configure.ac.build 2016-12-20 11:19:05.000000000 +0100 ++++ gnupg-2.1.17/configure.ac 2016-12-22 08:58:51.115299092 +0100 +@@ -89,8 +89,8 @@ AC_GNU_SOURCE # CFLAGS (they are restored at the end of the configure script). This # is because some configure checks don't work with -Werror, but we'd # like to use -Werror with our build. @@ -12,7 +12,7 @@ diff -up gnupg-2.1.12/configure.ac.build gnupg-2.1.12/configure.ac # Some status variables. have_gpg_error=no -@@ -1636,7 +1636,7 @@ AC_ARG_ENABLE(optimization, +@@ -1623,7 +1623,7 @@ AC_ARG_ENABLE(optimization, # # Add user CFLAGS. # @@ -21,10 +21,10 @@ diff -up gnupg-2.1.12/configure.ac.build gnupg-2.1.12/configure.ac # # Decide what to build -diff -up gnupg-2.1.12/configure.build gnupg-2.1.12/configure ---- gnupg-2.1.12/configure.build 2016-05-04 16:00:22.000000000 +0200 -+++ gnupg-2.1.12/configure 2016-05-05 12:05:07.316698269 +0200 -@@ -5043,8 +5043,8 @@ $as_echo "$ac_cv_safe_to_define___extens +diff -up gnupg-2.1.17/configure.build gnupg-2.1.17/configure +--- gnupg-2.1.17/configure.build 2016-12-20 11:28:20.000000000 +0100 ++++ gnupg-2.1.17/configure 2016-12-22 08:58:51.116299114 +0100 +@@ -5039,8 +5039,8 @@ $as_echo "$ac_cv_safe_to_define___extens # CFLAGS (they are restored at the end of the configure script). This # is because some configure checks don't work with -Werror, but we'd # like to use -Werror with our build. @@ -35,7 +35,7 @@ diff -up gnupg-2.1.12/configure.build gnupg-2.1.12/configure # Some status variables. have_gpg_error=no -@@ -15413,7 +15413,7 @@ fi +@@ -15465,7 +15465,7 @@ fi # # Add user CFLAGS. # @@ -44,45 +44,45 @@ diff -up gnupg-2.1.12/configure.build gnupg-2.1.12/configure # # Decide what to build -diff -up gnupg-2.1.12/dirmngr/Makefile.am.build gnupg-2.1.12/dirmngr/Makefile.am ---- gnupg-2.1.12/dirmngr/Makefile.am.build 2016-05-04 11:43:16.000000000 +0200 -+++ gnupg-2.1.12/dirmngr/Makefile.am 2016-05-05 12:20:24.468656960 +0200 -@@ -132,7 +132,7 @@ endif - t_http_SOURCES = t-http.c http.c dns-stuff.c - t_http_CFLAGS = -DWITHOUT_NPTH=1 \ +diff -up gnupg-2.1.17/dirmngr/Makefile.am.build gnupg-2.1.17/dirmngr/Makefile.am +--- gnupg-2.1.17/dirmngr/Makefile.am.build 2016-12-22 08:58:51.116299114 +0100 ++++ gnupg-2.1.17/dirmngr/Makefile.am 2016-12-22 09:01:02.632165482 +0100 +@@ -141,7 +141,7 @@ endif + t_http_SOURCES = $(t_common_src) t-http.c http.c dns-stuff.c + t_http_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \ $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS) \ - $(GPG_ERROR_CFLAGS) + $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS) t_http_LDADD = $(t_common_ldadd) \ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS) -@@ -140,7 +140,7 @@ t_ldap_parse_uri_SOURCES = \ +@@ -149,7 +149,7 @@ t_ldap_parse_uri_SOURCES = \ t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \ http.c dns-stuff.c \ $(ldap_url) $(t_common_src) --t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 \ -+t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(LIBASSUAN_CFLAGS) \ +-t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \ ++t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(LIBASSUAN_CFLAGS) $(USE_C99_CFLAGS) \ $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS) -diff -up gnupg-2.1.12/dirmngr/Makefile.in.build gnupg-2.1.12/dirmngr/Makefile.in ---- gnupg-2.1.12/dirmngr/Makefile.in.build 2016-05-04 16:00:20.000000000 +0200 -+++ gnupg-2.1.12/dirmngr/Makefile.in 2016-05-05 12:22:43.333832474 +0200 -@@ -641,7 +641,7 @@ module_tests = t-dns-stuff $(am__append_ - t_http_SOURCES = t-http.c http.c dns-stuff.c - t_http_CFLAGS = -DWITHOUT_NPTH=1 \ +diff -up gnupg-2.1.17/dirmngr/Makefile.in.build gnupg-2.1.17/dirmngr/Makefile.in +--- gnupg-2.1.17/dirmngr/Makefile.in.build 2016-12-22 08:58:51.117299136 +0100 ++++ gnupg-2.1.17/dirmngr/Makefile.in 2016-12-22 09:02:03.802492934 +0100 +@@ -665,7 +665,7 @@ module_tests = $(am__append_13) + t_http_SOURCES = $(t_common_src) t-http.c http.c dns-stuff.c + t_http_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \ $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS) \ - $(GPG_ERROR_CFLAGS) + $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS) t_http_LDADD = $(t_common_ldadd) \ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS) -@@ -651,7 +651,7 @@ t_ldap_parse_uri_SOURCES = \ +@@ -675,7 +675,7 @@ t_ldap_parse_uri_SOURCES = \ http.c dns-stuff.c \ $(ldap_url) $(t_common_src) --t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 \ -+t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(LIBASSUAN_CFLAGS) \ +-t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \ ++t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(LIBASSUAN_CFLAGS) $(USE_C99_CFLAGS) \ $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS) diff --git a/gnupg2.spec b/gnupg2.spec index 79cd9b6..ab0fed8 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -1,6 +1,6 @@ Summary: Utility for secure communication and data storage Name: gnupg2 -Version: 2.1.16 +Version: 2.1.17 Release: 1%{?dist} License: GPLv3+ @@ -16,7 +16,7 @@ Patch3: gnupg-2.1.10-secmem.patch Patch4: gnupg-2.1.16-file-is-digest.patch Patch5: gnupg-2.1.1-ocsp-keyusage.patch Patch6: gnupg-2.1.1-fips-algo.patch -Patch7: gnupg-2.1.12-build.patch +Patch7: gnupg-2.1.17-build.patch URL: http://www.gnupg.org/ @@ -206,6 +206,9 @@ fi %changelog +* Thu Dec 22 2016 Tomáš Mráz - 2.1.17-1 +- upgrade to 2.1.17 + * Mon Nov 28 2016 Tomáš Mráz - 2.1.16-1 - upgrade to 2.1.16 diff --git a/sources b/sources index 32981d8..a553a27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bfb53004773a014d401694f94229fc00 gnupg-2.1.16.tar.bz2 -f652e70d2b5c6f0d060bc67ba16d3394 gnupg-2.1.16.tar.bz2.sig +SHA512 (gnupg-2.1.17.tar.bz2) = f826100be4f0480b9a2c68a51dd668e0fd551fd250a37dbe906fe5a89c658b4861a0567038bf687473de9901e268809c1b8d8c200008e082a3ace189d9829b9c +SHA512 (gnupg-2.1.17.tar.bz2.sig) = 417237a87d23b746f6bd7c29435b9f953d88bb0adc7f11418e96310c7aa7b9ea6b2fd646bd28503f13c8dfba98e32deda63329503a18d53ab793cfa39cba557a