diff --git a/gpgme-1.1.4-warning.patch b/gpgme-1.1.4-warning.patch deleted file mode 100644 index da79ac7..0000000 --- a/gpgme-1.1.4-warning.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- gpgme/keylist.c -+++ gpgme/keylist.c -@@ -382,7 +382,7 @@ - void *hook; - op_data_t opd; - gpgme_error_t err; -- gpgme_key_t key; -+ gpgme_key_t key = NULL; - gpgme_subkey_t subkey = NULL; - gpgme_key_sig_t keysig = NULL; - -rungpg.c: In function 'gpg_new': -rungpg.c:489: warning: the address of 'dft_ttyname' will always evaluate as 'true' - ---- gpgme/rungpg.c -+++ gpgme/rungpg.c -@@ -486,14 +486,9 @@ - rc = gpg_error_from_errno (errno); - else - { -- if (dft_ttyname) -- { - rc = add_arg (gpg, "--ttyname"); - if (!rc) - rc = add_arg (gpg, dft_ttyname); -- } -- else -- rc = 0; - if (!rc) - { - rc = _gpgme_getenv ("TERM", &dft_ttytype); diff --git a/gpgme-1.1.6-from-upstream.patch b/gpgme-1.1.6-from-upstream.patch deleted file mode 100644 index 7292950..0000000 --- a/gpgme-1.1.6-from-upstream.patch +++ /dev/null @@ -1,206 +0,0 @@ ---- gpgme-1.1.6/gpgme/ChangeLog -+++ gpgme-r1301/gpgme/ChangeLog -@@ -1,3 +1,12 @@ -+2008-01-28 Werner Koch -+ -+ * keylist.c (gpgme_get_key): Skip duplicated keys. Fixes bug 876. -+ -+2008-01-14 Marcus Brinkmann -+ -+ * engine-gpgconf.c (gpgconf_config_load_cb): Fix program_name -+ field. -+ - 2008-01-04 Marcus Brinkmann - - * Makefile.am (gpgconf_components): New variable. ---- gpgme-1.1.6/gpgme/engine-gpgconf.c -+++ gpgme-r1301/gpgme/engine-gpgconf.c -@@ -313,8 +310,8 @@ gpgconf_config_load_cb (void *hook, char - - if (fields >= 3) - { -- comp->description = strdup (field[2]); -- if (!comp->description) -+ comp->program_name = strdup (field[2]); -+ if (!comp->program_name) - return gpg_error_from_syserror (); - } - -@@ -457,9 +454,18 @@ gpgconf_config_load_cb2 (void *hook, cha - return gpg_error_from_syserror (); - } - -- err = gpgconf_parse_option (opt, &opt->no_arg_value, field[8]); -- if (err) -- return err; -+ if (opt->flags & GPGME_CONF_NO_ARG_DESC) -+ { -+ opt->no_arg_description = strdup (field[8]); -+ if (!opt->no_arg_description) -+ return gpg_error_from_syserror (); -+ } -+ else -+ { -+ err = gpgconf_parse_option (opt, &opt->no_arg_value, field[8]); -+ if (err) -+ return err; -+ } - - err = gpgconf_parse_option (opt, &opt->value, field[9]); - if (err) ---- gpgme-1.1.6/gpgme/keylist.c -+++ gpgme-r1301/gpgme/keylist.c -@@ -964,11 +964,26 @@ gpgme_get_key (gpgme_ctx_t ctx, const ch - err = gpgme_op_keylist_next (listctx, r_key); - if (!err) - { -+ try_next_key: - err = gpgme_op_keylist_next (listctx, &key); - if (gpgme_err_code (err) == GPG_ERR_EOF) -- err = gpg_error (GPG_ERR_NO_ERROR); -+ err = 0; - else - { -+ if (!err -+ && *r_key && (*r_key)->subkeys && (*r_key)->subkeys->fpr -+ && key && key->subkeys && key->subkeys->fpr -+ && !strcmp ((*r_key)->subkeys->fpr, key->subkeys->fpr)) -+ { -+ /* The fingerprint is identical. We assume that this is -+ the same key and don't mark it as an ambiguous. This -+ problem may occur with corrupted keyrings and has -+ been noticed often with gpgsm. In fact gpgsm uses a -+ similar hack to sort out such duplicates but it can't -+ do that while listing keys. */ -+ gpgme_key_unref (key); -+ goto try_next_key; -+ } - if (!err) - { - gpgme_key_unref (key); ---- gpgme-1.1.6/tests/ChangeLog -+++ gpgme-r1301/tests/ChangeLog -@@ -1,3 +1,20 @@ -+2008-01-28 Marcus Brinkmann -+ -+ * gpg/Makefile.am (DISTCLEANFILES): Add pubring.kbx~. -+ -+2008-01-10 Marcus Brinkmann -+ -+ * gpg/t-gpgconf.c (main): Allow for dirmngr not to be available. -+ -+ * gpg/Makefile.am (./gpg-agent.conf): Correct pinentry path. -+ -+ * gpg/pinentry: New file. -+ * gpg/Makefile.am (DISTCLEANFILES, all-local): Add gpg-agent.conf -+ (./gpg-agent.conf): New target. -+ (EXTRA_DIST): Add pinentry. -+ -+ * gpg/t-gpgconf.c (main): Exit early if compiled without gpgconf. -+ - 2008-01-04 Marcus Brinkmann - - * gpg/Makefile.am (CLEANFILES): Add pubring.kbx and dirmngr.conf. ---- gpgme-1.1.6/tests/gpg/Makefile.am -+++ gpgme-r1301/tests/gpg/Makefile.am -@@ -38,10 +38,10 @@ TESTS = t-encrypt t-encrypt-sym t-encryp - t-encrypt-large t-file-name t-gpgconf $(tests_unix) - - CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf --DISTCLEANFILES = pubring.gpg~ random_seed gpg.conf -+DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf - - EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \ -- geheim.txt pubkey-1.asc seckey-1.asc -+ geheim.txt pubkey-1.asc seckey-1.asc pinentry - - INCLUDES = -I$(top_srcdir)/gpgme - -@@ -55,7 +55,7 @@ noinst_PROGRAMS = $(TESTS) t-genkey - clean-local: - $(srcdir)/mkdemodirs --clean - --all-local: ./pubring.gpg ./gpg.conf -+all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf - - ./pubring.gpg: $(srcdir)/pubdemo.asc ./Alpha/Secret.gpg - $(GPG) --homedir . --import $(srcdir)/pubdemo.asc -@@ -68,3 +68,7 @@ all-local: ./pubring.gpg ./gpg.conf - ./gpg.conf: - # This is required for t-sig-notations. - echo no-force-v3-sigs > ./gpg.conf -+ -+./gpg-agent.conf: -+# This is required for gpg2, which does not support command fd. -+ echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf ---- gpgme-1.1.6/tests/gpg/pinentry -+++ gpgme-r1301/tests/gpg/pinentry -@@ -0,0 +1,22 @@ -+#! /bin/bash -+# Dummy pinentry -+# -+# Copyright 2008 g10 Code GmbH -+# -+# This file is free software; as a special exception the author gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+# -+# This file is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -+# PURPOSE. -+ -+echo OK Your orders please -+ -+while read cmd; do -+ case $cmd in -+ GETPIN) echo D abc; echo OK;; -+ *) echo OK;; -+ esac -+done ---- gpgme-1.1.6/tests/gpg/t-gpgconf.c -+++ gpgme-r1301/tests/gpg/t-gpgconf.c -@@ -254,6 +254,11 @@ main (int argc, char **argv) - gpgme_conf_comp_t conf; - gpgme_conf_comp_t comp; - int first; -+ -+#ifndef ENABLE_GPGCONF -+ return 0; -+#endif -+ - init_gpgme (GPGME_PROTOCOL_GPGCONF); - - err = gpgme_new (&ctx); -@@ -287,15 +292,23 @@ main (int argc, char **argv) - comp = conf; - while (comp && strcmp (comp->name, "dirmngr")) - comp = comp->next; -- opt = comp->options; -- while (opt && strcmp (opt->name, "verbose")) -- opt = opt->next; - -- err = gpgme_conf_opt_change (opt, 0, arg); -- fail_if_err (err); -- -- err = gpgme_op_conf_save (ctx, comp); -- fail_if_err (err); -+ if (comp) -+ { -+ opt = comp->options; -+ while (opt && strcmp (opt->name, "verbose")) -+ opt = opt->next; -+ -+ /* Allow for the verbose option not to be there. */ -+ if (opt) -+ { -+ err = gpgme_conf_opt_change (opt, 0, arg); -+ fail_if_err (err); -+ -+ err = gpgme_op_conf_save (ctx, comp); -+ fail_if_err (err); -+ } -+ } - } - #endif - diff --git a/gpgme-1.1.6.tar.bz2 b/gpgme-1.1.6.tar.bz2 deleted file mode 100644 index fd2ce3e..0000000 --- a/gpgme-1.1.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e91f38b6fe20cffd9872c7af8de224b4193378d51f97f525299d651f0ba185f0 -size 747480 diff --git a/gpgme-1.1.7.tar.bz2 b/gpgme-1.1.7.tar.bz2 new file mode 100644 index 0000000..d3d9bdb --- /dev/null +++ b/gpgme-1.1.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11417edafca4d1cefc3ac1c9259d66d0fcbf3ea4bbff7c26672bd697972d5353 +size 803763 diff --git a/gpgme.changes b/gpgme.changes index 0010f88..a200bd0 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Dec 8 12:42:41 CET 2008 - puzel@suse.cz + +- update to 1.1.7 + - using GPGME_KEYLIST_MODE_LOCAL combined with + GPGME_KEYLIST_MODE_EXTERN is now supported + - the encoding of gpgme_data_t objects can affect the output encoding + of export, sign and encrypt operations now + - the reference manual now includes the specification of "The GnuPG + UI Server protocol" + - a new function gpgme_cancel_async can be used to asynchronously + cancel any pending operation at any time, from any thread + +- remove gpgme-1.1.6-from-upstream.patch (fixed upstream) +- remove gpgme-1.1.4-warning.patch (fixed upstream) +- fix obsolete usage of run_ldconfig + ------------------------------------------------------------------- Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de diff --git a/gpgme.spec b/gpgme.spec index fb7b3c7..d3d22c6 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -1,10 +1,17 @@ # -# spec file for package gpgme (Version 1.1.6) +# spec file for package gpgme (Version 1.1.7) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,12 +24,10 @@ License: GPL v2 or later Group: Productivity/Security PreReq: %install_info_prereq AutoReqProv: on -Version: 1.1.6 -Release: 25 +Version: 1.1.7 +Release: 1 Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 -Patch1: %{name}-1.1.4-warning.patch -Patch2: gpgme-1.1.6-from-upstream.patch -Patch3: gpgme-1.1.6-makecheck.patch +Patch1: %{name}-1.1.6-makecheck.patch Url: http://www.gnupg.org/related_software/gpgme/ Summary: A Library Designed to Give Applications Easy Access to GnuPG Requires: gpg2 @@ -130,8 +135,6 @@ Authors: %prep %setup -q %patch1 -%patch2 -p1 -%patch3 %build sh autogen.sh @@ -139,15 +142,15 @@ sh autogen.sh # in case configure picks GnuPG-1.x, e.g. from /usr/local, this would cause # testsuite failures: %configure --disable-static \ - --with-gpg-version=2.0.8 \ - --with-gpgsm-version=2.0.8 \ - --with-gpgconf-version=2.0.8 \ + --with-gpg-version=2.0.9 \ + --with-gpgsm-version=2.0.9 \ + --with-gpgconf-version=2.0.9 \ --with-gpg=%_bindir/gpg2 \ --with-gpgsm=%_bindir/gpgsm \ --with-gpgconf=%_bindir/gpgconf %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall # Do this now to make /usr/lib/rpm/brp-chuck-la happy: rm %buildroot/%_libdir/*.la @@ -159,10 +162,10 @@ make check rm -rf $RPM_BUILD_ROOT %post -n libgpgme11 -%run_ldconfig +/sbin/ldconfig %postun -n libgpgme11 -%run_ldconfig +/sbin/ldconfig %post %install_info --info-dir=%{_infodir} %{_infodir}/gpgme.info.gz @@ -175,7 +178,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog README NEWS THANKS TODO %{_datadir}/common-lisp %{_datadir}/common-lisp/source -%{_datadir}/common-lisp/source/gpgme +#%#{_datadir}/common-lisp/source/gpgme %_infodir/gpgme* %files -n libgpgme11 @@ -194,6 +197,19 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/gpgme.h %changelog +* Mon Dec 08 2008 puzel@suse.cz +- update to 1.1.7 + - using GPGME_KEYLIST_MODE_LOCAL combined with + GPGME_KEYLIST_MODE_EXTERN is now supported + - the encoding of gpgme_data_t objects can affect the output encoding + of export, sign and encrypt operations now + - the reference manual now includes the specification of "The GnuPG + UI Server protocol" + - a new function gpgme_cancel_async can be used to asynchronously + cancel any pending operation at any time, from any thread +- remove gpgme-1.1.6-from-upstream.patch (fixed upstream) +- remove gpgme-1.1.4-warning.patch (fixed upstream) +- fix obsolete usage of run_ldconfig * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support @@ -203,9 +219,9 @@ rm -rf $RPM_BUILD_ROOT * Thu Dec 27 2007 crrodriguez@suse.de - fix library-without-ldconfig-post* errors - remove "la" files -* Wed Aug 08 2007 ro@suse.de +* Tue Aug 07 2007 ro@suse.de - remove devel requires from library package -* Tue Aug 07 2007 mrueckert@suse.de +* Mon Aug 06 2007 mrueckert@suse.de - add defattr to the lib package * Mon Aug 06 2007 zpetrova@suse.cz - split gpgme to libgpgme11 and gpgme. @@ -237,7 +253,7 @@ rm -rf $RPM_BUILD_ROOT - Added %%install_info_prereq. * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sun Jan 15 2006 kukuk@suse.de +* Sat Jan 14 2006 kukuk@suse.de - Create devel subpackage [#140727] * Sat Dec 03 2005 meissner@suse.de - require libgpg-error-devel (since we include headers that