summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--NEWS18
-rw-r--r--README4
-rw-r--r--TODO3
-rw-r--r--configure.ac29
5 files changed, 56 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 832ba26ad..3458b7f65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2003-01-09 Werner Koch <wk@gnupg.org>
+
+ * configure.ac (GNUPG_PROTECT_TOOL): New option --with-protect-tool.
+ (NEED_KSBA_VERSION): Does now require 0.4.6.
+
+ * README: Noted where to find gpg-protect-tool.
+
+2002-10-31 Neal H. Walfield <neal@g10code.de>
+
+ * configure.ac: Check for flockfile and funlockfile. Check for
+ isascii and putc_unlocked replacing them if not found.
+
+ * configure.ac (PTH_LIBS): If pth is found, add the output of
+ `$PTH_CONFIG --ldflags`, not just `$PTH_CONFIG --libs`.
+
2002-10-19 Werner Koch <wk@gnupg.org>
* configure.ac: Bumped version number to 1.9.0-cvs.
diff --git a/NEWS b/NEWS
index efacfbdd7..5c8a8342a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,23 @@
Noteworthy changes in version 1.9.0 (unreleased)
------------------------------------------------
- * Merged stuff from the newpg branch and started this new
- development branch.
+ * New gpgsm commands --call-dirmngr and --call-protect-tool.
+ * Changing a passphrase is now possible using "gpgsm --passwd"
- Copyright 2002 Free Software Foundation, Inc.
+ * The content-type attribute is now recognized and created.
+
+ * The agent does now reread certain options on receiving a HUP.
+
+ * The pinentry is now forked for each request so that clients with
+ different environments are supported. When running in daemon mode
+ and --keep-display is not used the DISPLAY variable is ignored.
+
+ * Merged stuff from the newpg branch and started this new
+ development branch.
+
+
+ Copyright 2002, 2003 Free Software Foundation, Inc.
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/README b/README
index 7796a9436..cbc2e8a10 100644
--- a/README
+++ b/README
@@ -354,7 +354,7 @@ There is some limited support to import a private key from a PKCS-12
file. Note, that this does only import the private key and not any
certificates available in that file.
- gpg-protect-tool --p12-import --store foo.p12
+ gpgsm --call-protect-tool --p12-import --store foo.p12
This require that the gpg-agent is running, alternative you may give
the passphrase on the commandline using the option "-P <passphrase>" -
@@ -367,6 +367,6 @@ How to export a private key
There is also limited support to export a private key in PKCS-12
format. However the certificate is not stored and there is no MAC applied.
- gpg-protect-tool --p12-export foo.key >foo.p12
+ gpgsm --call-protect-tool --p12-export foo.key >foo.p12
diff --git a/TODO b/TODO
index 379a1780a..213cbb6d8 100644
--- a/TODO
+++ b/TODO
@@ -40,7 +40,6 @@ might want to have an agent context for each service request
* agent/command.c
** Make sure that secure memory is used where appropriate
-** Implement option passing per connection (DISPLAY and TTY)
* agent/pkdecrypt.c, agent/pksign.c
** Don't use stdio to return results.
@@ -57,5 +56,3 @@ might want to have an agent context for each service request
** Return an error code or a status info per user ID.
-
-
diff --git a/configure.ac b/configure.ac
index ac31adf05..07b38f973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# configure.ac - for GnuPG
+# configure.ac - for NewPG
# Copyright (C) 2001, 2002 Free Software Foundation, Inc,
#
# This file is part of GnuPG.
@@ -21,9 +21,9 @@
AC_PREREQ(2.52)
# Version number: Remember to change it immediately *after* a release.
# Add a "-cvs" prefix for non-released code.
-AC_INIT(newpg, 1.9.0-cvs, gpa-dev@gnupg.org)
+AC_INIT(newpg, 1.9.0-cvs, gnupg-devel@gnupg.org)
NEED_LIBGCRYPT_VERSION=1.1.8
-NEED_KSBA_VERSION=0.4.4
+NEED_KSBA_VERSION=0.4.6
NEED_OPENSC_VERSION=0.7.0
ALL_LINGUAS="de"
@@ -138,6 +138,11 @@ eval my_default_bindir=${exec_prefix}
test "x${my_default_bindir}" = xNONE && my_default_bindir=${ac_default_prefix}
my_default_bindir=${my_default_bindir}/bin
+# Same goes for the pkglibdir which is used to call the gpg-protect-tool.
+eval my_default_pkglibdir=${exec_prefix}
+test "x${my_default_pkglibdir}" = xNONE && my_default_pkglibdir=${ac_default_prefix}
+my_default_pkglibdir=${my_default_pkglibdir}/lib/${PACKAGE_NAME}
+
AC_ARG_WITH(agent-pgm,
[ --with-agent-pgm=PATH Use PATH as the default for the gpg-agent)],
gnupg_agent_pgm="$withval",
@@ -169,6 +174,15 @@ fi
AC_DEFINE_UNQUOTED(GNUPG_DEFAULT_DIRMNGR, "$gnupg_dirmngr_pgm",
[Default location of the dirmngr program])
+AC_ARG_WITH(protect-tool,
+ [ --with-protect-tool=PATH Use PATH as the protect-tool)],
+ gnupg_protect_tool="$withval", gnupg_protect_tool="" )
+if test -z "$gnupg_protect_tool"; then
+ gnupg_protect_tool=${my_default_pkglibdir}/gpg-protect-tool
+fi
+AC_DEFINE_UNQUOTED(GNUPG_PROTECT_TOOL, "$gnupg_protect_tool",
+ [Name of the protect tool program])
+
#
# Checks for libraries.
@@ -245,7 +259,8 @@ else
GNUPG_PTH_VERSION_CHECK(1.3.7)
if test $have_pth = yes; then
PTH_CFLAGS=`$PTH_CONFIG --cflags`
- PTH_LIBS=`$PTH_CONFIG --libs`
+ PTH_LIBS=`$PTH_CONFIG --ldflags`
+ PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs`"
AC_DEFINE(USE_GNU_PTH, 1,
[Defined if the GNU Portable Thread Library should be used])
fi
@@ -279,14 +294,17 @@ GNUPG_SYS_SO_PEERCRED
# These are needed by libjnlib - fixme: we should have a macros for them
AC_CHECK_FUNCS(memicmp stpcpy strlwr strtoul memmove stricmp strtol)
AC_CHECK_FUNCS(getrusage setrlimit stat setlocale)
+AC_CHECK_FUNCS(flockfile funlockfile)
AC_CHECK_FUNCS(sigaction sigprocmask)
AC_REPLACE_FUNCS(vasprintf)
AC_REPLACE_FUNCS(fopencookie)
-# FIXME: Print a warning when that fopencookie is not available.
+# FIXME: Print a warning when fopencookie is not available.
AC_REPLACE_FUNCS(mkdtemp)
AC_REPLACE_FUNCS(fseeko ftello)
+AC_REPLACE_FUNCS(isascii)
+AC_REPLACE_FUNCS(putc_unlocked)
# We use jnlib, so tell other modules about it
AC_DEFINE(HAVE_JNLIB_LOGGING, 1,
@@ -350,6 +368,7 @@ echo "
Agent: $build_agent $build_agent_threaded
Smartcard: $build_scdaemon $build_scdaemon_threaded
+ Protect tool: $gnupg_protect_tool
Default agent: $gnupg_agent_pgm
Default pinentry: $gnupg_pinentry_pgm
Default scdaemon: $gnupg_scdaemon_pgm