[Pkg-gnupg-commit] r264 - in /gpgme/trunk: ./ assuan/ doc/ gpgme/ lang/cl/ src/ tests/ tests/gpg/ tests/gpgsm/

dleidert at users.alioth.debian.org dleidert at users.alioth.debian.org
Sun Jul 8 14:44:20 UTC 2012


Author: dleidert
Date: Sun Jul  8 14:44:20 2012
New Revision: 264

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=264
Log:
Imported Upstream version 1.1.8

Added:
    gpgme/trunk/src/
    gpgme/trunk/src/ChangeLog
      - copied, changed from r263, gpgme/trunk/gpgme/ChangeLog
    gpgme/trunk/src/Makefile.am
      - copied, changed from r263, gpgme/trunk/gpgme/Makefile.am
    gpgme/trunk/src/Makefile.in
      - copied, changed from r263, gpgme/trunk/gpgme/Makefile.in
    gpgme/trunk/src/ath-pth.c
      - copied, changed from r263, gpgme/trunk/gpgme/ath-pth.c
    gpgme/trunk/src/ath-pthread.c
      - copied, changed from r263, gpgme/trunk/gpgme/ath-pthread.c
    gpgme/trunk/src/ath.c
      - copied, changed from r263, gpgme/trunk/gpgme/ath.c
    gpgme/trunk/src/ath.h
      - copied, changed from r263, gpgme/trunk/gpgme/ath.h
    gpgme/trunk/src/context.h
      - copied, changed from r263, gpgme/trunk/gpgme/context.h
    gpgme/trunk/src/conversion.c
      - copied, changed from r263, gpgme/trunk/gpgme/conversion.c
    gpgme/trunk/src/data-compat.c
      - copied, changed from r263, gpgme/trunk/gpgme/data-compat.c
    gpgme/trunk/src/data-fd.c
      - copied, changed from r263, gpgme/trunk/gpgme/data-fd.c
    gpgme/trunk/src/data-mem.c
      - copied, changed from r263, gpgme/trunk/gpgme/data-mem.c
    gpgme/trunk/src/data-stream.c
      - copied, changed from r263, gpgme/trunk/gpgme/data-stream.c
    gpgme/trunk/src/data-user.c
      - copied, changed from r263, gpgme/trunk/gpgme/data-user.c
    gpgme/trunk/src/data.c
      - copied, changed from r263, gpgme/trunk/gpgme/data.c
    gpgme/trunk/src/data.h
      - copied, changed from r263, gpgme/trunk/gpgme/data.h
    gpgme/trunk/src/debug.c
      - copied, changed from r263, gpgme/trunk/gpgme/debug.c
    gpgme/trunk/src/debug.h
      - copied, changed from r263, gpgme/trunk/gpgme/debug.h
    gpgme/trunk/src/decrypt-verify.c
      - copied, changed from r263, gpgme/trunk/gpgme/decrypt-verify.c
    gpgme/trunk/src/decrypt.c
      - copied, changed from r263, gpgme/trunk/gpgme/decrypt.c
    gpgme/trunk/src/delete.c
      - copied, changed from r263, gpgme/trunk/gpgme/delete.c
    gpgme/trunk/src/edit.c
      - copied, changed from r263, gpgme/trunk/gpgme/edit.c
    gpgme/trunk/src/encrypt-sign.c
      - copied, changed from r263, gpgme/trunk/gpgme/encrypt-sign.c
    gpgme/trunk/src/encrypt.c
      - copied, changed from r263, gpgme/trunk/gpgme/encrypt.c
    gpgme/trunk/src/engine-backend.h
      - copied, changed from r263, gpgme/trunk/gpgme/engine-backend.h
    gpgme/trunk/src/engine-gpgconf.c
      - copied, changed from r263, gpgme/trunk/gpgme/engine-gpgconf.c
    gpgme/trunk/src/engine-gpgsm.c
      - copied, changed from r263, gpgme/trunk/gpgme/engine-gpgsm.c
    gpgme/trunk/src/engine.c
      - copied, changed from r263, gpgme/trunk/gpgme/engine.c
    gpgme/trunk/src/engine.h
      - copied, changed from r263, gpgme/trunk/gpgme/engine.h
    gpgme/trunk/src/error.c
      - copied, changed from r263, gpgme/trunk/gpgme/error.c
    gpgme/trunk/src/export.c
      - copied, changed from r263, gpgme/trunk/gpgme/export.c
    gpgme/trunk/src/funopen.c
      - copied, changed from r263, gpgme/trunk/gpgme/funopen.c
    gpgme/trunk/src/genkey.c
      - copied, changed from r263, gpgme/trunk/gpgme/genkey.c
    gpgme/trunk/src/get-env.c
      - copied, changed from r263, gpgme/trunk/gpgme/get-env.c
    gpgme/trunk/src/getauditlog.c
      - copied, changed from r263, gpgme/trunk/gpgme/getauditlog.c
    gpgme/trunk/src/gpgconf.c
      - copied, changed from r263, gpgme/trunk/gpgme/gpgconf.c
    gpgme/trunk/src/gpgme-config.in
      - copied, changed from r263, gpgme/trunk/gpgme/gpgme-config.in
    gpgme/trunk/src/gpgme-w32spawn.c
      - copied, changed from r263, gpgme/trunk/gpgme/gpgme-w32spawn.c
    gpgme/trunk/src/gpgme.c
      - copied, changed from r263, gpgme/trunk/gpgme/gpgme.c
    gpgme/trunk/src/gpgme.def
      - copied, changed from r263, gpgme/trunk/gpgme/gpgme.def
    gpgme/trunk/src/gpgme.h
      - copied, changed from r263, gpgme/trunk/gpgme/gpgme.h
    gpgme/trunk/src/gpgme.h.in
      - copied, changed from r263, gpgme/trunk/gpgme/gpgme.h
    gpgme/trunk/src/gpgme.m4
      - copied, changed from r263, gpgme/trunk/gpgme/gpgme.m4
    gpgme/trunk/src/import.c
      - copied, changed from r263, gpgme/trunk/gpgme/import.c
    gpgme/trunk/src/isascii.c
      - copied, changed from r263, gpgme/trunk/gpgme/isascii.c
    gpgme/trunk/src/kdpipeiodevice.cpp
      - copied, changed from r263, gpgme/trunk/gpgme/kdpipeiodevice.cpp
    gpgme/trunk/src/kdpipeiodevice.h
      - copied, changed from r263, gpgme/trunk/gpgme/kdpipeiodevice.h
    gpgme/trunk/src/kdpipeiodevice.moc
      - copied, changed from r263, gpgme/trunk/gpgme/kdpipeiodevice.moc
    gpgme/trunk/src/key.c
      - copied, changed from r263, gpgme/trunk/gpgme/key.c
    gpgme/trunk/src/keylist.c
      - copied, changed from r263, gpgme/trunk/gpgme/keylist.c
    gpgme/trunk/src/libgpgme.vers
      - copied, changed from r263, gpgme/trunk/gpgme/libgpgme.vers
    gpgme/trunk/src/memrchr.c
      - copied, changed from r263, gpgme/trunk/gpgme/memrchr.c
    gpgme/trunk/src/mkstatus
      - copied, changed from r263, gpgme/trunk/gpgme/mkstatus
    gpgme/trunk/src/moc_kdpipeiodevice.cpp
      - copied, changed from r263, gpgme/trunk/gpgme/moc_kdpipeiodevice.cpp
    gpgme/trunk/src/op-support.c
      - copied, changed from r263, gpgme/trunk/gpgme/op-support.c
    gpgme/trunk/src/ops.h
      - copied, changed from r263, gpgme/trunk/gpgme/ops.h
    gpgme/trunk/src/passphrase.c
      - copied, changed from r263, gpgme/trunk/gpgme/passphrase.c
    gpgme/trunk/src/posix-io.c
      - copied, changed from r263, gpgme/trunk/gpgme/posix-io.c
    gpgme/trunk/src/posix-sema.c
      - copied, changed from r263, gpgme/trunk/gpgme/posix-sema.c
    gpgme/trunk/src/posix-util.c
      - copied, changed from r263, gpgme/trunk/gpgme/posix-util.c
    gpgme/trunk/src/priv-io.h
      - copied, changed from r263, gpgme/trunk/gpgme/priv-io.h
    gpgme/trunk/src/progress.c
      - copied, changed from r263, gpgme/trunk/gpgme/progress.c
    gpgme/trunk/src/putc_unlocked.c
      - copied, changed from r263, gpgme/trunk/gpgme/putc_unlocked.c
    gpgme/trunk/src/rungpg.c
      - copied, changed from r263, gpgme/trunk/gpgme/rungpg.c
    gpgme/trunk/src/sema.h
      - copied, changed from r263, gpgme/trunk/gpgme/sema.h
    gpgme/trunk/src/setenv.c
      - copied, changed from r263, gpgme/trunk/gpgme/setenv.c
    gpgme/trunk/src/sig-notation.c
      - copied, changed from r263, gpgme/trunk/gpgme/sig-notation.c
    gpgme/trunk/src/sign.c
      - copied, changed from r263, gpgme/trunk/gpgme/sign.c
    gpgme/trunk/src/signers.c
      - copied, changed from r263, gpgme/trunk/gpgme/signers.c
    gpgme/trunk/src/status-table.h
      - copied, changed from r263, gpgme/trunk/gpgme/status-table.h
    gpgme/trunk/src/stpcpy.c
      - copied, changed from r263, gpgme/trunk/gpgme/stpcpy.c
    gpgme/trunk/src/trust-item.c
      - copied, changed from r263, gpgme/trunk/gpgme/trust-item.c
    gpgme/trunk/src/trustlist.c
      - copied, changed from r263, gpgme/trunk/gpgme/trustlist.c
    gpgme/trunk/src/ttyname_r.c
      - copied, changed from r263, gpgme/trunk/gpgme/ttyname_r.c
    gpgme/trunk/src/util.h
      - copied, changed from r263, gpgme/trunk/gpgme/util.h
    gpgme/trunk/src/vasprintf.c
      - copied, changed from r263, gpgme/trunk/gpgme/vasprintf.c
    gpgme/trunk/src/verify.c
      - copied, changed from r263, gpgme/trunk/gpgme/verify.c
    gpgme/trunk/src/version.c
      - copied, changed from r263, gpgme/trunk/gpgme/version.c
    gpgme/trunk/src/versioninfo.rc.in
      - copied, changed from r263, gpgme/trunk/gpgme/versioninfo.rc.in
    gpgme/trunk/src/w32-glib-io.c
      - copied, changed from r263, gpgme/trunk/gpgme/w32-glib-io.c
    gpgme/trunk/src/w32-io.c
      - copied, changed from r263, gpgme/trunk/gpgme/w32-io.c
    gpgme/trunk/src/w32-qt-io.cpp
      - copied, changed from r263, gpgme/trunk/gpgme/w32-qt-io.cpp
    gpgme/trunk/src/w32-sema.c
      - copied, changed from r263, gpgme/trunk/gpgme/w32-sema.c
    gpgme/trunk/src/w32-util.c
      - copied, changed from r263, gpgme/trunk/gpgme/w32-util.c
    gpgme/trunk/src/wait-global.c
      - copied, changed from r263, gpgme/trunk/gpgme/wait-global.c
    gpgme/trunk/src/wait-private.c
      - copied, changed from r263, gpgme/trunk/gpgme/wait-private.c
    gpgme/trunk/src/wait-user.c
      - copied, changed from r263, gpgme/trunk/gpgme/wait-user.c
    gpgme/trunk/src/wait.c
      - copied, changed from r263, gpgme/trunk/gpgme/wait.c
    gpgme/trunk/src/wait.h
      - copied, changed from r263, gpgme/trunk/gpgme/wait.h
    gpgme/trunk/tests/gpgsm/cms-decrypt.c
    gpgme/trunk/tests/gpgsm/cms-keylist.c
Removed:
    gpgme/trunk/gpgme/ChangeLog
    gpgme/trunk/gpgme/Makefile.am
    gpgme/trunk/gpgme/Makefile.in
    gpgme/trunk/gpgme/ath-pth.c
    gpgme/trunk/gpgme/ath-pthread.c
    gpgme/trunk/gpgme/ath.c
    gpgme/trunk/gpgme/ath.h
    gpgme/trunk/gpgme/context.h
    gpgme/trunk/gpgme/conversion.c
    gpgme/trunk/gpgme/data-compat.c
    gpgme/trunk/gpgme/data-fd.c
    gpgme/trunk/gpgme/data-mem.c
    gpgme/trunk/gpgme/data-stream.c
    gpgme/trunk/gpgme/data-user.c
    gpgme/trunk/gpgme/data.c
    gpgme/trunk/gpgme/data.h
    gpgme/trunk/gpgme/debug.c
    gpgme/trunk/gpgme/debug.h
    gpgme/trunk/gpgme/decrypt-verify.c
    gpgme/trunk/gpgme/decrypt.c
    gpgme/trunk/gpgme/delete.c
    gpgme/trunk/gpgme/edit.c
    gpgme/trunk/gpgme/encrypt-sign.c
    gpgme/trunk/gpgme/encrypt.c
    gpgme/trunk/gpgme/engine-backend.h
    gpgme/trunk/gpgme/engine-gpgconf.c
    gpgme/trunk/gpgme/engine-gpgsm.c
    gpgme/trunk/gpgme/engine.c
    gpgme/trunk/gpgme/engine.h
    gpgme/trunk/gpgme/error.c
    gpgme/trunk/gpgme/export.c
    gpgme/trunk/gpgme/funopen.c
    gpgme/trunk/gpgme/genkey.c
    gpgme/trunk/gpgme/get-env.c
    gpgme/trunk/gpgme/getauditlog.c
    gpgme/trunk/gpgme/gpgconf.c
    gpgme/trunk/gpgme/gpgme-config.in
    gpgme/trunk/gpgme/gpgme-w32spawn.c
    gpgme/trunk/gpgme/gpgme.c
    gpgme/trunk/gpgme/gpgme.def
    gpgme/trunk/gpgme/gpgme.h
    gpgme/trunk/gpgme/gpgme.m4
    gpgme/trunk/gpgme/import.c
    gpgme/trunk/gpgme/isascii.c
    gpgme/trunk/gpgme/kdpipeiodevice.cpp
    gpgme/trunk/gpgme/kdpipeiodevice.h
    gpgme/trunk/gpgme/kdpipeiodevice.moc
    gpgme/trunk/gpgme/key.c
    gpgme/trunk/gpgme/keylist.c
    gpgme/trunk/gpgme/libgpgme.vers
    gpgme/trunk/gpgme/memrchr.c
    gpgme/trunk/gpgme/mkstatus
    gpgme/trunk/gpgme/moc_kdpipeiodevice.cpp
    gpgme/trunk/gpgme/op-support.c
    gpgme/trunk/gpgme/ops.h
    gpgme/trunk/gpgme/passphrase.c
    gpgme/trunk/gpgme/posix-io.c
    gpgme/trunk/gpgme/posix-sema.c
    gpgme/trunk/gpgme/posix-util.c
    gpgme/trunk/gpgme/priv-io.h
    gpgme/trunk/gpgme/progress.c
    gpgme/trunk/gpgme/putc_unlocked.c
    gpgme/trunk/gpgme/rungpg.c
    gpgme/trunk/gpgme/sema.h
    gpgme/trunk/gpgme/setenv.c
    gpgme/trunk/gpgme/sig-notation.c
    gpgme/trunk/gpgme/sign.c
    gpgme/trunk/gpgme/signers.c
    gpgme/trunk/gpgme/status-table.h
    gpgme/trunk/gpgme/stpcpy.c
    gpgme/trunk/gpgme/trust-item.c
    gpgme/trunk/gpgme/trustlist.c
    gpgme/trunk/gpgme/ttyname_r.c
    gpgme/trunk/gpgme/util.h
    gpgme/trunk/gpgme/vasprintf.c
    gpgme/trunk/gpgme/verify.c
    gpgme/trunk/gpgme/version.c
    gpgme/trunk/gpgme/versioninfo.rc.in
    gpgme/trunk/gpgme/w32-glib-io.c
    gpgme/trunk/gpgme/w32-io.c
    gpgme/trunk/gpgme/w32-qt-io.cpp
    gpgme/trunk/gpgme/w32-sema.c
    gpgme/trunk/gpgme/w32-util.c
    gpgme/trunk/gpgme/wait-global.c
    gpgme/trunk/gpgme/wait-private.c
    gpgme/trunk/gpgme/wait-user.c
    gpgme/trunk/gpgme/wait.c
    gpgme/trunk/gpgme/wait.h
Modified:
    gpgme/trunk/ChangeLog
    gpgme/trunk/Makefile.am
    gpgme/trunk/Makefile.in
    gpgme/trunk/NEWS
    gpgme/trunk/VERSION
    gpgme/trunk/assuan/ChangeLog
    gpgme/trunk/assuan/Makefile.am
    gpgme/trunk/assuan/Makefile.in
    gpgme/trunk/assuan/assuan-pipe-connect.c
    gpgme/trunk/configure
    gpgme/trunk/configure.ac
    gpgme/trunk/doc/ChangeLog
    gpgme/trunk/doc/gpgme.info
    gpgme/trunk/doc/gpgme.info-1
    gpgme/trunk/doc/gpgme.info-2
    gpgme/trunk/doc/gpgme.texi
    gpgme/trunk/doc/stamp-vti
    gpgme/trunk/doc/uiserver.texi
    gpgme/trunk/doc/version.texi
    gpgme/trunk/gpgme.spec
    gpgme/trunk/lang/cl/ChangeLog
    gpgme/trunk/lang/cl/gpgme.asd
    gpgme/trunk/lang/cl/gpgme.lisp
    gpgme/trunk/tests/ChangeLog
    gpgme/trunk/tests/Makefile.am
    gpgme/trunk/tests/Makefile.in
    gpgme/trunk/tests/gpg/Makefile.am
    gpgme/trunk/tests/gpg/Makefile.in
    gpgme/trunk/tests/gpgsm/Makefile.am
    gpgme/trunk/tests/gpgsm/Makefile.in

Modified: gpgme/trunk/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/ChangeLog?rev=264&op=diff
==============================================================================
--- gpgme/trunk/ChangeLog (original)
+++ gpgme/trunk/ChangeLog Sun Jul  8 14:44:20 2012
@@ -1,3 +1,20 @@
+2008-12-08  Marcus Brinkmann  <marcus at g10code.de>
+
+	Release GPGME 1.1.8.
+
+	* configure.ac: Bump API revision.
+
+2008-11-03  Marcus Brinkmann  <marcus at g10code.com>
+
+	* configure.ac: Replace gpgme paths with src.
+	* gpgme: Move to ...
+	* src: ... this new directory.
+
+2008-10-20  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (AC_CONFIG_FILES): Add gpgme.h.
+	(GNUPG_FIX_HDR_VERSION): Remove.
+
 2008-10-17  Marcus Brinkmann  <marcus at g10code.com>
 
 	Release GPGME 1.1.7.
@@ -828,7 +845,7 @@
 	* autogen.sh: Added option --build-w32.
 
 
- Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 g10 Code GmbH
+ Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 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

Modified: gpgme/trunk/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/Makefile.am?rev=264&op=diff
==============================================================================
--- gpgme/trunk/Makefile.am (original)
+++ gpgme/trunk/Makefile.am Sun Jul  8 14:44:20 2012
@@ -1,6 +1,6 @@
 # Makefile.am - Top level Makefile for GPGME.
 # Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001, 2002, 2004, 2005 g10 Code GmbH
+# Copyright (C) 2001, 2002, 2004, 2005, 2008 g10 Code GmbH
 # 
 # This file is part of GPGME.
 # 
@@ -43,7 +43,7 @@
 tests = 
 endif
 
-SUBDIRS = ${assuan} gpgme ${tests} doc ${complus} lang
+SUBDIRS = ${assuan} src ${tests} doc ${complus} lang
 
 # Fix the version of the spec file and create a file named VERSION 
 # to be used for patch's Prereq: feature.

Modified: gpgme/trunk/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/Makefile.in?rev=264&op=diff
==============================================================================
--- gpgme/trunk/Makefile.in (original)
+++ gpgme/trunk/Makefile.in Sun Jul  8 14:44:20 2012
@@ -16,7 +16,7 @@
 
 # Makefile.am - Top level Makefile for GPGME.
 # Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001, 2002, 2004, 2005 g10 Code GmbH
+# Copyright (C) 2001, 2002, 2004, 2005, 2008 g10 Code GmbH
 # 
 # This file is part of GPGME.
 # 
@@ -82,7 +82,7 @@
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = assuan gpgme tests doc complus lang
+DIST_SUBDIRS = assuan src tests doc complus lang
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -243,7 +243,7 @@
 @BUILD_COMPLUS_TRUE at complus = complus
 @RUN_GPG_TESTS_FALSE at tests = 
 @RUN_GPG_TESTS_TRUE at tests = tests
-SUBDIRS = ${assuan} gpgme ${tests} doc ${complus} lang
+SUBDIRS = ${assuan} src ${tests} doc ${complus} lang
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 

Modified: gpgme/trunk/NEWS
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/NEWS?rev=264&op=diff
==============================================================================
--- gpgme/trunk/NEWS (original)
+++ gpgme/trunk/NEWS Sun Jul  8 14:44:20 2012
@@ -1,4 +1,11 @@
-Noteworthy changes in version 1.1.7 (2008-10-177)
+Noteworthy changes in version 1.1.8 (2008-12-08)
+------------------------------------------------
+
+ * SIGPIPE is now again ignored as described in the manual.  Fixes
+   regresion introduced with 1.1.6.
+
+
+Noteworthy changes in version 1.1.7 (2008-10-17)
 ------------------------------------------------
 
  * Using GPGME_KEYLIST_MODE_LOCAL combined with

Modified: gpgme/trunk/VERSION
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/VERSION?rev=264&op=diff
==============================================================================
--- gpgme/trunk/VERSION (original)
+++ gpgme/trunk/VERSION Sun Jul  8 14:44:20 2012
@@ -1,1 +1,1 @@
-1.1.7
+1.1.8

Modified: gpgme/trunk/assuan/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/assuan/ChangeLog?rev=264&op=diff
==============================================================================
--- gpgme/trunk/assuan/ChangeLog (original)
+++ gpgme/trunk/assuan/ChangeLog Sun Jul  8 14:44:20 2012
@@ -1,3 +1,12 @@
+2008-11-03  Marcus Brinkmann  <marcus at g10code.com>
+
+	* Makefile.am (INCLUDES): Replace gpgme path with src.
+
+2008-10-30  Marcus Brinkmann  <marcus at g10code.de>
+
+	* assuan-pipe-connect.c: Fix prototype for _gpgme_io_spawn.  Cast
+	second argument in its invocation to silence gcc warning.
+
 2008-06-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* assuan-pipe-connect.c (struct spawn_fd_item_s): Add new members.

Modified: gpgme/trunk/assuan/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/assuan/Makefile.am?rev=264&op=diff
==============================================================================
--- gpgme/trunk/assuan/Makefile.am (original)
+++ gpgme/trunk/assuan/Makefile.am Sun Jul  8 14:44:20 2012
@@ -20,7 +20,7 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = mkerrors
-INCLUDES = -I.. -I$(top_srcdir)/gpgme
+INCLUDES = -I.. -I$(top_srcdir)/src
 BUILT_SOURCES = assuan-errors.c
 MOSTLYCLEANFILES = assuan-errors.c
 

Modified: gpgme/trunk/assuan/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/assuan/Makefile.in?rev=264&op=diff
==============================================================================
--- gpgme/trunk/assuan/Makefile.in (original)
+++ gpgme/trunk/assuan/Makefile.in Sun Jul  8 14:44:20 2012
@@ -230,7 +230,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = mkerrors
-INCLUDES = -I.. -I$(top_srcdir)/gpgme
+INCLUDES = -I.. -I$(top_srcdir)/src
 BUILT_SOURCES = assuan-errors.c
 MOSTLYCLEANFILES = assuan-errors.c
 noinst_LTLIBRARIES = libassuan.la

Modified: gpgme/trunk/assuan/assuan-pipe-connect.c
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/assuan/assuan-pipe-connect.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/assuan/assuan-pipe-connect.c (original)
+++ gpgme/trunk/assuan/assuan-pipe-connect.c Sun Jul  8 14:44:20 2012
@@ -52,7 +52,7 @@
 
 
 int _gpgme_io_pipe (int filedes[2], int inherit_idx);
-int _gpgme_io_spawn (const char *path, char **argv,
+int _gpgme_io_spawn (const char *path, char *const argv[],
 		     struct spawn_fd_item_s *fd_list, pid_t *r_pid);
 #endif
 
@@ -665,7 +665,7 @@
   child_fds[nr].dup_to = -1;
 
   /* Start the process.  */
-  res = _gpgme_io_spawn (name, argv, child_fds, NULL);
+  res = _gpgme_io_spawn (name, (char *const *) argv, child_fds, NULL);
   if (res == -1)
     {
       _assuan_log_printf ("CreateProcess failed: %s\n", strerror (errno));

Modified: gpgme/trunk/configure
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/configure?rev=264&op=diff
==============================================================================
--- gpgme/trunk/configure (original)
+++ gpgme/trunk/configure Sun Jul  8 14:44:20 2012
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for gpgme 1.1.7.
+# Generated by GNU Autoconf 2.61 for gpgme 1.1.8.
 #
 # Report bugs to <bug-gpgme at gnupg.org>.
 #
@@ -730,11 +730,11 @@
 # Identity of this package.
 PACKAGE_NAME='gpgme'
 PACKAGE_TARNAME='gpgme'
-PACKAGE_VERSION='1.1.7'
-PACKAGE_STRING='gpgme 1.1.7'
+PACKAGE_VERSION='1.1.8'
+PACKAGE_STRING='gpgme 1.1.8'
 PACKAGE_BUGREPORT='bug-gpgme at gnupg.org'
 
-ac_unique_file="gpgme/gpgme.h"
+ac_unique_file="src/gpgme.h.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1461,7 +1461,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gpgme 1.1.7 to adapt to many kinds of systems.
+\`configure' configures gpgme 1.1.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1531,7 +1531,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gpgme 1.1.7:";;
+     short | recursive ) echo "Configuration of gpgme 1.1.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1655,7 +1655,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gpgme configure 1.1.7
+gpgme configure 1.1.8
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1669,7 +1669,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gpgme $as_me 1.1.7, which was
+It was created by gpgme $as_me 1.1.8, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2034,14 +2034,14 @@
 # Subtract 2 from this value if you want to make the LFS transition an
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
 LIBGPGME_LT_AGE=6
-LIBGPGME_LT_REVISION=5
+LIBGPGME_LT_REVISION=6
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
 ##############################################
 
 
-BUILD_REVISION=1336
+BUILD_REVISION=1351
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
@@ -25448,33 +25448,6 @@
 fi
 
 
-# Make the version number in gpgme/gpgme.h the same as the one here.
-# (this is easier than to have a *.in file just for one substitution)
- sed "s/^#define GPGME_VERSION \".*/#define GPGME_VERSION \"$VERSION\"/" $srcdir/gpgme/gpgme.h > fixhdr.tmp
-    if cmp -s $srcdir/gpgme/gpgme.h fixhdr.tmp 2>/dev/null; then
-        rm -f fixhdr.tmp
-    else
-        rm -f $srcdir/gpgme/gpgme.h
-        if mv fixhdr.tmp $srcdir/gpgme/gpgme.h ; then
-            :
-        else
-            { { echo "$as_me:$LINENO: error:
-***
-*** Failed to fix the version string macro GPGME_VERSION in gpgme/gpgme.h.
-*** The old file has been saved as fixhdr.tmp
-***" >&5
-echo "$as_me: error:
-***
-*** Failed to fix the version string macro GPGME_VERSION in gpgme/gpgme.h.
-*** The old file has been saved as fixhdr.tmp
-***" >&2;}
-   { (exit 1); exit 1; }; }
-        fi
-        { echo "$as_me:$LINENO: WARNING: fixed the GPGME_VERSION macro in gpgme/gpgme.h" >&5
-echo "$as_me: WARNING: fixed the GPGME_VERSION macro in gpgme/gpgme.h" >&2;}
-    fi
-
-
 # Generate values for the DLL version info
 if test "$have_w32_system" = yes; then
     BUILD_TIMESTAMP=`date --iso-8601=minutes`
@@ -25508,9 +25481,9 @@
 #
 # Create config files
 
-ac_config_files="$ac_config_files Makefile assuan/Makefile gpgme/Makefile tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile doc/Makefile complus/Makefile gpgme/versioninfo.rc"
-
-ac_config_files="$ac_config_files gpgme/gpgme-config"
+ac_config_files="$ac_config_files Makefile assuan/Makefile src/Makefile tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile doc/Makefile complus/Makefile src/versioninfo.rc src/gpgme.h"
+
+ac_config_files="$ac_config_files src/gpgme-config"
 
 ac_config_files="$ac_config_files lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd"
 
@@ -26050,7 +26023,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gpgme $as_me 1.1.7, which was
+This file was extended by gpgme $as_me 1.1.8, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26103,7 +26076,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gpgme config.status 1.1.7
+gpgme config.status 1.1.8
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -26221,14 +26194,15 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "assuan/Makefile") CONFIG_FILES="$CONFIG_FILES assuan/Makefile" ;;
-    "gpgme/Makefile") CONFIG_FILES="$CONFIG_FILES gpgme/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tests/gpg/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gpg/Makefile" ;;
     "tests/gpgsm/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gpgsm/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "complus/Makefile") CONFIG_FILES="$CONFIG_FILES complus/Makefile" ;;
-    "gpgme/versioninfo.rc") CONFIG_FILES="$CONFIG_FILES gpgme/versioninfo.rc" ;;
-    "gpgme/gpgme-config") CONFIG_FILES="$CONFIG_FILES gpgme/gpgme-config" ;;
+    "src/versioninfo.rc") CONFIG_FILES="$CONFIG_FILES src/versioninfo.rc" ;;
+    "src/gpgme.h") CONFIG_FILES="$CONFIG_FILES src/gpgme.h" ;;
+    "src/gpgme-config") CONFIG_FILES="$CONFIG_FILES src/gpgme-config" ;;
     "lang/Makefile") CONFIG_FILES="$CONFIG_FILES lang/Makefile" ;;
     "lang/cl/Makefile") CONFIG_FILES="$CONFIG_FILES lang/cl/Makefile" ;;
     "lang/cl/gpgme.asd") CONFIG_FILES="$CONFIG_FILES lang/cl/gpgme.asd" ;;
@@ -27076,7 +27050,7 @@
   done
 done
  ;;
-    "gpgme/gpgme-config":F) chmod +x gpgme/gpgme-config ;;
+    "src/gpgme-config":F) chmod +x src/gpgme-config ;;
 
   esac
 done # for ac_tag

Modified: gpgme/trunk/configure.ac
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/configure.ac?rev=264&op=diff
==============================================================================
--- gpgme/trunk/configure.ac (original)
+++ gpgme/trunk/configure.ac Sun Jul  8 14:44:20 2012
@@ -31,7 +31,7 @@
 # specific feature can already be done under the assumption that the
 # SVN version is the most recent one in a branch.  To disable the SVN
 # version for the real release, set the my_issvn macro to no.
-m4_define(my_version, [1.1.7])
+m4_define(my_version, [1.1.8])
 m4_define(my_issvn, [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
@@ -51,7 +51,7 @@
 # Subtract 2 from this value if you want to make the LFS transition an
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
 LIBGPGME_LT_AGE=6
-LIBGPGME_LT_REVISION=5
+LIBGPGME_LT_REVISION=6
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
@@ -62,7 +62,7 @@
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
-AC_CONFIG_SRCDIR(gpgme/gpgme.h)
+AC_CONFIG_SRCDIR(src/gpgme.h.in)
 dnl FIXME: Enable this with autoconf 2.59.
 dnl AC_CONFIG_MACRO_DIR(m4)
 AM_CONFIG_HEADER(config.h)
@@ -695,10 +695,6 @@
 
 AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+")
 
-# Make the version number in gpgme/gpgme.h the same as the one here.
-# (this is easier than to have a *.in file just for one substitution)
-GNUPG_FIX_HDR_VERSION(gpgme/gpgme.h, GPGME_VERSION)
-
 # Generate values for the DLL version info
 if test "$have_w32_system" = yes; then
     BUILD_TIMESTAMP=`date --iso-8601=minutes`
@@ -747,11 +743,12 @@
 #
 # Create config files 
 
-AC_CONFIG_FILES(Makefile assuan/Makefile gpgme/Makefile
+AC_CONFIG_FILES(Makefile assuan/Makefile src/Makefile
 		tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile
 		doc/Makefile complus/Makefile
-                gpgme/versioninfo.rc)
-AC_CONFIG_FILES(gpgme/gpgme-config, chmod +x gpgme/gpgme-config)
+                src/versioninfo.rc
+                src/gpgme.h)
+AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
 AC_OUTPUT
 

Modified: gpgme/trunk/doc/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/doc/ChangeLog?rev=264&op=diff
==============================================================================
--- gpgme/trunk/doc/ChangeLog (original)
+++ gpgme/trunk/doc/ChangeLog Sun Jul  8 14:44:20 2012
@@ -1,3 +1,13 @@
+2008-11-28  Werner Koch  <wk at g10code.com>
+
+	* gpgme.texi (Listing Keys): Change description of the return
+	value to match the code.  Spotted by Colin Leroy.
+
+2008-10-15  Werner Koch  <wk at g10code.com>
+
+	* uiserver.texi (Miscellaneous UI Server Commands): Add option
+	--protocol to the SENDER command.
+
 2008-07-17  Werner Koch  <wk at g10code.com>
 
 	* module-overview.sk: New.

Modified: gpgme/trunk/doc/gpgme.info
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/doc/gpgme.info?rev=264&op=diff
==============================================================================
--- gpgme/trunk/doc/gpgme.info (original)
+++ gpgme/trunk/doc/gpgme.info Sun Jul  8 14:44:20 2012
@@ -20,8 +20,8 @@
 
    This file documents the GPGME library.
 
-   This is Edition 1.1.7, last updated 24 July 2008, of `The `GnuPG
-Made Easy' Reference Manual', for Version 1.1.7.
+   This is Edition 1.1.8, last updated 8 December 2008, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.1.8.
 
    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 g10 Code GmbH.
 
@@ -38,113 +38,113 @@
 
 
 Indirect:
-gpgme.info-1: 1679
-gpgme.info-2: 265528
+gpgme.info-1: 1682
+gpgme.info-2: 265667
 
 Tag Table:
 (Indirect)
-Node: Top1679
-Node: Introduction8386
-Node: Getting Started9173
-Node: Features10298
-Node: Overview11448
-Node: Preparation12557
-Node: Header13554
-Node: Building the Source14253
-Node: Largefile Support (LFS)16362
-Node: Using Automake20366
-Node: Using Libtool22002
-Node: Library Version Check22352
-Node: Signal Handling24942
-Node: Multi Threading26158
-Ref: Multi Threading-Footnote-128340
-Node: Protocols and Engines28754
-Node: Engine Version Check30753
-Node: Engine Information31330
-Node: Engine Configuration35010
-Node: OpenPGP36272
-Node: Cryptographic Message Syntax36608
-Node: Algorithms36902
-Ref: Algorithms-Footnote-137381
-Node: Public Key Algorithms37509
-Node: Hash Algorithms39022
-Node: Error Handling40120
-Node: Error Values41982
-Node: Error Sources47060
-Node: Error Codes49387
-Node: Error Strings54026
-Node: Exchanging Data55805
-Node: Creating Data Buffers57119
-Node: Memory Based Data Buffers57635
-Node: File Based Data Buffers60989
-Node: Callback Based Data Buffers63160
-Node: Destroying Data Buffers68716
-Node: Manipulating Data Buffers70075
-Node: Data Buffer I/O Operations70494
-Node: Data Buffer Meta-Data73197
-Node: Contexts76053
-Node: Creating Contexts77100
-Node: Destroying Contexts77622
-Node: Context Attributes77958
-Node: Protocol Selection78738
-Node: Crypto Engine79750
-Node: ASCII Armor81571
-Node: Text Mode82183
-Node: Included Certificates83114
-Node: Key Listing Mode84489
-Node: Passphrase Callback87678
-Node: Progress Meter Callback90728
-Node: Locale92652
-Node: Key Management94191
-Node: Listing Keys104053
-Node: Information About Keys111321
-Node: Key Signatures119319
-Node: Manipulating Keys123331
-Node: Generating Keys124173
-Node: Exporting Keys128667
-Node: Importing Keys131883
-Node: Deleting Keys137038
-Node: Advanced Key Editing138435
-Node: Trust Item Management141530
-Node: Listing Trust Items142600
-Node: Information About Trust Items144897
-Node: Manipulating Trust Items146779
-Node: Crypto Operations147740
-Node: Decrypt148984
-Node: Verify152841
-Node: Decrypt and Verify170697
-Node: Sign172701
-Node: Selecting Signers173265
-Node: Creating a Signature174246
-Node: Signature Notation Data178835
-Node: Encrypt181019
-Node: Encrypting a Plaintext181375
-Node: Run Control186935
-Node: Waiting For Completion187682
-Node: Using External Event Loops189728
-Node: I/O Callback Interface191695
-Node: Registering I/O Callbacks196789
-Node: I/O Callback Example198780
-Node: I/O Callback Example GTK+204846
-Node: I/O Callback Example GDK206635
-Node: I/O Callback Example Qt208277
-Node: Cancellation210565
-Node: UI Server Protocol212818
-Ref: UI Server Protocol-Footnote-1214255
-Node: UI Server Encrypt214374
-Node: UI Server Sign219169
-Node: UI Server Decrypt221398
-Node: UI Server Verify222836
-Node: UI Server Set Input Files226338
-Node: UI Server Sign/Encrypt Files227138
-Node: UI Server Verify/Decrypt Files228907
-Node: UI Server Import/Export Keys230753
-Node: UI Server Checksum Files231786
-Node: Miscellaneous UI Server Commands233952
-Ref: command SENDER235864
-Node: Library Copying237402
-Node: Copying265528
-Node: Function and Data Index303159
-Node: Concept Index327428
+Node: Top1682
+Node: Introduction8392
+Node: Getting Started9179
+Node: Features10304
+Node: Overview11454
+Node: Preparation12563
+Node: Header13560
+Node: Building the Source14259
+Node: Largefile Support (LFS)16368
+Node: Using Automake20372
+Node: Using Libtool22008
+Node: Library Version Check22358
+Node: Signal Handling24948
+Node: Multi Threading26164
+Ref: Multi Threading-Footnote-128346
+Node: Protocols and Engines28760
+Node: Engine Version Check30759
+Node: Engine Information31336
+Node: Engine Configuration35016
+Node: OpenPGP36278
+Node: Cryptographic Message Syntax36614
+Node: Algorithms36908
+Ref: Algorithms-Footnote-137387
+Node: Public Key Algorithms37515
+Node: Hash Algorithms39028
+Node: Error Handling40126
+Node: Error Values41988
+Node: Error Sources47066
+Node: Error Codes49393
+Node: Error Strings54032
+Node: Exchanging Data55811
+Node: Creating Data Buffers57125
+Node: Memory Based Data Buffers57641
+Node: File Based Data Buffers60995
+Node: Callback Based Data Buffers63166
+Node: Destroying Data Buffers68722
+Node: Manipulating Data Buffers70081
+Node: Data Buffer I/O Operations70500
+Node: Data Buffer Meta-Data73203
+Node: Contexts76059
+Node: Creating Contexts77106
+Node: Destroying Contexts77628
+Node: Context Attributes77964
+Node: Protocol Selection78744
+Node: Crypto Engine79756
+Node: ASCII Armor81577
+Node: Text Mode82189
+Node: Included Certificates83120
+Node: Key Listing Mode84495
+Node: Passphrase Callback87684
+Node: Progress Meter Callback90734
+Node: Locale92658
+Node: Key Management94197
+Node: Listing Keys104059
+Node: Information About Keys111322
+Node: Key Signatures119320
+Node: Manipulating Keys123332
+Node: Generating Keys124174
+Node: Exporting Keys128668
+Node: Importing Keys131884
+Node: Deleting Keys137039
+Node: Advanced Key Editing138436
+Node: Trust Item Management141531
+Node: Listing Trust Items142601
+Node: Information About Trust Items144898
+Node: Manipulating Trust Items146780
+Node: Crypto Operations147741
+Node: Decrypt148985
+Node: Verify152842
+Node: Decrypt and Verify170698
+Node: Sign172702
+Node: Selecting Signers173266
+Node: Creating a Signature174247
+Node: Signature Notation Data178836
+Node: Encrypt181020
+Node: Encrypting a Plaintext181376
+Node: Run Control186936
+Node: Waiting For Completion187683
+Node: Using External Event Loops189729
+Node: I/O Callback Interface191696
+Node: Registering I/O Callbacks196790
+Node: I/O Callback Example198781
+Node: I/O Callback Example GTK+204847
+Node: I/O Callback Example GDK206636
+Node: I/O Callback Example Qt208278
+Node: Cancellation210566
+Node: UI Server Protocol212819
+Ref: UI Server Protocol-Footnote-1214256
+Node: UI Server Encrypt214375
+Node: UI Server Sign219170
+Node: UI Server Decrypt221399
+Node: UI Server Verify222837
+Node: UI Server Set Input Files226339
+Node: UI Server Sign/Encrypt Files227139
+Node: UI Server Verify/Decrypt Files228908
+Node: UI Server Import/Export Keys230754
+Node: UI Server Checksum Files231787
+Node: Miscellaneous UI Server Commands233953
+Ref: command SENDER235865
+Node: Library Copying237541
+Node: Copying265667
+Node: Function and Data Index303298
+Node: Concept Index327567
 
 End Tag Table

Modified: gpgme/trunk/doc/gpgme.info-1
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/doc/gpgme.info-1?rev=264&op=diff
==============================================================================
--- gpgme/trunk/doc/gpgme.info-1 (original)
+++ gpgme/trunk/doc/gpgme.info-1 Sun Jul  8 14:44:20 2012
@@ -20,8 +20,8 @@
 
    This file documents the GPGME library.
 
-   This is Edition 1.1.7, last updated 24 July 2008, of `The `GnuPG
-Made Easy' Reference Manual', for Version 1.1.7.
+   This is Edition 1.1.8, last updated 8 December 2008, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.1.8.
 
    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 g10 Code GmbH.
 
@@ -42,8 +42,8 @@
 Main Menu
 *********
 
-This is Edition 1.1.7, last updated 24 July 2008, of `The `GnuPG Made
-Easy' Reference Manual', for Version 1.1.7 of the GPGME library.
+This is Edition 1.1.8, last updated 8 December 2008, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.1.8 of the GPGME library.
 
 * Menu:
 
@@ -2693,7 +2693,7 @@
      for the user.
 
      If the key is not found in the keyring, `gpgme_get_key' returns
-     the error code `GPG_ERR_NO_ERROR' and *R_KEY will be set to `NULL'.
+     the error code `GPG_ERR_EOF' and *R_KEY will be set to `NULL'.
 
      The function returns the error code `GPG_ERR_INV_VALUE' if CTX or
      R_KEY is not a valid pointer or FPR is not a fingerprint or key
@@ -5821,7 +5821,7 @@
 When doing an operation on a mail, it is useful to let the server know
 the address of the sender:
 
- -- Command: SENDER [--info] EMAIL
+ -- Command: SENDER [--info] [--protocol=NAME] EMAIL
      EMAIL is the plain ASCII encoded address ("addr-spec" as per
      RFC-2822) enclosed in angle brackets.  The address set with this
      command is valid until a successful completion of the operation or
@@ -5833,6 +5833,9 @@
      protocol to use for signing.  The client may use this suggested
      protocol on its own discretion.  The same status line as with
      PREP_ENCRYPT is used for this.
+
+     The option `--protocol' may be used to give the server a hint on
+     which signing protocol should be preferred.
 
 To allow the UI-server to visually identify a running operation or to
 associate operations the server MAY support the command:

Modified: gpgme/trunk/doc/gpgme.info-2
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/doc/gpgme.info-2?rev=264&op=diff
==============================================================================
--- gpgme/trunk/doc/gpgme.info-2 (original)
+++ gpgme/trunk/doc/gpgme.info-2 Sun Jul  8 14:44:20 2012
@@ -20,8 +20,8 @@
 
    This file documents the GPGME library.
 
-   This is Edition 1.1.7, last updated 24 July 2008, of `The `GnuPG
-Made Easy' Reference Manual', for Version 1.1.7.
+   This is Edition 1.1.8, last updated 8 December 2008, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.1.8.
 
    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 g10 Code GmbH.
 
@@ -1066,7 +1066,7 @@
 * SENDER:                                Miscellaneous UI Server Commands.
                                                               (line  51)
 * SESSION:                               Miscellaneous UI Server Commands.
-                                                              (line  67)
+                                                              (line  70)
 * SIGN:                                  UI Server Sign.      (line  33)
 * SIGN_FILES:                            UI Server Sign/Encrypt Files.
                                                               (line  11)

Modified: gpgme/trunk/doc/gpgme.texi
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/doc/gpgme.texi?rev=264&op=diff
==============================================================================
--- gpgme/trunk/doc/gpgme.texi (original)
+++ gpgme/trunk/doc/gpgme.texi Sun Jul  8 14:44:20 2012
@@ -2837,7 +2837,7 @@
 will have one reference for the user.
 
 If the key is not found in the keyring, @code{gpgme_get_key} returns
-the error code @code{GPG_ERR_NO_ERROR} and *@var{r_key} will be set to
+the error code @code{GPG_ERR_EOF} and *@var{r_key} will be set to
 @code{NULL}.
 
 The function returns the error code @code{GPG_ERR_INV_VALUE} if

Modified: gpgme/trunk/doc/stamp-vti
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/doc/stamp-vti?rev=264&op=diff
==============================================================================
--- gpgme/trunk/doc/stamp-vti (original)
+++ gpgme/trunk/doc/stamp-vti Sun Jul  8 14:44:20 2012
@@ -1,4 +1,4 @@
- at set UPDATED 24 July 2008
- at set UPDATED-MONTH July 2008
- at set EDITION 1.1.7
- at set VERSION 1.1.7
+ at set UPDATED 8 December 2008
+ at set UPDATED-MONTH December 2008
+ at set EDITION 1.1.8
+ at set VERSION 1.1.8

Modified: gpgme/trunk/doc/uiserver.texi
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/doc/uiserver.texi?rev=264&op=diff
==============================================================================
--- gpgme/trunk/doc/uiserver.texi (original)
+++ gpgme/trunk/doc/uiserver.texi Sun Jul  8 14:44:20 2012
@@ -568,7 +568,7 @@
 When doing an operation on a mail, it is useful to let the server know
 the address of the sender:
 
- at deffn Command SENDER [- at w{}-info] @var{email}
+ at deffn Command SENDER [- at w{}-info] [- at w{}-protocol=@var{name}] @var{email}
 @var{email} is the plain ASCII encoded address ("addr-spec" as per
 RFC-2822) enclosed in angle brackets.  The address set with this command
 is valid until a successful completion of the operation or until a
@@ -580,6 +580,9 @@
 protocol to use for signing.  The client may use this suggested protocol
 on its own discretion.  The same status line as with PREP_ENCRYPT is
 used for this.
+
+The option @option{--protocol} may be used to give the server a hint on
+which signing protocol should be preferred.
 @end deffn
 
 @noindent 

Modified: gpgme/trunk/doc/version.texi
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/doc/version.texi?rev=264&op=diff
==============================================================================
--- gpgme/trunk/doc/version.texi (original)
+++ gpgme/trunk/doc/version.texi Sun Jul  8 14:44:20 2012
@@ -1,4 +1,4 @@
- at set UPDATED 24 July 2008
- at set UPDATED-MONTH July 2008
- at set EDITION 1.1.7
- at set VERSION 1.1.7
+ at set UPDATED 8 December 2008
+ at set UPDATED-MONTH December 2008
+ at set EDITION 1.1.8
+ at set VERSION 1.1.8

Modified: gpgme/trunk/gpgme.spec
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/gpgme.spec?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme.spec (original)
+++ gpgme/trunk/gpgme.spec Sun Jul  8 14:44:20 2012
@@ -1,7 +1,7 @@
 # This is a template.  The dist target uses it to create the real file.
 Summary: GPGME - GnuPG Made Easy
 Name: gpgme
-Version: 1.1.7
+Version: 1.1.8
 Release: 1
 URL: http://www.gnupg.org/gpgme.html
 Source: ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/%{name}-%{version}.tar.gz

Modified: gpgme/trunk/lang/cl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/lang/cl/ChangeLog?rev=264&op=diff
==============================================================================
--- gpgme/trunk/lang/cl/ChangeLog (original)
+++ gpgme/trunk/lang/cl/ChangeLog Sun Jul  8 14:44:20 2012
@@ -1,3 +1,33 @@
+2008-11-08  Moritz  <moritz at gnu.org>
+
+	* gpgme.lisp (size-t): Wrong call to defctype: function accepts
+	optional, not keyword argument.
+	(ssize-t): Likewise.
+	(off-t): Likewise.
+	(gpgme-data-t, gpgme-ctx-t): Likewise.
+	(gpgme-error-t): Likewise.
+	(gpgme-error-no-signal-t): Likewise.
+	(gpgme-err-code-t): Likewise.
+	(gpgme-err-source-t): Likewise.
+	(gpgme-sig-notation-t, gpgme-engine-info-t): Likewise.
+	(gpgme-subkey-t): Likewise.
+	(gpgme-key-sig-t): Likewise.
+	(gpgme-user-id-t): Likewise.
+	(gpgme-key-t): Likewise.
+	(gpgme-data-cbs-t): Likewise.
+	(gpgme-invalid-key-t): Likewise.
+	(gpgme-op-encrypt-result-t): Likewise.
+	(gpgme-recipient-t): Likewise.
+	(gpgme-op-decrypt-result-t): Likewise.
+	(gpgme-new-signature-t): Likewise.
+	(gpgme-op-sign-result-t): Likewise.
+	(gpgme-signature-t): Likewise.
+	(gpgme-op-verify-result-t): Likewise.
+	(gpgme-import-status-t): Likewise.
+	(gpgme-op-import-result-t): Likewise.
+	(gpgme-op-genkey-result-t): Likewise.
+	(gpgme-op-keylist-result-t): Likewise.
+
 2006-07-06  Marcus Brinkmann  <marcus at g10code.de>
 
 	* Initial release.

Modified: gpgme/trunk/lang/cl/gpgme.asd
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/lang/cl/gpgme.asd?rev=264&op=diff
==============================================================================
--- gpgme/trunk/lang/cl/gpgme.asd (original)
+++ gpgme/trunk/lang/cl/gpgme.asd Sun Jul  8 14:44:20 2012
@@ -27,7 +27,7 @@
 (defsystem gpgme
     :description "GnuPG Made Easy."
     :author "g10 Code GmbH"
-    :version "1.1.7"
+    :version "1.1.8"
     :licence "GPL"
     :depends-on ("cffi" "gpg-error")
     :components ((:file "gpgme-package")

Modified: gpgme/trunk/lang/cl/gpgme.lisp
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/lang/cl/gpgme.lisp?rev=264&op=diff
==============================================================================
--- gpgme/trunk/lang/cl/gpgme.lisp (original)
+++ gpgme/trunk/lang/cl/gpgme.lisp Sun Jul  8 14:44:20 2012
@@ -40,18 +40,15 @@
 
 ; FIXME: Use cffi-grovel?  cffi-unix?
 
-(defctype size-t :unsigned-int
-  :documentation "The system size_t type.")
-
-(defctype ssize-t :int
-  :documentation "The system ssize_t type.")
+(defctype size-t :unsigned-int "The system size_t type.")
+
+(defctype ssize-t :int "The system ssize_t type.")
 
 ; FIXME: Ouch.  Grovel?  Helper function?
 (defconstant +seek-set+ 0)
 (defconstant +seek-cur+ 1)
 (defconstant +seek-end+ 2)
-(defctype off-t :long-long
-  :documentation "The system off_t type.")
+(defctype off-t :long-long "The system off_t type.")
 
 (defcfun ("strerror" c-strerror) :string
   (err :int))
@@ -110,26 +107,22 @@
 
 ;;; Some opaque data types used by GPGME.
 
-(defctype gpgme-ctx-t :pointer
-  :documentation "The GPGME context type.")
-
-(defctype gpgme-data-t :pointer
-  :documentation "The GPGME data object type.")
+(defctype gpgme-ctx-t :pointer "The GPGME context type.")
+
+(defctype gpgme-data-t :pointer "The GPGME data object type.")
 
 ;;; Wrappers for the libgpg-error library.
 
-(defctype gpgme-error-t gpg-error::gpg-error-t
-  :documentation "The GPGME error type.")
+(defctype gpgme-error-t gpg-error::gpg-error-t "The GPGME error type.")
 
 (defctype gpgme-error-no-signal-t gpg-error::gpg-error-t
-  :documentation "The GPGME error type (this version does not
-  signal conditions in translation.")
+  "The GPGME error type (this version does not signal conditions in translation.")
 
 (defctype gpgme-err-code-t gpg-error::gpg-err-code-t
-  :documentation "The GPGME error code type.")
+  "The GPGME error code type.")
 
 (defctype gpgme-err-source-t gpg-error::gpg-err-source-t
-  :documentation "The GPGME error source type.")
+  "The GPGME error source type.")
 
 (defun gpgme-err-make (source code)
   "Construct an error value from an error code and source."
@@ -251,7 +244,7 @@
   (:critical 2))
 
 (defctype gpgme-sig-notation-t :pointer
-  :documentation "Signature notation pointer type.")
+  "Signature notation pointer type.")
 
 ;; FIXME: Doesn't this depend on endianess?
 (defbitfield (gpgme-sig-notation-bitfield :unsigned-int)
@@ -279,7 +272,7 @@
 ;;;
 
 (defctype gpgme-engine-info-t :pointer
-  :documentation "The engine information structure pointer type.")
+  "The engine information structure pointer type.")
 
 (defcstruct gpgme-engine-info
   "Engine information."
@@ -292,8 +285,7 @@
 
 ;;;
 
-(defctype gpgme-subkey-t :pointer
-  :documentation "A subkey from a key.")
+(defctype gpgme-subkey-t :pointer "A subkey from a key.")
 
 ;; FIXME: Doesn't this depend on endianess?
 (defbitfield (gpgme-subkey-bitfield :unsigned-int)
@@ -323,7 +315,7 @@
 
 
 (defctype gpgme-key-sig-t :pointer
-  :documentation "A signature on a user ID.")
+  "A signature on a user ID.")
 
 ;; FIXME: Doesn't this depend on endianess?
 (defbitfield (gpgme-key-sig-bitfield :unsigned-int)
@@ -352,7 +344,7 @@
 
 
 (defctype gpgme-user-id-t :pointer
-  :documentation "A user ID from a key.")
+  "A user ID from a key.")
 
 ;; FIXME: Doesn't this depend on endianess?
 (defbitfield (gpgme-user-id-bitfield :unsigned-int)
@@ -374,7 +366,7 @@
 
 
 (defctype gpgme-key-t :pointer
-  :documentation "A key from the keyring.")
+  "A key from the keyring.")
 
 ;; FIXME: Doesn't this depend on endianess?
 (defbitfield (gpgme-key-bitfield :unsigned-int)
@@ -603,7 +595,7 @@
   (release gpgme-data-release-cb-t))
 
 (defctype gpgme-data-cbs-t :pointer
-  :documentation "Data callbacks pointer.")
+  "Data callbacks pointer.")
 
 (defcfun ("gpgme_data_read" c-gpgme-data-read) ssize-t
   (dh gpgme-data-t)
@@ -702,7 +694,7 @@
 ;;;
 
 (defctype gpgme-invalid-key-t :pointer
-  :documentation "An invalid key structure.")
+  "An invalid key structure.")
 
 (defcstruct gpgme-invalid-key
   "An invalid key structure."
@@ -717,7 +709,7 @@
   (invalid-recipients gpgme-invalid-key-t))
 
 (defctype gpgme-op-encrypt-result-t :pointer
-  :documentation "An encryption result structure.")
+  "An encryption result structure.")
 
 (defcfun ("gpgme_op_encrypt_result" c-gpgme-op-encrypt-result)
     gpgme-op-encrypt-result-t
@@ -758,7 +750,7 @@
 ;;; Decryption.
 
 (defctype gpgme-recipient-t :pointer
-  :documentation "A recipient structure.")
+  "A recipient structure.")
 
 (defcstruct gpgme-recipient
   "Recipient structure."
@@ -780,7 +772,7 @@
   (file-name :string))
 
 (defctype gpgme-op-decrypt-result-t :pointer
-  :documentation "A decryption result structure.")
+  "A decryption result structure.")
 
 (defcfun ("gpgme_op_decrypt_result" c-gpgme-op-decrypt-result)
     gpgme-op-decrypt-result-t
@@ -810,7 +802,7 @@
 ;;; Signing.
 
 (defctype gpgme-new-signature-t :pointer
-  :documentation "A new signature structure.")
+  "A new signature structure.")
 
 (defcstruct gpgme-new-signature
   "New signature structure."
@@ -830,7 +822,7 @@
   (signatures gpgme-new-signature-t))
 
 (defctype gpgme-op-sign-result-t :pointer
-  :documentation "A signing result structure.")
+  "A signing result structure.")
 
 (defcfun ("gpgme_op_sign_result" c-gpgme-op-sign-result)
     gpgme-op-sign-result-t
@@ -865,7 +857,7 @@
   (:sys-error #x0800))
 
 (defctype gpgme-signature-t :pointer
-  :documentation "A signature structure.")
+  "A signature structure.")
 
 ;; FIXME: Doesn't this depend on endianess?
 (defbitfield (gpgme-signature-bitfield :unsigned-int)
@@ -893,7 +885,7 @@
   (file-name :string))
 
 (defctype gpgme-op-verify-result-t :pointer
-  :documentation "A verify result structure.")
+  "A verify result structure.")
 
 (defcfun ("gpgme_op_verify_result" c-gpgme-op-verify-result)
     gpgme-op-verify-result-t
@@ -922,7 +914,7 @@
   (:secret #x0010))
 
 (defctype gpgme-import-status-t :pointer
-  :documentation "An import status structure.")
+  "An import status structure.")
 
 (defcstruct gpgme-import-status
   "New import status structure."
@@ -950,7 +942,7 @@
   (imports gpgme-import-status-t))
 
 (defctype gpgme-op-import-result-t :pointer
-  :documentation "An import status result structure.")
+  "An import status result structure.")
 
 (defcfun ("gpgme_op_import_result" c-gpgme-op-import-result)
     gpgme-op-import-result-t
@@ -993,7 +985,7 @@
   (fpr :string))
 
 (defctype gpgme-op-genkey-result-t :pointer
-  :documentation "A key generation result structure.")
+  "A key generation result structure.")
 
 (defcfun ("gpgme_op_genkey_result" c-gpgme-op-genkey-result)
     gpgme-op-genkey-result-t
@@ -1036,7 +1028,7 @@
   (bitfield gpgme-keylist-flags-t))
 
 (defctype gpgme-op-keylist-result-t :pointer
-  :documentation "A key listing result structure.")
+  "A key listing result structure.")
 
 (defcfun ("gpgme_op_keylist_result" c-gpgme-op-keylist-result)
     gpgme-op-keylist-result-t

Copied: gpgme/trunk/src/ChangeLog (from r263, gpgme/trunk/gpgme/ChangeLog)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/ChangeLog?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/ChangeLog (original)
+++ gpgme/trunk/src/ChangeLog Sun Jul  8 14:44:20 2012
@@ -1,3 +1,54 @@
+2008-12-03  Marcus Brinkmann  <marcus at g10code.de>
+
+	* Makefile.am (status-table.h): Use $(builddir) to find gpgme.h.
+
+2008-11-18  Werner Koch  <wk at g10code.com>
+
+	* version.c (do_subsystem_inits): Always initialize I/O
+	subsystem.  Fixes regression from 2007-08-02.
+
+	* decrypt.c (_gpgme_decrypt_status_handler): Use
+	_gpgme_map_gnupg_error to parse the error code for decrypt.algorithm.
+
+2008-10-30  Marcus Brinkmann  <marcus at g10code.de>
+
+	* wait-private.c (_gpgme_wait_on_condition): Remove unused
+	variable IDX.
+	* wait-global.c: Include ops.h to silence gcc warning.
+	(_gpgme_wait_global_event_cb): Pass error value directly.
+	* wait-user.c: Include ops.h to silence gcc warning.
+
+	* posix-io.c (_gpgme_io_spawn): Make ARGV argument const to
+	silence gcc warning.  Cast argument to execv to silence warning.
+	* w32-io.c (_gpgme_io_spawn): Likewise.
+	* priv-io.h (_gpgme_io_spawn): Likewise for prototype.
+
+2008-10-24  Werner Koch  <wk at g10code.com>
+
+	* rungpg.c (gpg_keylist_preprocess): Escape backslashes too.
+
+2008-10-23  Marcus Brinkmann  <marcus at g10code.de>
+
+	* rungpg.c (gpg_keylist_preprocess): Convert percent escaped
+	string to C coded string.
+
+2008-10-20  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (EXTRA_DIST): Add gpgme.h.in.
+
+	* gpgme.h: Rename to gpgme.h.in.
+	* gpgme.h.in (GPGME_VERSION): Use autoconf substitution.
+
+	* posix-io.c: Include sys/uio.h.  Fixes bug #818.
+
+2008-10-18  Marcus Brinkmann  <marcus at g10code.com>
+
+	* w32-util.c (find_program_in_registry): Don't define.
+	(_gpgme_get_gpg_path, _gpgme_get_gpgsm_path)
+	(_gpgme_get_gpgconf_path): Do not check for fooProgram in the
+	registry anymore.  It is now no longer possible to overwrite the
+	default location in that way.
+
 2008-10-17  Werner Koch  <wk at g10code.com>
 
 	* w32-glib-io.c (_gpgme_io_fd2str): Use "%d" and not "%ld" to work
@@ -440,9 +491,9 @@
 	* w32-io.c (_gpgme_io_spawn): Ditto.
 	(_gpgme_io_write): Map ERROR_NO_DATA to EPIPE.
 	* debug.c (_gpgme_debug): Enable assuan logging.
-	(_gpgme_debug_subsystem_init): New.  * version.c
-	(do_subsystem_inits): Disable assuan logging and initialize de
-	debug system.
+	(_gpgme_debug_subsystem_init): New.
+	* version.c (do_subsystem_inits): Disable assuan logging and
+	initialize the debug system.
 	(gpgme_check_version): Do not trace before the subsystems are
 	initialized.
 

Copied: gpgme/trunk/src/Makefile.am (from r263, gpgme/trunk/gpgme/Makefile.am)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/Makefile.am?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/Makefile.am (original)
+++ gpgme/trunk/src/Makefile.am Sun Jul  8 14:44:20 2012
@@ -21,7 +21,7 @@
 
 # Note: moc_kdpipeiodevice should actually be a dependcy below.
 EXTRA_DIST = gpgme-config.in gpgme.m4 mkstatus libgpgme.vers \
-	     versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
+	     gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
 BUILT_SOURCES = status-table.h
 MOSTLYCLEANFILES = status-table.h
 bin_SCRIPTS = gpgme-config
@@ -226,7 +226,7 @@
 endif
 
 status-table.h : gpgme.h
-	$(srcdir)/mkstatus < $(srcdir)/gpgme.h > status-table.h
+	$(srcdir)/mkstatus < $(builddir)/gpgme.h > status-table.h
 
 install-data-local: install-def-file
 

Copied: gpgme/trunk/src/Makefile.in (from r263, gpgme/trunk/gpgme/Makefile.in)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/Makefile.in?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/Makefile.in (original)
+++ gpgme/trunk/src/Makefile.in Sun Jul  8 14:44:20 2012
@@ -56,12 +56,12 @@
 build_triplet = @build@
 host_triplet = @host@
 @HAVE_W32_SYSTEM_TRUE at libexec_PROGRAMS = gpgme-w32spawn$(EXEEXT)
-subdir = gpgme
+subdir = src
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/gpgme-config.in \
-	$(srcdir)/versioninfo.rc.in ChangeLog funopen.c isascii.c \
-	memrchr.c putc_unlocked.c setenv.c stpcpy.c ttyname_r.c \
-	vasprintf.c
+	$(srcdir)/gpgme.h.in $(srcdir)/versioninfo.rc.in ChangeLog \
+	funopen.c isascii.c memrchr.c putc_unlocked.c setenv.c \
+	stpcpy.c ttyname_r.c vasprintf.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gpg-error.m4 \
@@ -71,7 +71,7 @@
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = versioninfo.rc gpgme-config
+CONFIG_CLEAN_FILES = versioninfo.rc gpgme.h gpgme-config
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -380,7 +380,7 @@
 
 # Note: moc_kdpipeiodevice should actually be a dependcy below.
 EXTRA_DIST = gpgme-config.in gpgme.m4 mkstatus libgpgme.vers \
-	     versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
+	     gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
 
 BUILT_SOURCES = status-table.h
 MOSTLYCLEANFILES = status-table.h
@@ -540,9 +540,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  gpgme/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  gpgme/Makefile
+	  $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -561,6 +561,8 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 versioninfo.rc: $(top_builddir)/config.status $(srcdir)/versioninfo.rc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+gpgme.h: $(top_builddir)/config.status $(srcdir)/gpgme.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 gpgme-config: $(top_builddir)/config.status $(srcdir)/gpgme-config.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -1011,7 +1013,7 @@
 @HAVE_W32_SYSTEM_FALSE at uninstall-def-file:
 
 status-table.h : gpgme.h
-	$(srcdir)/mkstatus < $(srcdir)/gpgme.h > status-table.h
+	$(srcdir)/mkstatus < $(builddir)/gpgme.h > status-table.h
 
 install-data-local: install-def-file
 

Copied: gpgme/trunk/src/ath-pth.c (from r263, gpgme/trunk/gpgme/ath-pth.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/ath-pth.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/ath-pthread.c (from r263, gpgme/trunk/gpgme/ath-pthread.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/ath-pthread.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/ath.c (from r263, gpgme/trunk/gpgme/ath.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/ath.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/ath.h (from r263, gpgme/trunk/gpgme/ath.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/ath.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/context.h (from r263, gpgme/trunk/gpgme/context.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/context.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/conversion.c (from r263, gpgme/trunk/gpgme/conversion.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/conversion.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/data-compat.c (from r263, gpgme/trunk/gpgme/data-compat.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/data-compat.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/data-fd.c (from r263, gpgme/trunk/gpgme/data-fd.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/data-fd.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/data-mem.c (from r263, gpgme/trunk/gpgme/data-mem.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/data-mem.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/data-stream.c (from r263, gpgme/trunk/gpgme/data-stream.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/data-stream.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/data-user.c (from r263, gpgme/trunk/gpgme/data-user.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/data-user.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/data.c (from r263, gpgme/trunk/gpgme/data.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/data.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/data.h (from r263, gpgme/trunk/gpgme/data.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/data.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/debug.c (from r263, gpgme/trunk/gpgme/debug.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/debug.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/debug.h (from r263, gpgme/trunk/gpgme/debug.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/debug.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/decrypt-verify.c (from r263, gpgme/trunk/gpgme/decrypt-verify.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/decrypt-verify.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/decrypt.c (from r263, gpgme/trunk/gpgme/decrypt.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/decrypt.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/decrypt.c (original)
+++ gpgme/trunk/src/decrypt.c Sun Jul  8 14:44:20 2012
@@ -180,7 +180,6 @@
          related to the backend.  */
       {
 	const char d_alg[] = "decrypt.algorithm";
-	const char u_alg[] = "Unsupported_Algorithm";
 	const char k_alg[] = "decrypt.keyusage";
 
 	if (!strncmp (args, d_alg, sizeof (d_alg) - 1))
@@ -189,11 +188,13 @@
 	    while (*args == ' ')
 	      args++;
 
-	    if (!strncmp (args, u_alg, sizeof (u_alg) - 1))
+	    if (gpg_err_code (_gpgme_map_gnupg_error (args))
+                == GPG_ERR_UNSUPPORTED_ALGORITHM)
 	      {
 		char *end;
 
-		args += sizeof (u_alg) - 1;
+		while (*args && *args != ' ')
+		  args++;
 		while (*args == ' ')
 		  args++;
 

Copied: gpgme/trunk/src/delete.c (from r263, gpgme/trunk/gpgme/delete.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/delete.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/edit.c (from r263, gpgme/trunk/gpgme/edit.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/edit.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/encrypt-sign.c (from r263, gpgme/trunk/gpgme/encrypt-sign.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/encrypt-sign.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/encrypt.c (from r263, gpgme/trunk/gpgme/encrypt.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/encrypt.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/engine-backend.h (from r263, gpgme/trunk/gpgme/engine-backend.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/engine-backend.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/engine-gpgconf.c (from r263, gpgme/trunk/gpgme/engine-gpgconf.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/engine-gpgconf.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/engine-gpgsm.c (from r263, gpgme/trunk/gpgme/engine-gpgsm.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/engine-gpgsm.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/engine.c (from r263, gpgme/trunk/gpgme/engine.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/engine.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/engine.h (from r263, gpgme/trunk/gpgme/engine.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/engine.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/error.c (from r263, gpgme/trunk/gpgme/error.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/error.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/export.c (from r263, gpgme/trunk/gpgme/export.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/export.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/funopen.c (from r263, gpgme/trunk/gpgme/funopen.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/funopen.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/genkey.c (from r263, gpgme/trunk/gpgme/genkey.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/genkey.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/get-env.c (from r263, gpgme/trunk/gpgme/get-env.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/get-env.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/getauditlog.c (from r263, gpgme/trunk/gpgme/getauditlog.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/getauditlog.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/gpgconf.c (from r263, gpgme/trunk/gpgme/gpgconf.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/gpgconf.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/gpgme-config.in (from r263, gpgme/trunk/gpgme/gpgme-config.in)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/gpgme-config.in?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/gpgme-w32spawn.c (from r263, gpgme/trunk/gpgme/gpgme-w32spawn.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/gpgme-w32spawn.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/gpgme.c (from r263, gpgme/trunk/gpgme/gpgme.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/gpgme.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/gpgme.def (from r263, gpgme/trunk/gpgme/gpgme.def)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/gpgme.def?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/gpgme.h (from r263, gpgme/trunk/gpgme/gpgme.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/gpgme.h?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/gpgme.h (original)
+++ gpgme/trunk/src/gpgme.h Sun Jul  8 14:44:20 2012
@@ -1,4 +1,4 @@
-/* gpgme.h - Public interface to GnuPG Made Easy.
+/* gpgme.h - Public interface to GnuPG Made Easy.                   -*- c -*-
    Copyright (C) 2000 Werner Koch (dd9jn)
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 g10 Code GmbH
 
@@ -16,7 +16,8 @@
    
    You should have received a copy of the GNU Lesser General Public
    License along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
+ 
+   File: src/gpgme.h.  Generated from gpgme.h.in by configure.  */
 
 #ifndef GPGME_H
 #define GPGME_H
@@ -70,9 +71,8 @@
    not use this symbol in your application, use gpgme_check_version
    instead.  The purpose of this macro is to let autoconf (using the
    AM_PATH_GPGME macro) check that this header matches the installed
-   library.  Warning: Do not edit the next line.  configure will do
-   that for you!  */
-#define GPGME_VERSION "1.1.7"
+   library.  */
+#define GPGME_VERSION "1.1.8"
 
 
 

Copied: gpgme/trunk/src/gpgme.h.in (from r263, gpgme/trunk/gpgme/gpgme.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/gpgme.h.in?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/gpgme.h (original)
+++ gpgme/trunk/src/gpgme.h.in Sun Jul  8 14:44:20 2012
@@ -1,4 +1,4 @@
-/* gpgme.h - Public interface to GnuPG Made Easy.
+/* gpgme.h - Public interface to GnuPG Made Easy.                   -*- c -*-
    Copyright (C) 2000 Werner Koch (dd9jn)
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 g10 Code GmbH
 
@@ -16,7 +16,8 @@
    
    You should have received a copy of the GNU Lesser General Public
    License along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
+ 
+   File: @configure_input@  */
 
 #ifndef GPGME_H
 #define GPGME_H
@@ -70,9 +71,8 @@
    not use this symbol in your application, use gpgme_check_version
    instead.  The purpose of this macro is to let autoconf (using the
    AM_PATH_GPGME macro) check that this header matches the installed
-   library.  Warning: Do not edit the next line.  configure will do
-   that for you!  */
-#define GPGME_VERSION "1.1.7"
+   library.  */
+#define GPGME_VERSION "@PACKAGE_VERSION@"
 
 
 

Copied: gpgme/trunk/src/gpgme.m4 (from r263, gpgme/trunk/gpgme/gpgme.m4)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/gpgme.m4?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/import.c (from r263, gpgme/trunk/gpgme/import.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/import.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/isascii.c (from r263, gpgme/trunk/gpgme/isascii.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/isascii.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/kdpipeiodevice.cpp (from r263, gpgme/trunk/gpgme/kdpipeiodevice.cpp)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/kdpipeiodevice.cpp?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/kdpipeiodevice.h (from r263, gpgme/trunk/gpgme/kdpipeiodevice.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/kdpipeiodevice.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/kdpipeiodevice.moc (from r263, gpgme/trunk/gpgme/kdpipeiodevice.moc)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/kdpipeiodevice.moc?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/key.c (from r263, gpgme/trunk/gpgme/key.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/key.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/keylist.c (from r263, gpgme/trunk/gpgme/keylist.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/keylist.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/libgpgme.vers (from r263, gpgme/trunk/gpgme/libgpgme.vers)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/libgpgme.vers?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/memrchr.c (from r263, gpgme/trunk/gpgme/memrchr.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/memrchr.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/mkstatus (from r263, gpgme/trunk/gpgme/mkstatus)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/mkstatus?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/moc_kdpipeiodevice.cpp (from r263, gpgme/trunk/gpgme/moc_kdpipeiodevice.cpp)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/moc_kdpipeiodevice.cpp?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/op-support.c (from r263, gpgme/trunk/gpgme/op-support.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/op-support.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/ops.h (from r263, gpgme/trunk/gpgme/ops.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/ops.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/passphrase.c (from r263, gpgme/trunk/gpgme/passphrase.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/passphrase.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/posix-io.c (from r263, gpgme/trunk/gpgme/posix-io.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/posix-io.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/posix-io.c (original)
+++ gpgme/trunk/src/posix-io.c Sun Jul  8 14:44:20 2012
@@ -33,6 +33,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
 #include <ctype.h>
 #include <sys/resource.h>
 #include <unistd.h>
@@ -301,7 +304,7 @@
 
 /* Returns 0 on success, -1 on error.  */
 int
-_gpgme_io_spawn (const char *path, char **argv,
+_gpgme_io_spawn (const char *path, char *const argv[],
 		 struct spawn_fd_item_s *fd_list, pid_t *r_pid)
 {
   pid_t pid;
@@ -424,7 +427,7 @@
 		close (fd);
 	    }
     
-	  execv (path, argv);
+	  execv (path, (char *const *) argv);
 	  /* Hmm: in that case we could write a special status code to the
 	     status-pipe.  */
 #if 0

Copied: gpgme/trunk/src/posix-sema.c (from r263, gpgme/trunk/gpgme/posix-sema.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/posix-sema.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/posix-util.c (from r263, gpgme/trunk/gpgme/posix-util.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/posix-util.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/priv-io.h (from r263, gpgme/trunk/gpgme/priv-io.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/priv-io.h?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/priv-io.h (original)
+++ gpgme/trunk/src/priv-io.h Sun Jul  8 14:44:20 2012
@@ -63,7 +63,7 @@
    close all fds except for those in FD_LIST in the child, then
    optionally dup() the child fds.  Finally, all fds in the list are
    closed in the parent.  */
-int _gpgme_io_spawn (const char *path, char **argv,
+int _gpgme_io_spawn (const char *path, char *const argv[],
 		     struct spawn_fd_item_s *fd_list, pid_t *r_pid);
 
 int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock);

Copied: gpgme/trunk/src/progress.c (from r263, gpgme/trunk/gpgme/progress.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/progress.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/putc_unlocked.c (from r263, gpgme/trunk/gpgme/putc_unlocked.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/putc_unlocked.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/rungpg.c (from r263, gpgme/trunk/gpgme/rungpg.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/rungpg.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/rungpg.c (original)
+++ gpgme/trunk/src/rungpg.c Sun Jul  8 14:44:20 2012
@@ -1878,12 +1878,49 @@
 	 HTTP Keyserver Protocol (draft). 
 
 	 We want:
-	 uid:o<flags>::::<creatdate>:<expdate>:::<uid>:
+	 uid:o<flags>::::<creatdate>:<expdate>:::<c-coded uid>:
       */
 
-      if (asprintf (r_line, "uid:o%s::::%s:%s:::%s:",
-		    field[4], field[2], field[3], field[1]) < 0)
-	return gpg_error_from_errno (errno);
+      {
+	/* The user ID is percent escaped, but we want c-coded.
+	   Because we have to replace each '%HL' by '\xHL', we need at
+	   most 4/3 th the number of bytes.  But because we also need
+	   to escape the backslashes we allocate twice as much.  */
+	char *uid = malloc (2 * strlen (field[1]) + 1);
+	char *src;
+	char *dst;
+
+	if (! uid)
+	  return gpg_error_from_errno (errno);
+	src = field[1];
+	dst = uid;
+	while (*src)
+	  {
+	    if (*src == '%')
+	      {
+		*(dst++) = '\\';
+		*(dst++) = 'x';
+		src++;
+		/* Copy the next two bytes unconditionally.  */
+		if (*src)
+		  *(dst++) = *(src++);
+		if (*src)
+		  *(dst++) = *(src++);
+	      }
+	    else if (*src == '\\')
+              {
+                *dst++ = '\\';
+                *dst++ = '\\';
+              }
+	    else
+	      *(dst++) = *(src++);
+	  }
+	*dst = '\0';
+
+	if (asprintf (r_line, "uid:o%s::::%s:%s:::%s:",
+		      field[4], field[2], field[3], uid) < 0)
+	  return gpg_error_from_errno (errno);
+      }
       return 0;
 
     case RT_NONE:

Copied: gpgme/trunk/src/sema.h (from r263, gpgme/trunk/gpgme/sema.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/sema.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/setenv.c (from r263, gpgme/trunk/gpgme/setenv.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/setenv.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/sig-notation.c (from r263, gpgme/trunk/gpgme/sig-notation.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/sig-notation.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/sign.c (from r263, gpgme/trunk/gpgme/sign.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/sign.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/signers.c (from r263, gpgme/trunk/gpgme/signers.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/signers.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/status-table.h (from r263, gpgme/trunk/gpgme/status-table.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/status-table.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/stpcpy.c (from r263, gpgme/trunk/gpgme/stpcpy.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/stpcpy.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/trust-item.c (from r263, gpgme/trunk/gpgme/trust-item.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/trust-item.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/trustlist.c (from r263, gpgme/trunk/gpgme/trustlist.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/trustlist.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/ttyname_r.c (from r263, gpgme/trunk/gpgme/ttyname_r.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/ttyname_r.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/util.h (from r263, gpgme/trunk/gpgme/util.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/util.h?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/vasprintf.c (from r263, gpgme/trunk/gpgme/vasprintf.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/vasprintf.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/verify.c (from r263, gpgme/trunk/gpgme/verify.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/verify.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/version.c (from r263, gpgme/trunk/gpgme/version.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/version.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/version.c (original)
+++ gpgme/trunk/src/version.c Sun Jul  8 14:44:20 2012
@@ -60,8 +60,8 @@
   assuan_set_assuan_err_source (GPG_ERR_SOURCE_GPGME);
 #endif /*HAVE_ASSUAN_H*/
   _gpgme_debug_subsystem_init ();
+  _gpgme_io_subsystem_init ();
 #if defined(HAVE_W32_SYSTEM) && defined(HAVE_ASSUAN_H)
-  _gpgme_io_subsystem_init ();
   /* We need to make sure that the sockets are initialized.  */
   {
     WSADATA wsadat;

Copied: gpgme/trunk/src/versioninfo.rc.in (from r263, gpgme/trunk/gpgme/versioninfo.rc.in)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/versioninfo.rc.in?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/w32-glib-io.c (from r263, gpgme/trunk/gpgme/w32-glib-io.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/w32-glib-io.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/w32-io.c (from r263, gpgme/trunk/gpgme/w32-io.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/w32-io.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/w32-io.c (original)
+++ gpgme/trunk/src/w32-io.c Sun Jul  8 14:44:20 2012
@@ -1009,7 +1009,7 @@
 
 
 int
-_gpgme_io_spawn (const char *path, char **argv,
+_gpgme_io_spawn (const char *path, char *const argv[],
 		 struct spawn_fd_item_s *fd_list, pid_t *r_pid)
 {
   SECURITY_ATTRIBUTES sec_attr;

Copied: gpgme/trunk/src/w32-qt-io.cpp (from r263, gpgme/trunk/gpgme/w32-qt-io.cpp)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/w32-qt-io.cpp?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/w32-sema.c (from r263, gpgme/trunk/gpgme/w32-sema.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/w32-sema.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/w32-util.c (from r263, gpgme/trunk/gpgme/w32-util.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/w32-util.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/w32-util.c (original)
+++ gpgme/trunk/src/w32-util.c Sun Jul  8 14:44:20 2012
@@ -225,6 +225,7 @@
 }
 
 
+#if 0
 static char *
 find_program_in_registry (const char *name)
 {
@@ -245,6 +246,7 @@
     }
   return program;
 }
+#endif
 
 
 static char *
@@ -307,8 +309,10 @@
   static char *gpg_program;
 
   LOCK (get_path_lock);
+#if 0
   if (!gpg_program)
     gpg_program = find_program_in_registry ("gpgProgram");
+#endif
   if (!gpg_program)
     gpg_program = find_program_in_inst_dir ("gpg.exe");
   if (!gpg_program)
@@ -324,8 +328,10 @@
   static char *gpgsm_program;
 
   LOCK (get_path_lock);
+#if 0
   if (!gpgsm_program)
     gpgsm_program = find_program_in_registry ("gpgsmProgram");
+#endif
   if (!gpgsm_program)
     gpgsm_program = find_program_in_inst_dir ("gpgsm.exe");
   if (!gpgsm_program)
@@ -341,8 +347,10 @@
   static char *gpgconf_program;
 
   LOCK (get_path_lock);
+#if 0
   if (!gpgconf_program)
     gpgconf_program = find_program_in_registry ("gpgconfProgram");
+#endif
   if (!gpgconf_program)
     gpgconf_program = find_program_in_inst_dir ("gpgconf.exe");
   if (!gpgconf_program)

Copied: gpgme/trunk/src/wait-global.c (from r263, gpgme/trunk/gpgme/wait-global.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/wait-global.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/wait-global.c (original)
+++ gpgme/trunk/src/wait-global.c Sun Jul  8 14:44:20 2012
@@ -33,6 +33,7 @@
 #include "context.h"
 #include "wait.h"
 #include "priv-io.h"
+#include "ops.h"
 
 /* The global event loop is used for all asynchronous operations
    (except key listing) for which no user I/O callbacks are specified.
@@ -202,7 +203,7 @@
 	if (err)
 	  /* An error occured.  Close all fds in this context, and
 	     send the error in a done event.  */
-	  _gpgme_cancel_with_err (ctx, &err);
+	  _gpgme_cancel_with_err (ctx, err);
       }
       break;
 

Copied: gpgme/trunk/src/wait-private.c (from r263, gpgme/trunk/gpgme/wait-private.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/wait-private.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/wait-private.c (original)
+++ gpgme/trunk/src/wait-private.c Sun Jul  8 14:44:20 2012
@@ -86,8 +86,6 @@
 	{
 	  /* An error occured.  Close all fds in this context, and
 	     signal it.  */
-	  unsigned int idx;
-
 	  err = gpg_error_from_errno (errno);
           _gpgme_cancel_with_err (ctx, err);
 

Copied: gpgme/trunk/src/wait-user.c (from r263, gpgme/trunk/gpgme/wait-user.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/wait-user.c?rev=264&op=diff
==============================================================================
--- gpgme/trunk/gpgme/wait-user.c (original)
+++ gpgme/trunk/src/wait-user.c Sun Jul  8 14:44:20 2012
@@ -28,6 +28,7 @@
 #include "context.h"
 #include "priv-io.h"
 #include "wait.h"
+#include "ops.h"
 
 
 /* The user event loops are used for all asynchronous operations for

Copied: gpgme/trunk/src/wait.c (from r263, gpgme/trunk/gpgme/wait.c)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/wait.c?rev=264&op=diff
==============================================================================
    (empty)

Copied: gpgme/trunk/src/wait.h (from r263, gpgme/trunk/gpgme/wait.h)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/src/wait.h?rev=264&op=diff
==============================================================================
    (empty)

Modified: gpgme/trunk/tests/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/tests/ChangeLog?rev=264&op=diff
==============================================================================
--- gpgme/trunk/tests/ChangeLog (original)
+++ gpgme/trunk/tests/ChangeLog Sun Jul  8 14:44:20 2012
@@ -1,3 +1,22 @@
+2008-12-03  Marcus Brinkmann  <marcus at g10code.de>
+
+	* Makefile.am (INCLUDES): Fix path to include file.
+	* gpg/Makefile.am (INCLUDES), gpgsm/Makefile.am (INCLUDES): Likewise.
+
+2008-11-18  Werner Koch  <wk at g10code.com>
+
+	* gpgsm/cms-decrypt.c: New.
+
+2008-11-03  Marcus Brinkmann  <marcus at g10code.com>
+
+	* gpgsm/Makefile.am (INCLUDES, LDADD): Replace gpgme path with src.
+	* gpg/Makefile.am (INCLUDES, LDADD, t_thread1_LDADD): Likewise.
+	* Makefile.am (LDADD): Likewise.
+
+2008-10-30  Werner Koch  <wk at g10code.com>
+
+	* gpgsm/cms-keylist.c: New.
+
 2008-06-19  Werner Koch  <wk at g10code.com>
 
 	* gpg/t-gpgconf.c (dump_arg): Add new types.  Print strings in

Modified: gpgme/trunk/tests/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/tests/Makefile.am?rev=264&op=diff
==============================================================================
--- gpgme/trunk/tests/Makefile.am (original)
+++ gpgme/trunk/tests/Makefile.am Sun Jul  8 14:44:20 2012
@@ -26,10 +26,10 @@
 
 EXTRA_DIST = t-data-1.txt t-data-2.txt
 
-INCLUDES = -I$(top_srcdir)/gpgme
+INCLUDES = -I$(top_builddir)/src
 
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../gpgme/libgpgme.la @GPG_ERROR_LIBS@
+LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
 
 noinst_PROGRAMS = $(TESTS)
 

Modified: gpgme/trunk/tests/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/tests/Makefile.in?rev=264&op=diff
==============================================================================
--- gpgme/trunk/tests/Makefile.in (original)
+++ gpgme/trunk/tests/Makefile.in Sun Jul  8 14:44:20 2012
@@ -72,15 +72,15 @@
 t_data_SOURCES = t-data.c
 t_data_OBJECTS = t-data.$(OBJEXT)
 t_data_LDADD = $(LDADD)
-t_data_DEPENDENCIES = ../gpgme/libgpgme.la
+t_data_DEPENDENCIES = ../src/libgpgme.la
 t_engine_info_SOURCES = t-engine-info.c
 t_engine_info_OBJECTS = t-engine-info.$(OBJEXT)
 t_engine_info_LDADD = $(LDADD)
-t_engine_info_DEPENDENCIES = ../gpgme/libgpgme.la
+t_engine_info_DEPENDENCIES = ../src/libgpgme.la
 t_version_SOURCES = t-version.c
 t_version_OBJECTS = t-version.$(OBJEXT)
 t_version_LDADD = $(LDADD)
-t_version_DEPENDENCIES = ../gpgme/libgpgme.la
+t_version_DEPENDENCIES = ../src/libgpgme.la
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -250,9 +250,9 @@
 top_srcdir = @top_srcdir@
 TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
 EXTRA_DIST = t-data-1.txt t-data-2.txt
-INCLUDES = -I$(top_srcdir)/gpgme
+INCLUDES = -I$(top_builddir)/src
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../gpgme/libgpgme.la @GPG_ERROR_LIBS@
+LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
 @RUN_GPG_TESTS_FALSE at gpgtests = 
 @RUN_GPG_TESTS_TRUE at gpgtests = gpg
 @RUN_GPGSM_TESTS_FALSE at gpgsmtests = 

Modified: gpgme/trunk/tests/gpg/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/tests/gpg/Makefile.am?rev=264&op=diff
==============================================================================
--- gpgme/trunk/tests/gpg/Makefile.am (original)
+++ gpgme/trunk/tests/gpg/Makefile.am Sun Jul  8 14:44:20 2012
@@ -43,11 +43,11 @@
 EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	geheim.txt pubkey-1.asc seckey-1.asc pinentry
 
-INCLUDES = -I$(top_srcdir)/gpgme
+INCLUDES = -I$(top_builddir)/src
 
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../gpgme/libgpgme.la
-t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la
+LDADD = ../../src/libgpgme.la
+t_thread1_LDADD = ../../src/libgpgme-pthread.la
 
 # We don't run t-genkey in the test suite, because it takes too long
 noinst_PROGRAMS = $(TESTS) t-genkey

Modified: gpgme/trunk/tests/gpg/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/tests/gpg/Makefile.in?rev=264&op=diff
==============================================================================
--- gpgme/trunk/tests/gpg/Makefile.in (original)
+++ gpgme/trunk/tests/gpg/Makefile.in Sun Jul  8 14:44:20 2012
@@ -88,90 +88,90 @@
 t_decrypt_SOURCES = t-decrypt.c
 t_decrypt_OBJECTS = t-decrypt.$(OBJEXT)
 t_decrypt_LDADD = $(LDADD)
-t_decrypt_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_decrypt_DEPENDENCIES = ../../src/libgpgme.la
 t_decrypt_verify_SOURCES = t-decrypt-verify.c
 t_decrypt_verify_OBJECTS = t-decrypt-verify.$(OBJEXT)
 t_decrypt_verify_LDADD = $(LDADD)
-t_decrypt_verify_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_decrypt_verify_DEPENDENCIES = ../../src/libgpgme.la
 t_edit_SOURCES = t-edit.c
 t_edit_OBJECTS = t-edit.$(OBJEXT)
 t_edit_LDADD = $(LDADD)
-t_edit_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_edit_DEPENDENCIES = ../../src/libgpgme.la
 t_encrypt_SOURCES = t-encrypt.c
 t_encrypt_OBJECTS = t-encrypt.$(OBJEXT)
 t_encrypt_LDADD = $(LDADD)
-t_encrypt_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_encrypt_DEPENDENCIES = ../../src/libgpgme.la
 t_encrypt_large_SOURCES = t-encrypt-large.c
 t_encrypt_large_OBJECTS = t-encrypt-large.$(OBJEXT)
 t_encrypt_large_LDADD = $(LDADD)
-t_encrypt_large_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_encrypt_large_DEPENDENCIES = ../../src/libgpgme.la
 t_encrypt_sign_SOURCES = t-encrypt-sign.c
 t_encrypt_sign_OBJECTS = t-encrypt-sign.$(OBJEXT)
 t_encrypt_sign_LDADD = $(LDADD)
-t_encrypt_sign_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_encrypt_sign_DEPENDENCIES = ../../src/libgpgme.la
 t_encrypt_sym_SOURCES = t-encrypt-sym.c
 t_encrypt_sym_OBJECTS = t-encrypt-sym.$(OBJEXT)
 t_encrypt_sym_LDADD = $(LDADD)
-t_encrypt_sym_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_encrypt_sym_DEPENDENCIES = ../../src/libgpgme.la
 t_eventloop_SOURCES = t-eventloop.c
 t_eventloop_OBJECTS = t-eventloop.$(OBJEXT)
 t_eventloop_LDADD = $(LDADD)
-t_eventloop_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_eventloop_DEPENDENCIES = ../../src/libgpgme.la
 t_export_SOURCES = t-export.c
 t_export_OBJECTS = t-export.$(OBJEXT)
 t_export_LDADD = $(LDADD)
-t_export_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_export_DEPENDENCIES = ../../src/libgpgme.la
 t_file_name_SOURCES = t-file-name.c
 t_file_name_OBJECTS = t-file-name.$(OBJEXT)
 t_file_name_LDADD = $(LDADD)
-t_file_name_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_file_name_DEPENDENCIES = ../../src/libgpgme.la
 t_genkey_SOURCES = t-genkey.c
 t_genkey_OBJECTS = t-genkey.$(OBJEXT)
 t_genkey_LDADD = $(LDADD)
-t_genkey_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_genkey_DEPENDENCIES = ../../src/libgpgme.la
 t_gpgconf_SOURCES = t-gpgconf.c
 t_gpgconf_OBJECTS = t-gpgconf.$(OBJEXT)
 t_gpgconf_LDADD = $(LDADD)
-t_gpgconf_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_gpgconf_DEPENDENCIES = ../../src/libgpgme.la
 t_import_SOURCES = t-import.c
 t_import_OBJECTS = t-import.$(OBJEXT)
 t_import_LDADD = $(LDADD)
-t_import_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_import_DEPENDENCIES = ../../src/libgpgme.la
 t_keylist_SOURCES = t-keylist.c
 t_keylist_OBJECTS = t-keylist.$(OBJEXT)
 t_keylist_LDADD = $(LDADD)
-t_keylist_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_keylist_DEPENDENCIES = ../../src/libgpgme.la
 t_keylist_sig_SOURCES = t-keylist-sig.c
 t_keylist_sig_OBJECTS = t-keylist-sig.$(OBJEXT)
 t_keylist_sig_LDADD = $(LDADD)
-t_keylist_sig_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_keylist_sig_DEPENDENCIES = ../../src/libgpgme.la
 t_sig_notation_SOURCES = t-sig-notation.c
 t_sig_notation_OBJECTS = t-sig-notation.$(OBJEXT)
 t_sig_notation_LDADD = $(LDADD)
-t_sig_notation_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_sig_notation_DEPENDENCIES = ../../src/libgpgme.la
 t_sign_SOURCES = t-sign.c
 t_sign_OBJECTS = t-sign.$(OBJEXT)
 t_sign_LDADD = $(LDADD)
-t_sign_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_sign_DEPENDENCIES = ../../src/libgpgme.la
 t_signers_SOURCES = t-signers.c
 t_signers_OBJECTS = t-signers.$(OBJEXT)
 t_signers_LDADD = $(LDADD)
-t_signers_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_signers_DEPENDENCIES = ../../src/libgpgme.la
 t_thread1_SOURCES = t-thread1.c
 t_thread1_OBJECTS = t-thread1.$(OBJEXT)
-t_thread1_DEPENDENCIES = ../../gpgme/libgpgme-pthread.la
+t_thread1_DEPENDENCIES = ../../src/libgpgme-pthread.la
 t_trustlist_SOURCES = t-trustlist.c
 t_trustlist_OBJECTS = t-trustlist.$(OBJEXT)
 t_trustlist_LDADD = $(LDADD)
-t_trustlist_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_trustlist_DEPENDENCIES = ../../src/libgpgme.la
 t_verify_SOURCES = t-verify.c
 t_verify_OBJECTS = t-verify.$(OBJEXT)
 t_verify_LDADD = $(LDADD)
-t_verify_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_verify_DEPENDENCIES = ../../src/libgpgme.la
 t_wait_SOURCES = t-wait.c
 t_wait_OBJECTS = t-wait.$(OBJEXT)
 t_wait_LDADD = $(LDADD)
-t_wait_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_wait_DEPENDENCIES = ../../src/libgpgme.la
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -351,10 +351,10 @@
 EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	geheim.txt pubkey-1.asc seckey-1.asc pinentry
 
-INCLUDES = -I$(top_srcdir)/gpgme
+INCLUDES = -I$(top_builddir)/src
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../gpgme/libgpgme.la
-t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la
+LDADD = ../../src/libgpgme.la
+t_thread1_LDADD = ../../src/libgpgme-pthread.la
 all: all-am
 
 .SUFFIXES:

Modified: gpgme/trunk/tests/gpgsm/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/tests/gpgsm/Makefile.am?rev=264&op=diff
==============================================================================
--- gpgme/trunk/tests/gpgsm/Makefile.am (original)
+++ gpgme/trunk/tests/gpgsm/Makefile.am Sun Jul  8 14:44:20 2012
@@ -29,14 +29,14 @@
 EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \
 	$(key_id)
 
-INCLUDES = -I$(top_srcdir)/gpgme
+INCLUDES = -I$(top_builddir)/src
 
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../gpgme/libgpgme.la
+LDADD = ../../src/libgpgme.la
 
 # We don't run t-genkey in the test suite, because it takes too long
 # and needs a working pinentry.
-noinst_PROGRAMS = $(TESTS) t-genkey
+noinst_PROGRAMS = $(TESTS) t-genkey cms-keylist cms-decrypt
 
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 

Modified: gpgme/trunk/tests/gpgsm/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/tests/gpgsm/Makefile.in?rev=264&op=diff
==============================================================================
--- gpgme/trunk/tests/gpgsm/Makefile.in (original)
+++ gpgme/trunk/tests/gpgsm/Makefile.in Sun Jul  8 14:44:20 2012
@@ -55,7 +55,8 @@
 TESTS = t-import$(EXEEXT) t-keylist$(EXEEXT) t-encrypt$(EXEEXT) \
 	t-verify$(EXEEXT) t-decrypt$(EXEEXT) t-sign$(EXEEXT) \
 	t-export$(EXEEXT)
-noinst_PROGRAMS = $(am__EXEEXT_1) t-genkey$(EXEEXT)
+noinst_PROGRAMS = $(am__EXEEXT_1) t-genkey$(EXEEXT) \
+	cms-keylist$(EXEEXT) cms-decrypt$(EXEEXT)
 subdir = tests/gpgsm
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -73,38 +74,46 @@
 	t-verify$(EXEEXT) t-decrypt$(EXEEXT) t-sign$(EXEEXT) \
 	t-export$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
+cms_decrypt_SOURCES = cms-decrypt.c
+cms_decrypt_OBJECTS = cms-decrypt.$(OBJEXT)
+cms_decrypt_LDADD = $(LDADD)
+cms_decrypt_DEPENDENCIES = ../../src/libgpgme.la
+cms_keylist_SOURCES = cms-keylist.c
+cms_keylist_OBJECTS = cms-keylist.$(OBJEXT)
+cms_keylist_LDADD = $(LDADD)
+cms_keylist_DEPENDENCIES = ../../src/libgpgme.la
 t_decrypt_SOURCES = t-decrypt.c
 t_decrypt_OBJECTS = t-decrypt.$(OBJEXT)
 t_decrypt_LDADD = $(LDADD)
-t_decrypt_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_decrypt_DEPENDENCIES = ../../src/libgpgme.la
 t_encrypt_SOURCES = t-encrypt.c
 t_encrypt_OBJECTS = t-encrypt.$(OBJEXT)
 t_encrypt_LDADD = $(LDADD)
-t_encrypt_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_encrypt_DEPENDENCIES = ../../src/libgpgme.la
 t_export_SOURCES = t-export.c
 t_export_OBJECTS = t-export.$(OBJEXT)
 t_export_LDADD = $(LDADD)
-t_export_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_export_DEPENDENCIES = ../../src/libgpgme.la
 t_genkey_SOURCES = t-genkey.c
 t_genkey_OBJECTS = t-genkey.$(OBJEXT)
 t_genkey_LDADD = $(LDADD)
-t_genkey_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_genkey_DEPENDENCIES = ../../src/libgpgme.la
 t_import_SOURCES = t-import.c
 t_import_OBJECTS = t-import.$(OBJEXT)
 t_import_LDADD = $(LDADD)
-t_import_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_import_DEPENDENCIES = ../../src/libgpgme.la
 t_keylist_SOURCES = t-keylist.c
 t_keylist_OBJECTS = t-keylist.$(OBJEXT)
 t_keylist_LDADD = $(LDADD)
-t_keylist_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_keylist_DEPENDENCIES = ../../src/libgpgme.la
 t_sign_SOURCES = t-sign.c
 t_sign_OBJECTS = t-sign.$(OBJEXT)
 t_sign_LDADD = $(LDADD)
-t_sign_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_sign_DEPENDENCIES = ../../src/libgpgme.la
 t_verify_SOURCES = t-verify.c
 t_verify_OBJECTS = t-verify.$(OBJEXT)
 t_verify_LDADD = $(LDADD)
-t_verify_DEPENDENCIES = ../../gpgme/libgpgme.la
+t_verify_DEPENDENCIES = ../../src/libgpgme.la
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -117,10 +126,12 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = t-decrypt.c t-encrypt.c t-export.c t-genkey.c t-import.c \
-	t-keylist.c t-sign.c t-verify.c
-DIST_SOURCES = t-decrypt.c t-encrypt.c t-export.c t-genkey.c \
-	t-import.c t-keylist.c t-sign.c t-verify.c
+SOURCES = cms-decrypt.c cms-keylist.c t-decrypt.c t-encrypt.c \
+	t-export.c t-genkey.c t-import.c t-keylist.c t-sign.c \
+	t-verify.c
+DIST_SOURCES = cms-decrypt.c cms-keylist.c t-decrypt.c t-encrypt.c \
+	t-export.c t-genkey.c t-import.c t-keylist.c t-sign.c \
+	t-verify.c
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -270,9 +281,9 @@
 EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \
 	$(key_id)
 
-INCLUDES = -I$(top_srcdir)/gpgme
+INCLUDES = -I$(top_builddir)/src
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../gpgme/libgpgme.la
+LDADD = ../../src/libgpgme.la
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 DISTCLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
 	private-keys-v1.d/$(key_id).key random_seed
@@ -317,6 +328,12 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+cms-decrypt$(EXEEXT): $(cms_decrypt_OBJECTS) $(cms_decrypt_DEPENDENCIES) 
+	@rm -f cms-decrypt$(EXEEXT)
+	$(LINK) $(cms_decrypt_OBJECTS) $(cms_decrypt_LDADD) $(LIBS)
+cms-keylist$(EXEEXT): $(cms_keylist_OBJECTS) $(cms_keylist_DEPENDENCIES) 
+	@rm -f cms-keylist$(EXEEXT)
+	$(LINK) $(cms_keylist_OBJECTS) $(cms_keylist_LDADD) $(LIBS)
 t-decrypt$(EXEEXT): $(t_decrypt_OBJECTS) $(t_decrypt_DEPENDENCIES) 
 	@rm -f t-decrypt$(EXEEXT)
 	$(LINK) $(t_decrypt_OBJECTS) $(t_decrypt_LDADD) $(LIBS)
@@ -348,6 +365,8 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cms-decrypt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cms-keylist.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-decrypt.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-encrypt.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t-export.Po at am__quote@

Added: gpgme/trunk/tests/gpgsm/cms-decrypt.c
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/tests/gpgsm/cms-decrypt.c?rev=264&op=file
==============================================================================
--- gpgme/trunk/tests/gpgsm/cms-decrypt.c (added)
+++ gpgme/trunk/tests/gpgsm/cms-decrypt.c Sun Jul  8 14:44:20 2012
@@ -1,0 +1,108 @@
+/* cms-decrypt.c  - Helper to debug the decrupt operation.
+   Copyright (C) 2008 g10 Code GmbH
+
+   This file is part of GPGME.
+ 
+   GPGME is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+   
+   GPGME is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* We need to include config.h so that we know whether we are building
+   with large file system (LFS) support. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <gpgme.h>
+
+#define PGM "cms-decrypt"
+
+#include "t-support.h"
+
+static const char *
+nonnull (const char *s)
+{
+  return s? s :"[none]";
+}
+
+
+int 
+main (int argc, char **argv)
+{
+  gpgme_error_t err;
+  gpgme_ctx_t ctx;
+  gpgme_data_t in, out;
+  gpgme_decrypt_result_t result;
+  gpgme_recipient_t recp;
+
+  if (argc)
+    { argc--; argv++; }
+
+  if (argc != 1)
+    {
+      fputs ("usage: " PGM " FILE\n", stderr);
+      exit (1);
+    }
+
+  init_gpgme (GPGME_PROTOCOL_CMS);
+
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
+  gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
+
+
+  err = gpgme_data_new_from_file (&in, *argv, 1);
+  fail_if_err (err);
+
+  err = gpgme_data_new (&out);
+  fail_if_err (err);
+
+  err = gpgme_op_decrypt (ctx, in, out);
+  printf ("gpgme_op_decrypt: %s <%s> (%u)\n",
+          gpg_strerror (err), gpg_strsource (err), err);
+  result = gpgme_op_decrypt_result (ctx);
+  if (!result)
+    {
+      fputs (PGM ": error: decryption result missing\n", stderr);
+      exit (1);
+    }
+  
+  printf ("unsupported_algorithm: %s\n", 
+          nonnull (result->unsupported_algorithm));
+  printf ("wrong_key_usage: %u\n",  result->wrong_key_usage);
+  printf ("file_name: %s\n", nonnull (result->file_name));
+  for (recp = result->recipients; recp; recp = recp->next)
+    {
+      printf ("recipient.status: %s <%s> (%u)\n",
+              gpg_strerror (recp->status), gpg_strsource (recp->status),
+              recp->status);
+      printf ("recipient.pkalgo: %d\n", recp->pubkey_algo);
+      printf ("recipient.keyid : %s\n", nonnull (recp->keyid));
+    }
+
+  if (!err)
+    {
+      puts ("plaintext:");
+      print_data (out);
+      gpgme_data_release (out);
+    }
+
+  gpgme_data_release (in);
+
+  gpgme_release (ctx);
+  return 0;
+}

Added: gpgme/trunk/tests/gpgsm/cms-keylist.c
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/tests/gpgsm/cms-keylist.c?rev=264&op=file
==============================================================================
--- gpgme/trunk/tests/gpgsm/cms-keylist.c (added)
+++ gpgme/trunk/tests/gpgsm/cms-keylist.c Sun Jul  8 14:44:20 2012
@@ -1,0 +1,125 @@
+/* cms-keylist.c  - Helper to show a key listing.
+   Copyright (C) 2008 g10 Code GmbH
+
+   This file is part of GPGME.
+ 
+   GPGME is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+   
+   GPGME is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* We need to include config.h so that we know whether we are building
+   with large file system (LFS) support. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <gpgme.h>
+
+#define PGM "cms-keylist"
+
+#include "t-support.h"
+
+static const char *
+nonnull (const char *s)
+{
+  return s? s :"[none]";
+}
+
+
+int 
+main (int argc, char **argv)
+{
+  gpgme_error_t err;
+  gpgme_ctx_t ctx;
+  gpgme_key_t key;
+  gpgme_keylist_result_t result;
+
+  if (argc)
+    { argc--; argv++; }
+
+  if (argc > 1)
+    {
+      fputs ("usage: " PGM " [USERID]\n", stderr);
+      exit (1);
+    }
+
+  init_gpgme (GPGME_PROTOCOL_CMS);
+
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
+  gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
+
+  gpgme_set_keylist_mode (ctx, (gpgme_get_keylist_mode (ctx)
+                                | GPGME_KEYLIST_MODE_VALIDATE));
+
+  err = gpgme_op_keylist_start (ctx, argc? argv[0]:NULL, 0);
+  fail_if_err (err);
+    
+  while (!(err = gpgme_op_keylist_next (ctx, &key)))
+    {
+      gpgme_user_id_t uid;
+      int nuids;
+      
+      for (nuids=0, uid=key->uids; uid; uid = uid->next)
+        nuids++;
+
+      printf ("serial  : %s\n", nonnull (key->issuer_serial));
+      printf ("issuer  : %s\n", nonnull (key->issuer_name));
+      printf ("chain-id: %s\n", nonnull (key->chain_id));
+      printf ("caps    : %s%s%s%s\n",
+              key->can_encrypt? "e":"",
+              key->can_sign? "s":"",
+              key->can_certify? "c":"",
+              key->can_authenticate? "a":"");
+      printf ("flags   :%s%s%s%s%s%s\n",
+              key->secret? " secret":"",
+              key->revoked? " revoked":"",
+              key->expired? " expired":"",
+              key->disabled? " disabled":"",
+              key->invalid? " invalid":"",
+              key->is_qualified? " qualifid":"");
+      for (nuids=0, uid=key->uids; uid; uid = uid->next, nuids++)
+        {
+          printf ("userid %d: %s\n", nuids, nonnull(uid->uid));
+          printf ("valid  %d: %s\n", nuids, 
+                  uid->validity == GPGME_VALIDITY_UNKNOWN? "unknown":
+                  uid->validity == GPGME_VALIDITY_UNDEFINED? "undefined":
+                  uid->validity == GPGME_VALIDITY_NEVER? "never":
+                  uid->validity == GPGME_VALIDITY_MARGINAL? "marginal":
+                  uid->validity == GPGME_VALIDITY_FULL? "full":
+                  uid->validity == GPGME_VALIDITY_ULTIMATE? "ultimate": "[?]");
+        }
+
+      putchar ('\n');
+
+      gpgme_key_unref (key);
+    }
+  if (gpg_err_code (err) != GPG_ERR_EOF)
+    fail_if_err (err);
+  err = gpgme_op_keylist_end (ctx);
+  fail_if_err (err);
+
+  result = gpgme_op_keylist_result (ctx);
+  if (result->truncated)
+    {
+      fprintf (stderr, PGM ": key listing unexpectedly truncated\n");
+      exit (1);
+    }
+
+  gpgme_release (ctx);
+  return 0;
+}




More information about the Pkg-gnupg-commit mailing list