summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--configure.ac4
-rw-r--r--sm/keylist.c4
-rw-r--r--tests/ChangeLog4
-rw-r--r--tests/asschk.c2
5 files changed, 13 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 415c81ecb..b2639710b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.0.9 (unreleased)
+------------------------------------------------
+
+
Noteworthy changes in version 2.0.8 (2007-12-20)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 1823ac678..e666c1cd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ min_automake_version="1.10"
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.0.8])
-m4_define([my_issvn], [no])
+m4_define([my_version], [2.0.9])
+m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
diff --git a/sm/keylist.c b/sm/keylist.c
index 604f9d986..0f5313eb2 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -491,8 +491,8 @@ list_cert_colon (ctrl_t ctrl, ksba_cert_t cert, unsigned int validity,
kludge_uid = NULL;
for (idx=0; (p = ksba_cert_get_subject (cert,idx)); idx++)
{
- /* In the case that the same email address is in the subecj DN
- as weel as in an alternate subject name we avoid printing it
+ /* In the case that the same email address is in the subject DN
+ as well as in an alternate subject name we avoid printing it
a second time. */
if (kludge_uid && !strcmp (kludge_uid, p))
continue;
diff --git a/tests/ChangeLog b/tests/ChangeLog
index e58eef1d3..273257aba 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-17 Werner Koch <wk@g10code.com>
+
+ * asschk.c (read_assuan): Use __func__ instead of __FUNCTION__.
+
2006-11-05 Werner Koch <wk@g10code.com>
* asschk.c (read_assuan): Minor cleanups.
diff --git a/tests/asschk.c b/tests/asschk.c
index 356613901..176fcac6f 100644
--- a/tests/asschk.c
+++ b/tests/asschk.c
@@ -308,7 +308,7 @@ read_assuan (int fd)
{
int i;
- printf ("%s: read \"", __FUNCTION__);
+ printf ("%s: read \"", __func__);
for (i = 0; i < n; i ++)
putc (buf[i], stdout);
printf ("\"\n");