From fc79df16ba85eebc85a55aa860cb34daa9513b6e44716b70ac6f74661be4391b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Apr 2018 18:35:03 +0000 Subject: [PATCH] Accepting request 599480 from security:privacy gpgme 1.11.1 OBS-URL: https://build.opensuse.org/request/show/599480 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=98 --- gpgme-1.11-fix-gpgme-json-rpath.patch | 28 ---------------- gpgme-1.11-fix-tests.patch | 46 -------------------------- gpgme-1.11.0.tar.bz2 | 3 -- gpgme-1.11.0.tar.bz2.sig | Bin 310 -> 0 bytes gpgme-1.11.1.tar.bz2 | 3 ++ gpgme-1.11.1.tar.bz2.sig | Bin 0 -> 310 bytes gpgme.changes | 9 +++++ gpgme.spec | 13 +------- 8 files changed, 13 insertions(+), 89 deletions(-) delete mode 100644 gpgme-1.11-fix-gpgme-json-rpath.patch delete mode 100644 gpgme-1.11-fix-tests.patch delete mode 100644 gpgme-1.11.0.tar.bz2 delete mode 100644 gpgme-1.11.0.tar.bz2.sig create mode 100644 gpgme-1.11.1.tar.bz2 create mode 100644 gpgme-1.11.1.tar.bz2.sig diff --git a/gpgme-1.11-fix-gpgme-json-rpath.patch b/gpgme-1.11-fix-gpgme-json-rpath.patch deleted file mode 100644 index 35c58ee..0000000 --- a/gpgme-1.11-fix-gpgme-json-rpath.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7a226380b955f8390ee88ca9f4f1a3194af3d5cd Mon Sep 17 00:00:00 2001 -From: Andreas Stieger -Date: Thu, 19 Apr 2018 11:55:31 +0200 -Subject: [PATCH] Fix gpgme-json rpath - ---- - src/Makefile.am | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index c2d4a843..a1b2d7b7 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -103,10 +103,7 @@ gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h - gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ - - gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h --gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS) --# We use -no-install temporary during development. --gpgme_json_LDFLAGS = -no-install -- -+gpgme_json_LDADD = -lm libgpgme.la @GPG_ERROR_LIBS@ - - if HAVE_W32_SYSTEM - # Windows provides us with an endless stream of Tough Love. To spawn --- -2.16.3 - diff --git a/gpgme-1.11-fix-tests.patch b/gpgme-1.11-fix-tests.patch deleted file mode 100644 index 6eeee82..0000000 --- a/gpgme-1.11-fix-tests.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3d8e5c07511938a0b30b4626530822338abd9ec0 Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Thu, 19 Apr 2018 10:29:30 +0200 -Subject: [PATCH] tests: Fix t-verify test for GnuPG < 2.2.7. - -* tests/gpg/t-verify.c (check_result): Tweak for gnupg < 2.2.7. --- - -The not yet releases 2.2.7-beta may print a full fingerprint in the -ERRSIG status. This is compliant with the dscription but the new -t-verify test case did not took in account that older GnuPG versions -print only a keyid. - -Fixes-commit: b99502274ae5efdf6df0d967900ec3d1e64373d7 -GnUPG-bug-id: 3920 -Signed-off-by: Werner Koch ---- - tests/gpg/t-verify.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c -index 7c23406f..fa0164ac 100644 ---- a/tests/gpg/t-verify.c -+++ b/tests/gpg/t-verify.c -@@ -126,9 +126,15 @@ check_result (gpgme_verify_result_t result, int no_of_sigs, int skip_sigs, - } - if (strcmp (sig->fpr, fpr)) - { -- fprintf (stderr, "%s:%i:sig-%d: Unexpected fingerprint: %s\n", -- PGM, __LINE__, skip_sigs, sig->fpr); -- exit (1); -+ if (strlen (sig->fpr) == 16 && strlen (fpr) == 40 -+ && !strncmp (sig->fpr, fpr + 24, 16)) -+ ; /* okay because gnupg < 2.2.6 only shows the keyid. */ -+ else -+ { -+ fprintf (stderr, "%s:%i:sig-%d: Unexpected fingerprint: %s\n", -+ PGM, __LINE__, skip_sigs, sig->fpr); -+ exit (1); -+ } - } - if (gpgme_err_code (sig->status) != status) - { --- -2.16.3 - diff --git a/gpgme-1.11.0.tar.bz2 b/gpgme-1.11.0.tar.bz2 deleted file mode 100644 index 14a85a6..0000000 --- a/gpgme-1.11.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b03adbafadab74474ded30b74c882de28d3c5c3b9ee3016ef24023d4c35d492 -size 1414991 diff --git a/gpgme-1.11.0.tar.bz2.sig b/gpgme-1.11.0.tar.bz2.sig deleted file mode 100644 index cc96195fe7142645a1ac32b5876b625a5def8c553a659a16a036143d797964bc..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-KX(1!T23_i24?49Zn>o@?CF8aQ0$SINp8yI85G0#9 z(oZGhwq(W!|5!j2A*0iirPnKcCnNI%@w2+=<~DB-GPUah{dB-T--I}-Ioo6=(=cCU zK%#KP InAsQur`QLPO8@`> 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 0000000000000000000000000000000000000000000000000000000000000000..496964cd4dee3e96dc99f63abe628e1ceec24ba507d73133eac9f179bb714102 GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j-KX(1!T23_i24?49Zn>o@?CF8aQ0$SOpNdO875G0#9 z(oZGhwj5>$|8zcA;n{jlL8Kc(DH=ozCgd;P@BHCa(|_}^Qyp#m^GuV(e*(TvpU>bn zxK<-_=s+4pO7#3j`pO#|~kO_KWBPJ;0H72}A7aOw@s*o##B)<(Qg{JW#*L z$JdhJOpmZ3B6;O};7KHjEa8jnJqtq_dM6XY6*fC!k^d#ypvRK53fEL~P IaFG}oBQx=k(f|Me literal 0 HcmV?d00001 diff --git a/gpgme.changes b/gpgme.changes index 4f88b61..7a3cdb9 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 diff --git a/gpgme.spec b/gpgme.spec index 468f549..7093447 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -21,7 +21,7 @@ %bcond_without python2 %bcond_without python3 Name: gpgme -Version: 1.11.0 +Version: 1.11.1 Release: 0 Summary: Programmatic library interface to GnuPG License: LGPL-2.1-or-later AND GPL-3.0-or-later @@ -33,17 +33,10 @@ Source2: baselibs.conf Source3: gpgme.keyring # used to have a fixed timestamp Source99: %{name}.changes -Patch0: gpgme-1.11-fix-tests.patch -Patch1: gpgme-1.11-fix-gpgme-json-rpath.patch -# for patch0 gpgme-1.11-fix-gpgme-json-rpath.patch -BuildRequires: autoconf -BuildRequires: automake -# BuildRequires: gcc-c++ BuildRequires: gpg2 >= 2.0.10 BuildRequires: libassuan-devel >= 2.4.2 BuildRequires: libgpg-error-devel >= 1.28 -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: swig Requires(post): %{install_info_prereq} @@ -182,12 +175,8 @@ This package contains the bindings to use the library in Qt C++ applications. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -# for patch0 gpgme-1.11-fix-gpgme-json-rpath.patch -autoreconf -fiv build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99}) languages="cl cpp"