Imported Upstream version 1.9.0upstream/1.9.0

1 files changed, 91 insertions, 193 deletions

diff --git a/configure b/configure
index 8eb189d..bbf7a1a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gpgme 1.8.0.
+# Generated by GNU Autoconf 2.69 for gpgme 1.9.0.
 #
 # Report bugs to <http://bugs.gnupg.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gpgme'
 PACKAGE_TARNAME='gpgme'
-PACKAGE_VERSION='1.8.0'
-PACKAGE_STRING='gpgme 1.8.0'
+PACKAGE_VERSION='1.9.0'
+PACKAGE_STRING='gpgme 1.9.0'
 PACKAGE_BUGREPORT='http://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -707,6 +707,8 @@ GPGME_QT_CFLAGS
 HAVE_CXX11
 BUILD_W32_GLIB_FALSE
 BUILD_W32_GLIB_TRUE
+HAVE_MACOS_SYSTEM_FALSE
+HAVE_MACOS_SYSTEM_TRUE
 HAVE_ANDROID_SYSTEM_FALSE
 HAVE_ANDROID_SYSTEM_TRUE
 HAVE_W32CE_SYSTEM_FALSE
@@ -1455,7 +1457,7 @@ if test "$ac_init_help" = "long"; then
   # 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.8.0 to adapt to many kinds of systems.
+\`configure' configures gpgme 1.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1525,7 +1527,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gpgme 1.8.0:";;
+     short | recursive ) echo "Configuration of gpgme 1.9.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1673,7 +1675,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gpgme configure 1.8.0
+gpgme configure 1.9.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2503,7 +2505,7 @@ cat >config.log <<_ACEOF
 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.8.0, which was
+It was created by gpgme $as_me 1.9.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2866,19 +2868,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed/changed:	AGE=0)
 #
-LIBGPGME_LT_CURRENT=28
-LIBGPGME_LT_AGE=17
+LIBGPGME_LT_CURRENT=29
+LIBGPGME_LT_AGE=18
 LIBGPGME_LT_REVISION=0
 
 # If there is an ABI break in gpgmepp or qgpgme also bump the
 # version in IMPORTED_LOCATION in the GpgmeppConfig-w32.cmake.in.in
 
-LIBGPGMEPP_LT_CURRENT=9
-LIBGPGMEPP_LT_AGE=3
+LIBGPGMEPP_LT_CURRENT=10
+LIBGPGMEPP_LT_AGE=4
 LIBGPGMEPP_LT_REVISION=0
 
-LIBQGPGME_LT_CURRENT=8
-LIBQGPGME_LT_AGE=1
+LIBQGPGME_LT_CURRENT=9
+LIBQGPGME_LT_AGE=2
 LIBQGPGME_LT_REVISION=0
 
 # If the API is changed in an incompatible way: increment the next counter.
@@ -2894,7 +2896,7 @@ PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
 VERSION_MAJOR=1
-VERSION_MINOR=8
+VERSION_MINOR=9
 VERSION_MICRO=0
 
 ac_aux_dir=
@@ -3416,7 +3418,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gpgme'
- VERSION='1.8.0'
+ VERSION='1.9.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6329,7 +6331,7 @@ cat >>confdefs.h <<_ACEOF
 #define VERSION "$VERSION"
 _ACEOF
 
-VERSION_NUMBER=0x010800
+VERSION_NUMBER=0x010900
 
 
 # We need to compile and run a program on the build machine.  A
@@ -17176,6 +17178,9 @@ case "${host}" in
         ;;
     *-apple-darwin*)
 
+$as_echo "#define _DARWIN_C_SOURCE 900000L" >>confdefs.h
+
+
 $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
 
         ;;
@@ -17199,6 +17204,7 @@ have_dosish_system=no
 have_android_system=no
 have_w32_system=no
 have_w64_system=no
+have_macos_system=no
 build_w32_glib=no
 build_w32_qt=no
 available_languages="cl cpp python python2 python3 qt"
@@ -17213,6 +17219,9 @@ case "${host}" in
     *-linux-androideabi)
         have_android_system=yes
         ;;
+    *-apple-darwin*)
+        have_macos_system=yes
+        ;;
 esac
 case "${host}" in
     *-mingw32ce*|*-mingw32*)
@@ -17588,6 +17597,20 @@ else
 fi
 
 
+if test "$have_macos_system" = yes; then
+
+$as_echo "#define HAVE_MACOS_SYSTEM 1" >>confdefs.h
+
+fi
+ if test "$have_macos_system" = yes; then
+  HAVE_MACOS_SYSTEM_TRUE=
+  HAVE_MACOS_SYSTEM_FALSE='#'
+else
+  HAVE_MACOS_SYSTEM_TRUE='#'
+  HAVE_MACOS_SYSTEM_FALSE=
+fi
+
+
  if test "$build_w32_glib" = yes; then
   BUILD_W32_GLIB_TRUE=
   BUILD_W32_GLIB_FALSE='#'
@@ -18746,7 +18769,7 @@ fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking moc version" >&5
 $as_echo_n "checking moc version... " >&6; }
     mocversion=`$MOC -v 2>&1`
-    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
     if test x"$mocversiongrep" != x"$mocversion"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -18844,7 +18867,7 @@ else
 fi
 
       mocversion=`$MOC2 -v 2>&1`
-      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
+      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
       if test x"$mocversiongrep" != x"$mocversion"; then
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
@@ -18940,7 +18963,7 @@ fi
 
         qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
         mocversion=`$qt5tooldir/moc -v 2>&1`
-        mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+        mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
         if test x"$mocversiongrep" != x"$mocversion"; then
           # no valid moc found
           have_qt5_libs="no";
@@ -19347,7 +19370,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+	for am_cv_pathless_PYTHON in python2 python2.7  python  python3 python3.0 python3.1 python3.2 python3.3   python3.4 python3.5 python3.6 python3.7 python3.8 none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -19419,7 +19442,7 @@ fi
 
 
   if test "$PYTHON" = :; then
-      as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
+      :
   else
 
 
@@ -19564,9 +19587,6 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
 
 
 
-  fi
-
-
 
 	#
 	# Allow the use of a (user set) custom python version
@@ -19745,10 +19765,10 @@ EOD`
 
 		# Make the versioning information available to the compiler
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PYTHON "$ac_python_version"
-_ACEOF
-
+		# JW: We don't need it and it interferes with the hack
+		# to detect multiple Pyhton versions
+		#AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
+                #                  [If available, contains the Python version number currently in use.])
 
 		# First, the library directory:
 		ac_python_libdir=`cat<<EOD | $PYTHON -
@@ -19918,10 +19938,14 @@ $as_echo "$as_me: WARNING:
 	# all done!
 	#
 
-	    if test "$PYTHON_VERSION"; then
-		PYTHONS="$(echo $PYTHONS $PYTHON)"
-		PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
-	    fi
+		if test "$PYTHON_VERSION"; then
+			PYTHONS="$(echo $PYTHONS $PYTHON)"
+			PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
+		fi
+
+  fi
+
+
 	fi
 
 	if test "$found_py" = "1" -o "$found_py3" = "1"; then
@@ -19980,7 +20004,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+	for am_cv_pathless_PYTHON in python2 python2.7  python  python3 python3.0 python3.1 python3.2 python3.3   python3.4 python3.5 python3.6 python3.7 python3.8 none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -20052,7 +20076,7 @@ fi
 
 
   if test "$PYTHON" = :; then
-      as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
+      :
   else
 
 
@@ -20197,9 +20221,6 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
 
 
 
-  fi
-
-
 
 	#
 	# Allow the use of a (user set) custom python version
@@ -20378,10 +20399,10 @@ EOD`
 
 		# Make the versioning information available to the compiler
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PYTHON "$ac_python_version"
-_ACEOF
-
+		# JW: We don't need it and it interferes with the hack
+		# to detect multiple Pyhton versions
+		#AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
+                #                  [If available, contains the Python version number currently in use.])
 
 		# First, the library directory:
 		ac_python_libdir=`cat<<EOD | $PYTHON -
@@ -20551,15 +20572,27 @@ $as_echo "$as_me: WARNING:
 	# all done!
 	#
 
-	    if test "$PYTHON_VERSION"; then
-		PYTHONS="$(echo $PYTHONS $PYTHON)"
-		PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
-	    fi
+		if test "$PYTHON_VERSION"; then
+			PYTHONS="$(echo $PYTHONS $PYTHON)"
+			PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
+		fi
+
+  fi
+
+
 	fi
 
+	# Recover some values lost in the second attempt to find Python.
+	PYTHON="$(echo $PYTHONS | cut -d ' ' -f 1)"
+	PYTHON_VERSION="$(echo $PYTHON_VERSIONS | cut -d ' ' -f 1)"
+
+	# Remove duplicates.
+	PYTHONS="$(echo $PYTHONS | tr '[:space:]' '\n' | sort | uniq | tr '\n' ' ' | sed -e 's/ $//')"
+	PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS | tr '[:space:]' '\n' | sort | uniq | tr '\n' ' ' | sed -e 's/ $//')"
+
 	if test "$PYTHON_VERSIONS"; then
-	   enabled_languages_v=$(echo $enabled_languages | sed "s/python\([23]\)\?/python ($PYTHON_VERSIONS)/")
-	   enabled_languages=$(echo $enabled_languages | sed "s/python\([23]\)\?/python/")
+	   enabled_languages_v=$(echo $enabled_languages | sed -Ee "s/python[23]?/python ($PYTHON_VERSIONS)/")
+	   enabled_languages=$(echo $enabled_languages | sed -Ee "s/python[23]?/python/")
 	else
             if test "$explicit_languages" = "1"; then
                 as_fn_error $? "
@@ -20584,7 +20617,7 @@ ENABLED_LANGUAGES=$enabled_languages
 #
 # Provide information about the build.
 #
-BUILD_REVISION="f06220b"
+BUILD_REVISION="aa0390e"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20593,7 +20626,7 @@ _ACEOF
 
 
 BUILD_FILEVERSION=`echo "$PACKAGE_VERSION"|sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}61538"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}43523"
 
 
 # Check whether --enable-build-timestamp was given.
@@ -21264,85 +21297,6 @@ $as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
 fi
 
 
-ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
-if test "x$ac_cv_func_vasprintf" = xyes; then :
-  $as_echo "#define HAVE_VASPRINTF 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" vasprintf.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext"
- ;;
-esac
-
-fi
-
-
-if test "$ac_cv_func_vasprintf" != yes; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_lists must be copied by value" >&5
-$as_echo_n "checking whether va_lists must be copied by value... " >&6; }
-  if ${gnupg_cv_must_copy_va_byval+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    if test "$cross_compiling" = yes; then
-      gnupg_cv_must_copy_va_byval=no
-    else
-      gnupg_cv_must_copy_va_byval=no
-      if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-       #include <stdarg.h>
-       void f (int i, ...)
-       {
-          va_list args1, args2;
-          va_start (args1, i);
-          args2 = args1;
-          if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
-            exit (1);
-          va_end (args1);
-          va_end (args2);
-       }
-
-       int main()
-       {
-          f (0, 42);
-            return 0;
-       }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gnupg_cv_must_copy_va_byval=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-
-fi
-
-  if test "$gnupg_cv_must_copy_va_byval" = yes; then
-
-$as_echo "#define MUST_COPY_VA_BYVAL 1" >>confdefs.h
-
-  fi
-  if test "$cross_compiling" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming $gnupg_cv_must_copy_va_byval" >&5
-$as_echo "assuming $gnupg_cv_must_copy_va_byval" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnupg_cv_must_copy_va_byval" >&5
-$as_echo "$gnupg_cv_must_copy_va_byval" >&6; }
-  fi
-
-fi
-
 # Try to find a thread-safe version of ttyname().
 ac_fn_c_check_decl "$LINENO" "ttyname_r" "ac_cv_have_decl_ttyname_r" "$ac_includes_default"
 if test "x$ac_cv_have_decl_ttyname_r" = xyes; then :
@@ -22032,60 +21986,8 @@ fi
 # Other checks
 #
 
-# Check for funopen
-for ac_func in funopen
-do :
-  ac_fn_c_check_func "$LINENO" "funopen" "ac_cv_func_funopen"
-if test "x$ac_cv_func_funopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FUNOPEN 1
-_ACEOF
-
-fi
-done
-
-if test $ac_cv_func_funopen != yes; then
-    # No funopen but we can implement that in terms of fopencookie.
-    for ac_func in fopencookie
-do :
-  ac_fn_c_check_func "$LINENO" "fopencookie" "ac_cv_func_fopencookie"
-if test "x$ac_cv_func_fopencookie" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FOPENCOOKIE 1
-_ACEOF
-
-fi
-done
-
-    if test $ac_cv_func_fopencookie = yes; then
-        ac_fn_c_check_func "$LINENO" "funopen" "ac_cv_func_funopen"
-if test "x$ac_cv_func_funopen" = xyes; then :
-  $as_echo "#define HAVE_FUNOPEN 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" funopen.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS funopen.$ac_objext"
- ;;
-esac
-
-fi
-
-
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-***
-*** No implementation of fopencookie or funopen available
-***" >&5
-$as_echo "$as_me: WARNING:
-***
-*** No implementation of fopencookie or funopen available
-***" >&2;}
-    fi
-fi
-
 # Check for getgid etc
-for ac_func in getgid getegid
+for ac_func in getgid getegid closefrom
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -22160,15 +22062,7 @@ $as_echo "$as_me: WARNING:
 fi
 
 
-
-case "${host}" in
-    *-apple-darwin*)
-      use_descriptor_passing=no
-      ;;
-    *)
-      use_descriptor_passing=yes
-      ;;
-esac
+use_descriptor_passing=yes
 # Check whether --enable-fd-passing was given.
 if test "${enable_fd_passing+set}" = set; then :
   enableval=$enable_fd_passing; use_descriptor_passing=$enableval
@@ -22519,6 +22413,10 @@ if test -z "${HAVE_ANDROID_SYSTEM_TRUE}" && test -z "${HAVE_ANDROID_SYSTEM_FALSE
   as_fn_error $? "conditional \"HAVE_ANDROID_SYSTEM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_MACOS_SYSTEM_TRUE}" && test -z "${HAVE_MACOS_SYSTEM_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_MACOS_SYSTEM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_W32_GLIB_TRUE}" && test -z "${BUILD_W32_GLIB_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_W32_GLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22948,7 +22846,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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.8.0, which was
+This file was extended by gpgme $as_me 1.9.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23014,7 +22912,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gpgme config.status 1.8.0
+gpgme config.status 1.9.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -25326,7 +25224,7 @@ fi
 echo "
         GPGME v${VERSION} has been configured as follows:
 
-        Revision:          f06220b  (61538)
+        Revision:          aa0390e  (43523)
         Platform:          $host
 
         UI Server:         $uiserver