-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message This is a patch file to create version 0.3.14 from 0.3.13. Please check the signature of this patch file: zcat somepath/gpgme-0.3.13-0.3.14.diff.gz | gpg --verify Change to directory gpgme-0.3.13 (or however you renamed it) and give this command: zcat somepath/gpgme-0.3.13-0.3.14.diff.gz | patch -p1 It is a good idea to rename your current directory to gpgme-0.3.14 now. Prereq: 0.3.13 diff -urpP gpgme-0.3.13/VERSION gpgme-0.3.14/VERSION --- gpgme-0.3.13/VERSION Wed Nov 20 18:59:44 2002 +++ gpgme-0.3.14/VERSION Wed Dec 4 13:35:45 2002 @@ -1 +1 @@ -0.3.13 +0.3.14 diff -urpP gpgme-0.3.13/AUTHORS gpgme-0.3.14/AUTHORS --- gpgme-0.3.13/AUTHORS Tue Jul 2 08:51:06 2002 +++ gpgme-0.3.14/AUTHORS Fri Nov 29 09:09:03 2002 @@ -1,5 +1,5 @@ Package: gpgme -Maintainer: Markus Brinkmann +Maintainer: Marcus Brinkmann Bug reports: bug-gpgme@gnupg.org Security related bug reports: security@gnupg.org diff -urpP gpgme-0.3.13/ChangeLog gpgme-0.3.14/ChangeLog --- gpgme-0.3.13/ChangeLog Wed Nov 20 18:55:21 2002 +++ gpgme-0.3.14/ChangeLog Wed Dec 4 13:09:51 2002 @@ -1,3 +1,27 @@ +2002-12-04 Werner Koch + + Released 0.3.14. + + * configure.ac (LIBGPGME_LT_REVISION): Bumped to 9/3/5 . + * README: Explained that this is the current stable version. + +2002-11-28 Marcus Brinkmann + + * NEWS: Add note about moving "gpgmeplug" to the "cryptplug" + package. + * README: Remove instructions related to "gpgmeplug". + * configure.ac: Remove enable option "gpgmeplug" and automake + conditional BUILD_GPGMEPLUG, as well as the status info about it. + (GPGMEPLUG): Remove variable. + * Makefile.am (gpgmeplug): Remove variable. + (SUBDIRS): Remove ${gpgmeplug}. + * cryptplug.h, gpgme-openpgp.c, gpgmeplug.dox, gpgme-smime.c, + Makefile.am, gpgmeplug.c, ChangeLog: Files removed. + +2002-11-22 Marcus Brinkmann + + * configure.ac: Disable GPGSM for all dosish systems. + 2002-11-20 Werner Koch Released 0.3.13 diff -urpP gpgme-0.3.13/Makefile.am gpgme-0.3.14/Makefile.am --- gpgme-0.3.13/Makefile.am Wed Aug 21 08:51:12 2002 +++ gpgme-0.3.14/Makefile.am Fri Nov 29 09:09:03 2002 @@ -1,5 +1,5 @@ # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2002 g10 Code GmbH # # This file is part of GPGME. # @@ -45,13 +45,7 @@ else tests = endif -if BUILD_GPGMEPLUG -gpgmeplug = gpgmeplug -else -gpgmeplug = -endif - -SUBDIRS = ${assuan} gpgme ${tests} doc ${bonobo} ${complus} ${gpgmeplug} +SUBDIRS = ${assuan} gpgme ${tests} doc ${bonobo} ${complus} # Fix the version of the spec file and create a file named VERSION # to be used for patch's Prereq: feature. diff -urpP gpgme-0.3.13/Makefile.in gpgme-0.3.14/Makefile.in --- gpgme-0.3.13/Makefile.in Wed Nov 20 18:57:02 2002 +++ gpgme-0.3.14/Makefile.in Wed Dec 4 13:11:49 2002 @@ -15,7 +15,7 @@ @SET_MAKE@ # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2002 g10 Code GmbH # # This file is part of GPGME. # @@ -131,10 +131,7 @@ EXTRA_DIST = README-alpha autogen.sh gpg @RUN_GPG_TESTS_TRUE@tests = tests @RUN_GPG_TESTS_FALSE@tests = -@BUILD_GPGMEPLUG_TRUE@gpgmeplug = gpgmeplug -@BUILD_GPGMEPLUG_FALSE@gpgmeplug = - -SUBDIRS = ${assuan} gpgme ${tests} doc ${bonobo} ${complus} ${gpgmeplug} +SUBDIRS = ${assuan} gpgme ${tests} doc ${bonobo} ${complus} subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -150,7 +147,7 @@ DIST_COMMON = README AUTHORS COPYING Cha Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 \ config.guess config.h.in config.sub configure configure.ac \ depcomp install-sh ltmain.sh missing mkinstalldirs -DIST_SUBDIRS = assuan gpgme tests doc bonobo complus gpgmeplug +DIST_SUBDIRS = assuan gpgme tests doc bonobo complus all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -urpP gpgme-0.3.13/NEWS gpgme-0.3.14/NEWS --- gpgme-0.3.13/NEWS Wed Nov 20 18:53:22 2002 +++ gpgme-0.3.14/NEWS Wed Dec 4 12:54:52 2002 @@ -1,3 +1,11 @@ +Noteworthy changes in version 0.3.14 (2002-12-04) +------------------------------------------------- + + * GPGME-Plug is now in its own package "cryptplug". + + * Workaround for a setlocale problem. Fixed a segv related to not + correctly as closed marked file descriptors. + Noteworthy changes in version 0.3.13 (2002-11-20) ------------------------------------------------- diff -urpP gpgme-0.3.13/README gpgme-0.3.14/README --- gpgme-0.3.13/README Tue Oct 15 09:50:41 2002 +++ gpgme-0.3.14/README Wed Dec 4 13:09:38 2002 @@ -1,7 +1,11 @@ GPGME - GnuPG Made Easy --------------------------- + Version 0.3 - !!!! THIS IS WORK IN PROGRESS !!! +This is the stable branch of GPGME. We don't intend to make any +changes to the API anymore but OTOH we won't add any new features. +The development version is available in the CVS; after we have +released that onem we will slowly fade out support for this 0.3 branch. If you want to hack on it, start with one of the `tests/gpg/t-foo' programs. @@ -18,12 +22,6 @@ need at least newpg 0.9.2 If configure can't find the `gpgsm' binary in your path, you can specify the location with the --with-gpgsm=/path/to/gpgsm argument to configure. - -To enable the CryptPlug GPGME PlugIn for both protocols, use the -`--enable-gpgmeplug' option to the configure script. `gpgmeplug' is -experimental and you should not assume that it will stay with gpgme. -The plug-ins are installed by `make install' in `pkglibdir', normally -`PREFIX/lib/gpgme'. Before building the CVS version following the generic install instructions in `INSTALL', you need to set up the build scripts with diff -urpP gpgme-0.3.13/configure gpgme-0.3.14/configure --- gpgme-0.3.13/configure Wed Nov 20 18:57:23 2002 +++ gpgme-0.3.14/configure Wed Dec 4 13:12:11 2002 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.43.2.3 . +# From configure.ac Revision: 1.43.2.6 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for gpgme 0.3.13. +# Generated by GNU Autoconf 2.53 for gpgme 0.3.14. # # Report bugs to . # @@ -416,8 +416,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gpgme' PACKAGE_TARNAME='gpgme' -PACKAGE_VERSION='0.3.13' -PACKAGE_STRING='gpgme 0.3.13' +PACKAGE_VERSION='0.3.14' +PACKAGE_STRING='gpgme 0.3.14' PACKAGE_BUGREPORT='bug-gpgme@gnupg.org' ac_unique_file="gpgme/gpgme.h" @@ -922,7 +922,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 0.3.13 to adapt to many kinds of systems. +\`configure' configures gpgme 0.3.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -988,7 +988,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gpgme 0.3.13:";; + short | recursive ) echo "Configuration of gpgme 0.3.14:";; esac cat <<\_ACEOF @@ -1003,7 +1003,6 @@ Optional Features: --enable-static=PKGS build static libraries default=yes --enable-fast-install=PKGS optimize for fast installation default=yes --disable-libtool-lock avoid locking (might break parallel builds) - --enable-gpgmeplug build GPGME Crypt Plug-In Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1090,7 +1089,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -gpgme configure 0.3.13 +gpgme configure 0.3.14 generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -1105,7 +1104,7 @@ cat >&5 <<_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 0.3.13, which was +It was created by gpgme $as_me 0.3.14, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1391,7 +1390,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # LIBGPGME_LT_CURRENT=9 LIBGPGME_LT_AGE=3 -LIBGPGME_LT_REVISION=4 +LIBGPGME_LT_REVISION=5 NEED_GPG_VERSION=1.2.0 NEED_GPGSM_VERSION=0.9.2 ############################################## @@ -4347,7 +4346,7 @@ test "x$enable_libtool_lock" != xno && e case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4350 "configure"' > conftest.$ac_ext + echo '#line 4349 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4879,7 +4878,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6693,7 +6692,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < fixhdr.tmp if cmp -s $srcdir/gpgme/gpgme.h fixhdr.tmp 2>/dev/null; then rm -f fixhdr.tmp @@ -9546,7 +9528,7 @@ LTLIBOBJS=`echo "$LIBOBJS" | -ac_config_files="$ac_config_files Makefile assuan/Makefile gpgme/Makefile tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile doc/Makefile bonobo/Makefile complus/Makefile gpgmeplug/Makefile" +ac_config_files="$ac_config_files Makefile assuan/Makefile gpgme/Makefile tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile doc/Makefile bonobo/Makefile complus/Makefile" ac_config_files="$ac_config_files gpgme/gpgme-config" @@ -9696,13 +9678,6 @@ echo "$as_me: error: conditional \"BUILD Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${BUILD_GPGMEPLUG_TRUE}" && test -z "${BUILD_GPGMEPLUG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_GPGMEPLUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_GPGMEPLUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -9952,7 +9927,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by gpgme $as_me 0.3.13, which was +This file was extended by gpgme $as_me 0.3.14, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10014,7 +9989,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gpgme config.status 0.3.13 +gpgme config.status 0.3.14 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -10117,7 +10092,6 @@ do "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "bonobo/Makefile" ) CONFIG_FILES="$CONFIG_FILES bonobo/Makefile" ;; "complus/Makefile" ) CONFIG_FILES="$CONFIG_FILES complus/Makefile" ;; - "gpgmeplug/Makefile" ) CONFIG_FILES="$CONFIG_FILES gpgmeplug/Makefile" ;; "gpgme/gpgme-config" ) CONFIG_FILES="$CONFIG_FILES gpgme/gpgme-config" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; @@ -10278,8 +10252,6 @@ s,@BUILD_COMPLUS_TRUE@,$BUILD_COMPLUS_TR s,@BUILD_COMPLUS_FALSE@,$BUILD_COMPLUS_FALSE,;t t s,@BUILD_BONOBO_TRUE@,$BUILD_BONOBO_TRUE,;t t s,@BUILD_BONOBO_FALSE@,$BUILD_BONOBO_FALSE,;t t -s,@BUILD_GPGMEPLUG_TRUE@,$BUILD_GPGMEPLUG_TRUE,;t t -s,@BUILD_GPGMEPLUG_FALSE@,$BUILD_GPGMEPLUG_FALSE,;t t s,@GPGME_CONFIG_LIBS@,$GPGME_CONFIG_LIBS,;t t s,@GPGME_CONFIG_CFLAGS@,$GPGME_CONFIG_CFLAGS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t @@ -10885,6 +10857,4 @@ echo " GpgSM version: min. $NEED_GPGSM_VERSION GpgSM path: $GPGSM - - GPGME CryptPlug: $GPGMEPLUG " diff -urpP gpgme-0.3.13/configure.ac gpgme-0.3.14/configure.ac --- gpgme-0.3.13/configure.ac Wed Nov 20 18:56:32 2002 +++ gpgme-0.3.14/configure.ac Wed Dec 4 13:11:15 2002 @@ -21,7 +21,7 @@ # (Process this file with autoconf to produce a configure script.) # Version number: Remember to change it immediately *after* a release. -AC_INIT(gpgme, 0.3.13, [bug-gpgme@gnupg.org]) +AC_INIT(gpgme, 0.3.14, [bug-gpgme@gnupg.org]) # LT Version numbers, remember to change them just *before* a release. # (Code changed: REVISION++) # (Interfaces added/removed/changed: CURRENT++, REVISION=0) @@ -30,12 +30,12 @@ AC_INIT(gpgme, 0.3.13, [bug-gpgme@gnupg. # LIBGPGME_LT_CURRENT=9 LIBGPGME_LT_AGE=3 -LIBGPGME_LT_REVISION=4 +LIBGPGME_LT_REVISION=5 NEED_GPG_VERSION=1.2.0 NEED_GPGSM_VERSION=0.9.2 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.43.2.3 $) +AC_REVISION($Revision: 1.43.2.6 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION @@ -239,12 +239,6 @@ AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGS AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+") AM_CONDITIONAL(BUILD_BONOBO, test "$component_system" = "Bonobo") -GPGMEPLUG=no -AC_ARG_ENABLE(gpgmeplug, - AC_HELP_STRING([--enable-gpgmeplug], [build GPGME Crypt Plug-In]), - GPGMEPLUG=$enableval) -AM_CONDITIONAL(BUILD_GPGMEPLUG, test "$GPGMEPLUG" = "yes") - dnl Make the version number in gpgme/gpgme.h the same as the one here. dnl (this is easier than to have a *.in file just for one substitution) GNUPG_FIX_HDR_VERSION(gpgme/gpgme.h, GPGME_VERSION) @@ -267,7 +261,7 @@ dnl AC_CONFIG_FILES(Makefile assuan/Makefile gpgme/Makefile tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile doc/Makefile - bonobo/Makefile complus/Makefile gpgmeplug/Makefile) + bonobo/Makefile complus/Makefile) AC_CONFIG_FILES(gpgme/gpgme-config, chmod +x gpgme/gpgme-config) AC_OUTPUT @@ -279,6 +273,4 @@ echo " GpgSM version: min. $NEED_GPGSM_VERSION GpgSM path: $GPGSM - - GPGME CryptPlug: $GPGMEPLUG " diff -urpP gpgme-0.3.13/doc/stamp-vti gpgme-0.3.14/doc/stamp-vti --- gpgme-0.3.13/doc/stamp-vti Wed Nov 20 18:59:02 2002 +++ gpgme-0.3.14/doc/stamp-vti Wed Dec 4 13:13:57 2002 @@ -1,4 +1,4 @@ @set UPDATED 12 November 2002 @set UPDATED-MONTH November 2002 -@set EDITION 0.3.13 -@set VERSION 0.3.13 +@set EDITION 0.3.14 +@set VERSION 0.3.14 diff -urpP gpgme-0.3.13/doc/version.texi gpgme-0.3.14/doc/version.texi --- gpgme-0.3.13/doc/version.texi Wed Nov 13 22:00:36 2002 +++ gpgme-0.3.14/doc/version.texi Wed Dec 4 12:56:24 2002 @@ -1,4 +1,4 @@ @set UPDATED 12 November 2002 @set UPDATED-MONTH November 2002 -@set EDITION 0.3.13 -@set VERSION 0.3.13 +@set EDITION 0.3.14 +@set VERSION 0.3.14 diff -urpP gpgme-0.3.13/gpgme/ChangeLog gpgme-0.3.14/gpgme/ChangeLog --- gpgme-0.3.13/gpgme/ChangeLog Wed Nov 20 18:45:31 2002 +++ gpgme-0.3.14/gpgme/ChangeLog Fri Nov 29 09:09:03 2002 @@ -1,3 +1,26 @@ +2002-11-25 Marcus Brinkmann + + * rungpg.c (_gpgme_gpg_spawn): Do not set parent fds to -1. + * posix-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead close + for parent fds. + * w32-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead + CloseHandle for parent fds. + +2002-11-22 Marcus Brinkmann + + * gpgme.h [_MSC_VER]: Define ssize_t as long. + +2002-11-22 Werner Koch + + * engine-gpgsm.c (_gpgme_gpgsm_new): Save the result of a first + setlocale before doing another setlocale. + +2002-11-21 Marcus Brinkmann + + * verify.c (_gpgme_verify_status_handler): Treat + GPGME_STATUS_UNEXPECTED like GPGME_STATUS_NODATA. + Reported by Miguel Coca . + 2002-11-19 Marcus Brinkmann * rungpg.c (gpg_keylist): Add --with-fingerprint to gpg invocation diff -urpP gpgme-0.3.13/gpgme/engine-gpgsm.c gpgme-0.3.14/gpgme/engine-gpgsm.c --- gpgme-0.3.13/gpgme/engine-gpgsm.c Mon Sep 30 08:00:30 2002 +++ gpgme-0.3.14/gpgme/engine-gpgsm.c Fri Nov 22 11:04:31 2002 @@ -450,7 +450,17 @@ _gpgme_gpgsm_new (GpgsmObject *r_gpgsm) goto leave; } } + old_lc = setlocale (LC_CTYPE, NULL); + if (old_lc) + { + old_lc = strdup (old_lc); + if (!old_lc) + { + err = GPGME_Out_Of_Core; + goto leave; + } + } dft_lc = setlocale (LC_CTYPE, ""); if (dft_lc) { @@ -458,19 +468,32 @@ _gpgme_gpgsm_new (GpgsmObject *r_gpgsm) err = mk_error (Out_Of_Core); else { - err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL, - NULL); + err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, + NULL, NULL, NULL, NULL); free (optstr); if (err) err = map_assuan_error (err); } } if (old_lc) - setlocale (LC_CTYPE, old_lc); + { + setlocale (LC_CTYPE, old_lc); + free (old_lc); + } if (err) goto leave; + old_lc = setlocale (LC_MESSAGES, NULL); + if (old_lc) + { + old_lc = strdup (old_lc); + if (!old_lc) + { + err = GPGME_Out_Of_Core; + goto leave; + } + } dft_lc = setlocale (LC_MESSAGES, ""); if (dft_lc) { @@ -486,7 +509,10 @@ _gpgme_gpgsm_new (GpgsmObject *r_gpgsm) } } if (old_lc) - setlocale (LC_MESSAGES, old_lc); + { + setlocale (LC_MESSAGES, old_lc); + free (old_lc); + } if (err) goto leave; } diff -urpP gpgme-0.3.13/gpgme/gpgme.h gpgme-0.3.14/gpgme/gpgme.h --- gpgme-0.3.13/gpgme/gpgme.h Wed Nov 13 21:58:07 2002 +++ gpgme-0.3.14/gpgme/gpgme.h Wed Dec 4 12:53:14 2002 @@ -25,6 +25,7 @@ #include /* For FILE *. */ #ifdef _MSC_VER typedef long off_t; + typedef long ssize_t; #else # include #endif @@ -43,7 +44,7 @@ extern "C" { 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 "0.3.13" +#define GPGME_VERSION "0.3.14" /* The opaque data types used by GPGME. */ diff -urpP gpgme-0.3.13/gpgme/posix-io.c gpgme-0.3.14/gpgme/posix-io.c --- gpgme-0.3.13/gpgme/posix-io.c Tue Sep 3 14:55:46 2002 +++ gpgme-0.3.14/gpgme/posix-io.c Fri Nov 29 09:09:03 2002 @@ -257,7 +257,7 @@ _gpgme_io_spawn (const char *path, char /* .dup_to is not used in the parent list. */ for (i = 0; fd_parent_list[i].fd != -1; i++) - close (fd_parent_list[i].fd); + _gpgme_io_close (fd_parent_list[i].fd); return 0; } diff -urpP gpgme-0.3.13/gpgme/rungpg.c gpgme-0.3.14/gpgme/rungpg.c --- gpgme-0.3.13/gpgme/rungpg.c Wed Nov 20 18:45:32 2002 +++ gpgme-0.3.14/gpgme/rungpg.c Fri Nov 29 09:09:03 2002 @@ -890,21 +890,18 @@ _gpgme_gpg_spawn (GpgObject gpg, void *o fd_parent_list[n].fd = gpg->status.fd[1]; fd_parent_list[n].dup_to = -1; n++; - gpg->status.fd[1] = -1; } if (gpg->colon.fd[1] != -1) { fd_parent_list[n].fd = gpg->colon.fd[1]; fd_parent_list[n].dup_to = -1; n++; - gpg->colon.fd[1] = -1; } for (i = 0; gpg->fd_data_map[i].data; i++) { fd_parent_list[n].fd = gpg->fd_data_map[i].peer_fd; fd_parent_list[n].dup_to = -1; n++; - gpg->fd_data_map[i].peer_fd = -1; } fd_parent_list[n].fd = -1; fd_parent_list[n].dup_to = -1; diff -urpP gpgme-0.3.13/gpgme/verify.c gpgme-0.3.14/gpgme/verify.c --- gpgme-0.3.13/gpgme/verify.c Thu Aug 1 10:17:13 2002 +++ gpgme-0.3.14/gpgme/verify.c Fri Nov 22 15:01:12 2002 @@ -225,6 +225,7 @@ _gpgme_verify_status_handler (GpgmeCtx c switch (code) { case GPGME_STATUS_NODATA: + case GPGME_STATUS_UNEXPECTED: ctx->result.verify->status = GPGME_SIG_STAT_NOSIG; break; diff -urpP gpgme-0.3.13/gpgme.spec gpgme-0.3.14/gpgme.spec --- gpgme-0.3.13/gpgme.spec Wed Nov 20 18:59:44 2002 +++ gpgme-0.3.14/gpgme.spec Wed Dec 4 13:35:45 2002 @@ -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: 0.3.13 +Version: 0.3.14 Release: 1 URL: http://www.gnupg.org/gpgme.html Source: ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/%{name}-%{version}.tar.gz Only in gpgme-0.3.13/: gpgmeplug diff -urpP gpgme-0.3.13/tests/ChangeLog gpgme-0.3.14/tests/ChangeLog --- gpgme-0.3.13/tests/ChangeLog Mon Sep 30 06:43:39 2002 +++ gpgme-0.3.14/tests/ChangeLog Wed Dec 4 13:34:49 2002 @@ -1,3 +1,8 @@ +2002-12-04 Werner Koch + + * gpgsm/Makefile.am (./gpgsm.conf): Use a faked system time + becuase one test certificate expired yesterday. + 2002-09-30 Werner Koch * gpgsm/t-keylist.c (doit): Add arg SECRET. diff -urpP gpgme-0.3.13/tests/gpgsm/Makefile.am gpgme-0.3.14/tests/gpgsm/Makefile.am --- gpgme-0.3.13/tests/gpgsm/Makefile.am Tue Jun 25 19:05:22 2002 +++ gpgme-0.3.14/tests/gpgsm/Makefile.am Wed Dec 4 13:32:33 2002 @@ -46,6 +46,7 @@ all-local: ./pubring.kbx ./gpgsm.conf ./ ./gpgsm.conf: echo disable-crl-checks > ./gpgsm.conf + echo faked-system-time 1038835799 >> ./gpgsm.conf ./private-keys-v1.d/$(key_id).key: $(srcdir)/$(key_id) test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d diff -urpP gpgme-0.3.13/tests/gpgsm/Makefile.in gpgme-0.3.14/tests/gpgsm/Makefile.in --- gpgme-0.3.13/tests/gpgsm/Makefile.in Wed Nov 20 18:58:48 2002 +++ gpgme-0.3.14/tests/gpgsm/Makefile.in Wed Dec 4 13:32:54 2002 @@ -491,6 +491,7 @@ all-local: ./pubring.kbx ./gpgsm.conf ./ ./gpgsm.conf: echo disable-crl-checks > ./gpgsm.conf + echo faked-system-time 1038835799 >> ./gpgsm.conf ./private-keys-v1.d/$(key_id).key: $(srcdir)/$(key_id) test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE97ghqaLeriVdUjc0RAsZ7AJsEmXtnbKoZ+yaCPn0hZ10sEaAKFgCfcPFw o9perEjkXqvHsyApYKReLdQ= =h4/Q -----END PGP SIGNATURE-----