Fix bug #818.

Use gpgme.h.in instead of in-place editing gpgme.h.

ChangeLog

@@ -1,3 +1,8 @@
+2008-10-20  Werner Koch  <wk@g10code.com>
+
+	* configure.ac (AC_CONFIG_FILES): Add gpgme.h.
+	(GNUPG_FIX_HDR_VERSION): Remove.
+
 2008-10-17  Marcus Brinkmann  <marcus@g10code.com>
 
 	Release GPGME 1.1.7.
@@ -828,7 +833,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

configure.ac

@@ -62,7 +62,7 @@ BUILD_REVISION=svn_revision
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
-AC_CONFIG_SRCDIR(gpgme/gpgme.h)
+AC_CONFIG_SRCDIR(gpgme/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 @@ fi
 
 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`
@@ -750,7 +746,8 @@ AC_SUBST(LTLIBOBJS)
 AC_CONFIG_FILES(Makefile assuan/Makefile gpgme/Makefile
 		tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile
 		doc/Makefile complus/Makefile
-                gpgme/versioninfo.rc)
+                gpgme/versioninfo.rc
+                gpgme/gpgme.h)
 AC_CONFIG_FILES(gpgme/gpgme-config, chmod +x gpgme/gpgme-config)
 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
 AC_OUTPUT

doc/ChangeLog

@@ -1,3 +1,8 @@
+2008-10-15  Werner Koch  <wk@g10code.com>
+
+	* uiserver.texi (Miscellaneous UI Server Commands): Add option
+	--protocol to the SENDER command.
+
 2008-07-17  Werner Koch  <wk@g10code.com>
 
 	* module-overview.sk: New.

doc/uiserver.texi

@@ -568,7 +568,7 @@ fully brought up).
 When doing an operation on a mail, it is useful to let the server know
 the address of the sender:
 
-@deffn Command SENDER [-@w{}-info] @var{email}
+@deffn Command SENDER [-@w{}-info] [-@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 @@ If option @option{--info} is not given, the server shall also suggest a
 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 

gpgme/ChangeLog

@@ -1,3 +1,12 @@
+2008-10-20  Werner Koch  <wk@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@g10code.com>
 
 	* w32-util.c (find_program_in_registry): Don't define.

gpgme/Makefile.am

@@ -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

gpgme/gpgme.h.in

@@ -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 @@ extern "C" {
    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
+   library.  */
-   that for you!  */
+#define GPGME_VERSION "@PACKAGE_VERSION@"
-#define GPGME_VERSION "1.1.7-svn1329"
 
 
 

gpgme/posix-io.c

@@ -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>