aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--NEWS7
-rw-r--r--acinclude.m42
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 81168cc17..f4421045a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-19 David Shaw <[email protected]>
+
+ * NEWS: Note --ask-cert-level.
+
+ * acinclude.m4 (GNUPG_SYS_NM_PARSE): Remove a leftover slash in a
+ sed expression.
+
2004-05-01 Werner Koch <[email protected]>
* acinclude.m4 (ac_pipe_works): Fixed BRE syntax \? -> \{0,1\}.
diff --git a/NEWS b/NEWS
index 874d41b7a..f6bcbe2de 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,13 @@
Noteworthy changes in version 1.2.5 (unreleased)
------------------------------------------------
+ * New --ask-cert-level/--no-ask-cert-level option to turn on and
+ off the prompt for signature level when signing a key. Defaults
+ to off.
+
* New --min-cert-level option to disregard key signatures that are
- under a specified level.
+ under a specified level. Defaults to 1 (i.e. don't disregard
+ anything).
* New --max-output option to limit the amount of plaintext output
generated by GnuPG. This option can be used by programs which
diff --git a/acinclude.m4 b/acinclude.m4
index 68a1ae034..8da484ae2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -610,7 +610,7 @@ dld_preloaded_symbols[] =
changequote([,])dnl
{
EOF
- sed 's/^_\{0,1\}/\(.*\) _\{0,1\}\(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+ sed 's/^_\{0,1\}\(.*\) _\{0,1\}\(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
cat <<\EOF >> conftest.c
{0, (__ptr_t) 0}
};