upgrade to 2.1.18

This commit is contained in:
Tomas Mraz 2017-03-01 10:03:11 +01:00
parent 37328e7943
commit eedb26e2e0
4 changed files with 24 additions and 32 deletions

2
.gitignore vendored
View File

@ -46,3 +46,5 @@ gnupg-2.0.16.tar.bz2.sig
/gnupg-2.1.16.tar.bz2.sig
/gnupg-2.1.17.tar.bz2
/gnupg-2.1.17.tar.bz2.sig
/gnupg-2.1.18.tar.bz2
/gnupg-2.1.18.tar.bz2.sig

View File

@ -1,6 +1,6 @@
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 09:03:48.114757301 +0100
diff -up gnupg-2.1.18/configure.ac.build gnupg-2.1.18/configure.ac
--- gnupg-2.1.18/configure.ac.build 2017-01-23 19:39:13.000000000 +0100
+++ gnupg-2.1.18/configure.ac 2017-03-01 09:51:34.245988503 +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
@ -12,7 +12,7 @@ diff -up gnupg-2.1.17/configure.ac.build gnupg-2.1.17/configure.ac
# Some status variables.
have_gpg_error=no
@@ -1623,7 +1623,7 @@ AC_ARG_ENABLE(optimization,
@@ -1632,7 +1632,7 @@ AC_ARG_ENABLE(optimization,
#
# Add user CFLAGS.
#
@ -21,9 +21,9 @@ diff -up gnupg-2.1.17/configure.ac.build gnupg-2.1.17/configure.ac
#
# Decide what to build
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 09:03:48.116757345 +0100
diff -up gnupg-2.1.18/configure.build gnupg-2.1.18/configure
--- gnupg-2.1.18/configure.build 2017-01-23 21:26:36.000000000 +0100
+++ gnupg-2.1.18/configure 2017-03-01 09:51:34.247988533 +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
@ -35,7 +35,7 @@ diff -up gnupg-2.1.17/configure.build gnupg-2.1.17/configure
# Some status variables.
have_gpg_error=no
@@ -15465,7 +15465,7 @@ fi
@@ -15492,7 +15492,7 @@ fi
#
# Add user CFLAGS.
#
@ -44,9 +44,9 @@ diff -up gnupg-2.1.17/configure.build gnupg-2.1.17/configure
#
# Decide what to build
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-20 11:19:05.000000000 +0100
+++ gnupg-2.1.17/dirmngr/Makefile.am 2016-12-22 09:03:48.116757345 +0100
diff -up gnupg-2.1.18/dirmngr/Makefile.am.build gnupg-2.1.18/dirmngr/Makefile.am
--- gnupg-2.1.18/dirmngr/Makefile.am.build 2016-12-20 11:19:05.000000000 +0100
+++ gnupg-2.1.18/dirmngr/Makefile.am 2017-03-01 09:51:34.247988533 +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) \
@ -65,9 +65,9 @@ diff -up gnupg-2.1.17/dirmngr/Makefile.am.build gnupg-2.1.17/dirmngr/Makefile.am
$(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
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-20 11:28:18.000000000 +0100
+++ gnupg-2.1.17/dirmngr/Makefile.in 2016-12-22 09:03:48.116757345 +0100
diff -up gnupg-2.1.18/dirmngr/Makefile.in.build gnupg-2.1.18/dirmngr/Makefile.in
--- gnupg-2.1.18/dirmngr/Makefile.in.build 2017-01-23 21:26:34.000000000 +0100
+++ gnupg-2.1.18/dirmngr/Makefile.in 2017-03-01 09:51:34.247988533 +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) \
@ -86,16 +86,3 @@ diff -up gnupg-2.1.17/dirmngr/Makefile.in.build gnupg-2.1.17/dirmngr/Makefile.in
$(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
diff -up gnupg-2.1.17/tests/gpgscm/scheme.c.build gnupg-2.1.17/tests/gpgscm/scheme.c
--- gnupg-2.1.17/tests/gpgscm/scheme.c.build 2016-12-20 11:19:05.000000000 +0100
+++ gnupg-2.1.17/tests/gpgscm/scheme.c 2016-12-22 11:04:42.043709362 +0100
@@ -4844,6 +4844,9 @@ static pointer opexe_5(scheme *sc, enum
int lineno =
sc->load_stack[sc->file_i].rep.stdio.curr_line;
+ if (filename == NULL) {
+ filename = "";
+ }
s_save(sc, OP_TAG_VALUE,
cons(sc, mk_string(sc, filename),
cons(sc, mk_integer(sc, lineno), sc->NIL)),

View File

@ -1,7 +1,7 @@
Summary: Utility for secure communication and data storage
Name: gnupg2
Version: 2.1.17
Release: 3%{?dist}
Version: 2.1.18
Release: 1%{?dist}
License: GPLv3+
Group: Applications/System
@ -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.17-build.patch
Patch7: gnupg-2.1.18-build.patch
URL: http://www.gnupg.org/
@ -208,6 +208,9 @@ fi
%changelog
* Wed Mar 1 2017 Tomáš Mráz <tmraz@redhat.com> - 2.1.18-1
- upgrade to 2.1.18
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.17-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (gnupg-2.1.17.tar.bz2) = f826100be4f0480b9a2c68a51dd668e0fd551fd250a37dbe906fe5a89c658b4861a0567038bf687473de9901e268809c1b8d8c200008e082a3ace189d9829b9c
SHA512 (gnupg-2.1.17.tar.bz2.sig) = 417237a87d23b746f6bd7c29435b9f953d88bb0adc7f11418e96310c7aa7b9ea6b2fd646bd28503f13c8dfba98e32deda63329503a18d53ab793cfa39cba557a
SHA512 (gnupg-2.1.18.tar.bz2) = b8357f0a883a33c2e4f6ab5a8f5ddb171c899b7a2899e8ce4cac232938fe1dffb789a54980dfc4b758c4cb47f11f1fc570fea905244735048dfc6f06b3353baf
SHA512 (gnupg-2.1.18.tar.bz2.sig) = d821af7c1b55ff37b569724bec186c968152ec3a7ef8a5b2dc8405c62e2cf84c0b61ff9cf1405fd6cfe50fe6673b3f68d889558284b014f5fcf5a64da32fb262