-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message This is a patch file to create version 0.3.15 from 0.3.14. Please check the signature of this patch file: zcat somepath/cryptplug-0.3.14-0.3.15.diff.gz | gpg --verify Change to directory cryptplug-0.3.14 (or however you renamed it) and give this command: zcat somepath/cryptplug-0.3.14-0.3.15.diff.gz | patch -p1 It is a good idea to rename your current directory to cryptplug-0.3.15 now. Prereq: 0.3.14 diff -urpP cryptplug-0.3.14/ChangeLog cryptplug-0.3.15/ChangeLog --- cryptplug-0.3.14/ChangeLog Wed Dec 4 14:09:03 2002 +++ cryptplug-0.3.15/ChangeLog Thu Dec 5 09:08:33 2002 @@ -1,3 +1,15 @@ +2002-12-05 Werner Koch + + Released 0.3.15. + + * include/cryptplug.h (interfaceVersion): Document it. + * gpgme/gpgmeplug.c (interfaceVersion): New. + +2002-12-04 Marcus Brinkmann + + * configure.ac: Complete renaming of LIBGPGME_CFLAGS to + GPGME_CFLAGS and LIBGPGME_LIBS to GPGME_LIBS. + 2002-12-04 Werner Koch Initial standalone release as version 0.3.14. diff -urpP cryptplug-0.3.14/Makefile.in cryptplug-0.3.15/Makefile.in --- cryptplug-0.3.14/Makefile.in Wed Dec 4 14:36:21 2002 +++ cryptplug-0.3.15/Makefile.in Thu Dec 5 09:09:16 2002 @@ -91,10 +91,10 @@ CPP = @CPP@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +GPGME_CFLAGS = @GPGME_CFLAGS@ GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBGPGME_CFLAGS = @LIBGPGME_CFLAGS@ -LIBGPGME_LIBS = @LIBGPGME_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ diff -urpP cryptplug-0.3.14/NEWS cryptplug-0.3.15/NEWS --- cryptplug-0.3.14/NEWS Wed Dec 4 14:06:40 2002 +++ cryptplug-0.3.15/NEWS Thu Dec 5 09:00:50 2002 @@ -1,3 +1,9 @@ +Noteworthy changes in version 0.3.15 (2002-12-05) +------------------------------------------------- + + * Introduced the new function interfaceVersion. + + Noteworthy changes in version 0.3.14 (2002-12-04) ------------------------------------------------- diff -urpP cryptplug-0.3.14/configure cryptplug-0.3.15/configure --- cryptplug-0.3.14/configure Wed Dec 4 14:36:36 2002 +++ cryptplug-0.3.15/configure Thu Dec 5 09:09:31 2002 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.1.2.1 . +# From configure.ac Revision: 1.1.2.5 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.56 for cryptplug 0.3.14. +# Generated by GNU Autoconf 2.56 for cryptplug 0.3.15. # # Report bugs to . # @@ -428,8 +428,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='cryptplug' PACKAGE_TARNAME='cryptplug' -PACKAGE_VERSION='0.3.14' -PACKAGE_STRING='cryptplug 0.3.14' +PACKAGE_VERSION='0.3.15' +PACKAGE_STRING='cryptplug 0.3.15' PACKAGE_BUGREPORT='gpa-dev@gnupg.org' ac_unique_file="include/cryptplug.h" @@ -470,7 +470,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL GPGME_CONFIG LIBGPGME_CFLAGS LIBGPGME_LIBS BUILD_CRYPTPLUG_GPGME_TRUE BUILD_CRYPTPLUG_GPGME_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL GPGME_CONFIG GPGME_CFLAGS GPGME_LIBS BUILD_CRYPTPLUG_GPGME_TRUE BUILD_CRYPTPLUG_GPGME_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -939,7 +939,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 cryptplug 0.3.14 to adapt to many kinds of systems. +\`configure' configures cryptplug 0.3.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1005,7 +1005,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cryptplug 0.3.14:";; + short | recursive ) echo "Configuration of cryptplug 0.3.15:";; esac cat <<\_ACEOF @@ -1106,7 +1106,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -cryptplug configure 0.3.14 +cryptplug configure 0.3.15 generated by GNU Autoconf 2.56 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -1121,7 +1121,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 cryptplug $as_me 0.3.14, which was +It was created by cryptplug $as_me 0.3.15, which was generated by GNU Autoconf 2.56. Invocation command line was $ $0 $@ @@ -1457,6 +1457,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Note: When changing the interface, increment the version number returned by +# interfaceVersion () # Add the stamp file to the list of files AC keeps track of, # along with our hook. @@ -4571,7 +4573,7 @@ test "x$enable_libtool_lock" != xno && e case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4574 "configure"' > conftest.$ac_ext + echo '#line 4576 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5104,7 +5106,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5109: \"$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 @@ -6900,7 +6902,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 cat >&5 <<_CSEOF -This file was extended by cryptplug $as_me 0.3.14, which was +This file was extended by cryptplug $as_me 0.3.15, which was generated by GNU Autoconf 2.56. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8285,7 +8287,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -cryptplug config.status 0.3.14 +cryptplug config.status 0.3.15 configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -8536,8 +8538,8 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@EGREP@,$EGREP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@GPGME_CONFIG@,$GPGME_CONFIG,;t t -s,@LIBGPGME_CFLAGS@,$LIBGPGME_CFLAGS,;t t -s,@LIBGPGME_LIBS@,$LIBGPGME_LIBS,;t t +s,@GPGME_CFLAGS@,$GPGME_CFLAGS,;t t +s,@GPGME_LIBS@,$GPGME_LIBS,;t t s,@BUILD_CRYPTPLUG_GPGME_TRUE@,$BUILD_CRYPTPLUG_GPGME_TRUE,;t t s,@BUILD_CRYPTPLUG_GPGME_FALSE@,$BUILD_CRYPTPLUG_GPGME_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t diff -urpP cryptplug-0.3.14/configure.ac cryptplug-0.3.15/configure.ac --- cryptplug-0.3.14/configure.ac Wed Dec 4 14:36:04 2002 +++ cryptplug-0.3.15/configure.ac Thu Dec 5 09:08:32 2002 @@ -18,13 +18,15 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # (Process this file with autoconf to produce a configure script.) -AC_REVISION($Revision: 1.1.2.1 $) +AC_REVISION($Revision: 1.1.2.5 $) AC_PREREQ(2.54) # Remove "-cvs" suffix right *before* doing a release; bump version # number after a release and append "-cvs" again. -AC_INIT(cryptplug, 0.3.14, [gpa-dev@gnupg.org]) +AC_INIT(cryptplug, 0.3.15, [gpa-dev@gnupg.org]) +# Note: When changing the interface, increment the version number returned by +# interfaceVersion () AM_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR(include/cryptplug.h) @@ -89,8 +91,8 @@ if test "$cryptplug_gpgme" != "no"; then GPGME_CFLAGS=`$GPGME_CONFIG --cflags` GPGME_LIBS=`$GPGME_CONFIG --libs` fi - AC_SUBST(LIBGPGME_CFLAGS) - AC_SUBST(LIBGPGME_LIBS) + AC_SUBST(GPGME_CFLAGS) + AC_SUBST(GPGME_LIBS) fi if test "$GPGME_LIBS"; then if test "$cryptplug_gpgme" != "no"; then diff -urpP cryptplug-0.3.14/gpgme/Makefile.in cryptplug-0.3.15/gpgme/Makefile.in --- cryptplug-0.3.14/gpgme/Makefile.in Wed Dec 4 14:37:11 2002 +++ cryptplug-0.3.15/gpgme/Makefile.in Thu Dec 5 09:10:04 2002 @@ -97,10 +97,10 @@ CPP = @CPP@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +GPGME_CFLAGS = @GPGME_CFLAGS@ GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBGPGME_CFLAGS = @LIBGPGME_CFLAGS@ -LIBGPGME_LIBS = @LIBGPGME_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ diff -urpP cryptplug-0.3.14/gpgme/gpgmeplug.c cryptplug-0.3.15/gpgme/gpgmeplug.c --- cryptplug-0.3.14/gpgme/gpgmeplug.c Thu Nov 28 18:33:01 2002 +++ cryptplug-0.3.15/gpgme/gpgmeplug.c Thu Dec 5 08:36:38 2002 @@ -1,6 +1,6 @@ /* -*- Mode: C -*- - $Id: gpgmeplug.c,v 1.2 2002/11/28 18:33:01 marcus Exp $ + $Id: gpgmeplug.c,v 1.2.2.2 2002/12/05 08:36:38 werner Exp $ GPGMEPLUG - an GPGME based cryptography plug-in following the common CRYPTPLUG specification. @@ -335,6 +335,16 @@ bool hasFeature( Feature flag ) const char* libVersion(){ return config.libVersion; } +/* Return the current interface version. This is a simple way for a + user to check whether all required fucntions are available. If + MIN_VERSION is not NULL the lowest supported version of the + interface is returned in addition. */ +int interfaceVersion (int *min_version) +{ + if (min_version) + *min_version = 0; + return 1; +} const char* bugURL(){ return config.bugURL; } diff -urpP cryptplug-0.3.14/include/Makefile.in cryptplug-0.3.15/include/Makefile.in --- cryptplug-0.3.14/include/Makefile.in Wed Dec 4 14:37:01 2002 +++ cryptplug-0.3.15/include/Makefile.in Thu Dec 5 09:09:54 2002 @@ -91,10 +91,10 @@ CPP = @CPP@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +GPGME_CFLAGS = @GPGME_CFLAGS@ GPGME_CONFIG = @GPGME_CONFIG@ +GPGME_LIBS = @GPGME_LIBS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBGPGME_CFLAGS = @LIBGPGME_CFLAGS@ -LIBGPGME_LIBS = @LIBGPGME_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ diff -urpP cryptplug-0.3.14/include/cryptplug.h cryptplug-0.3.15/include/cryptplug.h --- cryptplug-0.3.14/include/cryptplug.h Wed Nov 27 12:33:53 2002 +++ cryptplug-0.3.15/include/cryptplug.h Thu Dec 5 09:08:34 2002 @@ -1,6 +1,6 @@ /* -*- Mode: C -*- - $Id: cryptplug.h,v 1.24 2002/11/27 12:33:53 marcus Exp $ + $Id: cryptplug.h,v 1.24.2.1 2002/12/05 09:08:34 werner Exp $ CRYPTPLUG - an independent cryptography plug-in API @@ -327,6 +327,24 @@ const char* libVersion( void ); this API specification. */ const char* bugURL( void ); + + +/*! \ingroup groupGeneral + \brief Return the current interface version of the plugin. + + Return the current interface version. This is a simple way for a + user to check whether all required fucntions are available. If + MIN_VERSION is not NULL the lowest supported version of the + interface is returned in addition. + + The version is a positive integer. A user should check for the + existance of this function before using it; if the fucntion does + not exist, a interface version of 0 should be assumed. + + This function may be called prior to initialize(). + */ +int interfaceVersion (int *min_version); + /*! \ingroup groupGeneral \brief This function sets up all internal structures. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE97xi2aLeriVdUjc0RAnbkAKCJrEkFkqyAwkYXAdsBdSh+M8XWwwCfSXRt +fRhJLgiULi4xUUeGOB982w= =7/Gs -----END PGP SIGNATURE-----