diff --git a/0001-core-Tweak-STATUS_FAILURE-handling.patch b/0001-core-Tweak-STATUS_FAILURE-handling.patch deleted file mode 100644 index c593b1c..0000000 --- a/0001-core-Tweak-STATUS_FAILURE-handling.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9aa33a99701e189d7fc0ff7322fc9e21e35b73fa Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Thu, 12 Apr 2018 20:36:30 +0200 -Subject: [PATCH] core: Tweak STATUS_FAILURE handling. - -* src/op-support.c (_gpgme_parse_failure): Ignore failures with -location "gpg-exit". --- - -Signed-off-by: Werner Koch ---- - src/op-support.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/op-support.c b/src/op-support.c -index 817c5691..8269ce21 100644 ---- a/src/op-support.c -+++ b/src/op-support.c -@@ -398,7 +398,13 @@ _gpgme_parse_plaintext (char *args, char **filenamep) - - - /* Parse a FAILURE status line and return the error code. ARGS is -- modified to contain the location part. */ -+ * modified to contain the location part. Note that for now we ignore -+ * failure codes with a location of gpg-exit; they are too trouble -+ * some. Instead we should eventually record that error in the -+ * context and provide a function to return a fuller error -+ * description; this could then also show the location of the error -+ * (e.g. "option- parser") to make it easier for the user to detect -+ * the actual error. */ - gpgme_error_t - _gpgme_parse_failure (char *args) - { -@@ -416,6 +422,8 @@ _gpgme_parse_failure (char *args) - *where = '\0'; - - where = args; -+ if (!strcmp (where, "gpg-exit")) -+ return 0; - - return atoi (which); - } --- -2.16.3 - diff --git a/gpgme-1.10.0.tar.bz2 b/gpgme-1.10.0.tar.bz2 deleted file mode 100644 index 6cee86a..0000000 --- a/gpgme-1.10.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693 -size 1370162 diff --git a/gpgme-1.10.0.tar.bz2.sig b/gpgme-1.10.0.tar.bz2.sig deleted file mode 100644 index 0165f9e..0000000 Binary files a/gpgme-1.10.0.tar.bz2.sig and /dev/null differ diff --git a/gpgme-1.11.1.tar.bz2 b/gpgme-1.11.1.tar.bz2 new file mode 100644 index 0000000..2817487 --- /dev/null +++ b/gpgme-1.11.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d1b111774d2e3dd26dcd7c251819ce4ef774ec5e566251eb9308fa7542fbd6f +size 1419232 diff --git a/gpgme-1.11.1.tar.bz2.sig b/gpgme-1.11.1.tar.bz2.sig new file mode 100644 index 0000000..496964c Binary files /dev/null and b/gpgme-1.11.1.tar.bz2.sig differ diff --git a/gpgme.changes b/gpgme.changes index 4f2bb70..7a3cdb9 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Fri Apr 20 18:29:18 UTC 2018 - astieger@suse.com + +- update to 1.11.1: + * Fixed build problems in the 1.11.0 releas + drop gpgme-1.11-fix-gpgme-json-rpath.patch, + drop gpgme-1.11-fix-tests.patch + * Added C++ interfaces which were planned for 1.11.0 + +------------------------------------------------------------------- +Thu Apr 19 11:47:13 UTC 2018 - kbabioch@suse.com + +- Update to 1.11 + * New encryption API to support direct key specification including + hidden recipients option and taking keys from a file. This also + allows to enforce the use of a subkey. + * New encryption flag for the new API to enforce the use of plain + mail addresses (addr-spec). + * The import API can now tell whether v3 keys are skipped. These + old and basically broken keys are not anymore supported by GnuPG + 2.1. + * The decrypt and verify API will now return the MIME flag as + specified by RFC-4880bis. + * The offline mode now has an effect on gpg by disabling all + network access. + * A failed OpenPGP verification how returns the fingerprint of the + intended key if a recent gpg version was used for signature + creation. + * Various minor fixes. +- Dropped patch 0001-core-Tweak-STATUS_FAILURE-handling.patch, since + it is included upstream now. +- add gpgme-1.11-fix-gpgme-json-rpath.patch to remove rpath +- add gpgme-1.11-fix-tests.patch to fix tests + ------------------------------------------------------------------- Mon Apr 16 13:22:48 UTC 2018 - astieger@suse.com diff --git a/gpgme.spec b/gpgme.spec index d8c1a1e..7093447 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -21,10 +21,10 @@ %bcond_without python2 %bcond_without python3 Name: gpgme -Version: 1.10.0 +Version: 1.11.1 Release: 0 Summary: Programmatic library interface to GnuPG -License: LGPL-2.1+ AND GPL-3.0+ +License: LGPL-2.1-or-later AND GPL-3.0-or-later Group: Productivity/Security Url: http://www.gnupg.org/related_software/gpgme/ Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 @@ -33,12 +33,10 @@ Source2: baselibs.conf Source3: gpgme.keyring # used to have a fixed timestamp Source99: %{name}.changes -# PATCH-FIX-UPSTREAM 0001-core-Tweak-STATUS_FAILURE-handling.patch bsc#1089497 -Patch0: 0001-core-Tweak-STATUS_FAILURE-handling.patch BuildRequires: gcc-c++ BuildRequires: gpg2 >= 2.0.10 BuildRequires: libassuan-devel >= 2.4.2 -BuildRequires: libgpg-error-devel >= 1.24 +BuildRequires: libgpg-error-devel >= 1.28 BuildRequires: pkgconfig BuildRequires: swig Requires(post): %{install_info_prereq} @@ -177,7 +175,6 @@ This package contains the bindings to use the library in Qt C++ applications. %prep %setup -q -%patch0 -p1 %build build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99}) @@ -236,8 +233,10 @@ make %{?_smp_mflags} check %install_info_delete --info-dir=%{_infodir} %{_infodir}/gpgme.info%{ext_info} %files -%doc AUTHORS COPYING COPYING.LESSER ChangeLog ChangeLog-2011 README NEWS THANKS TODO VERSION +%license COPYING COPYING.LESSER +%doc AUTHORS ChangeLog ChangeLog-2011 README NEWS THANKS TODO VERSION %{_bindir}/gpgme-tool +%{_bindir}/gpgme-json %{_datadir}/common-lisp %{_datadir}/common-lisp/source %{_infodir}/gpgme*