Fix bug #818.

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

diff --git a/ChangeLog b/ChangeLog
index 893f1716027de856fc811be0e31cc25e2a30e553..24493ba5a2a82ebec3c5fa9568256b7876bc7a1a 100644 (file)
--- a/ChangeLog
+++ b/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

diff --git a/configure.ac b/configure.ac
index aae75e41e3edf4a342efd8a9b87ddea4b6607098..34c7508b20b438d51257c86a3518ead05e494e60 100644 (file)
--- a/configure.ac
+++ b/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

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 58fe8eb5413e155d24765c471809b0b99b79188a..c214412468879de8a6ae0aeb0c703a832d18b774 100644 (file)
--- a/doc/ChangeLog
+++ b/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.

diff --git a/doc/uiserver.texi b/doc/uiserver.texi
index 14a249a16229431f348e86cce3879a2ff3deb651..7c0a1e9a4886f5e7ac8594ac807e6e2445255ee8 100644 (file)
--- a/doc/uiserver.texi
+++ b/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 

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index b1ac8694bb3617b94912a2dc27094342f2c74425..27399528768ea3aff0febfcbdb0dd5b52309902a 100644 (file)
--- a/gpgme/ChangeLog
+++ b/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.

diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am
index c3af79dbb91346c81074e0f7dc35f3c4cf05b977..a3a1066c12687bd53592e4621a05904186a7737e 100644 (file)
--- a/gpgme/Makefile.am
+++ b/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

diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h.in
similarity index 99%
rename from gpgme/gpgme.h
rename to gpgme/gpgme.h.in
index de4f8bbf14724958f4adf32cbcce858a1a2e0ebd..9dc230cb0c21c40765224747401531685d9b9251 100644 (file)
--- a/gpgme/gpgme.h
+++ b/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
-   that for you!  */
-#define GPGME_VERSION "1.1.7-svn1329"
+   library.  */
+#define GPGME_VERSION "@PACKAGE_VERSION@"
 
 
 \f

diff --git a/gpgme/posix-io.c b/gpgme/posix-io.c
index e6a3c676a33ae2ed3ff7c4c20f18be5d2a60a053..8c6888296ca78a5ad58f47071c2c969ddbb44447 100644 (file)
--- a/gpgme/posix-io.c
+++ b/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>