summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2013-03-18 22:27:48 +0100
committerStef Walter <stefw@gnome.org>2013-03-18 22:38:29 +0100
commitcaaeaffb86c572f996bec31f67443da2219def84 (patch)
treeddd589a2ca877fc26bfd62c96ac1179edde431cc
parent6c47831b3bfc66e1e995fb27e80c23085bb41e08 (diff)
Release version 0.17.1
* Fix distcheck bugs surrounding the strndup() workaround
-rw-r--r--NEWS16
-rw-r--r--common/compat.c22
-rw-r--r--configure.ac9
3 files changed, 39 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 4112ddb..9fc946c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+0.17.1 (unstable)
+ * Support a p11-kit specific PKCS#11 attribute persistance format [#62156]
+ * Use the SHA1 hash of SPKI as the CKA_ID in the trust module by default [#62329]
+ * Refactor a trust builder which builds objects out of parsed data [#62329]
+ * Combine trust policy when extracting certificates [#61497]
+ * The extract --comment option adds comments to PEM bundles [#62029]
+ * A new 'priority' config option for ordering modules [#61978]
+ * Make each configured path its own trust module token [#61499]
+ * Use --with-trust-paths to configure trust module [#62327]
+ * Fix bug decoding some PEM files
+ * Better debug output for trust module lookups
+ * Work around bug in NSS when doing serial number lookups
+ * Work around broken strndup() function in firefox
+ * Fix the nickname for the distrusted attribute
+ * Build fixes
+
0.16.4 (stable)
* Display per command help again [#62153]
* Don't always print tools debug output [#62152]
diff --git a/common/compat.c b/common/compat.c
index 4a6edb1..4e99d11 100644
--- a/common/compat.c
+++ b/common/compat.c
@@ -424,7 +424,27 @@ memdup (const void *data,
#endif /* HAVE_MEMDUP */
-#ifndef HAVE_STRNDUP
+/*
+ * WORKAROUND: So in lots of released builds of firefox a completely broken strndup()
+ * is present. It does not NULL terminate its string output. It is unconditionally
+ * defined, and overrides the libc strndup() function on platforms where it
+ * exists as a function. For this reason we (for now) unconditionally define
+ * strndup().
+ */
+
+#if 1 /* #ifndef HAVE_STRNDUP */
+
+/*
+ * HAVE_STRNDUP may be undefined if strndup() isn't working. So it may be
+ * present, and yet strndup may still be a defined header macro.
+ */
+#ifdef strndup
+#undef strndup
+#endif
+
+char *
+strndup (const char *data,
+ size_t length);
char *
strndup (const char *data,
diff --git a/configure.ac b/configure.ac
index 02e7793..114f6e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ(2.61)
AC_INIT([p11-kit],
- [0.17.0],
+ [0.17.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=p11-glue],
[p11-kit],
[http://p11-glue.freedesktop.org/p11-kit.html])
@@ -78,15 +78,10 @@ if test "$os_unix" = "yes"; then
# These are thngs we can work around
AC_CHECK_MEMBERS([struct dirent.d_type],,,[#include <dirent.h>])
AC_CHECK_FUNCS([getprogname getexecname basename mkstemp mkdtemp])
- AC_CHECK_FUNCS([strnstr memdup])
+ AC_CHECK_FUNCS([strnstr memdup strndup])
AC_CHECK_FUNCS([asprintf vasprintf vsnprintf])
AC_CHECK_FUNCS([timegm])
- # WORKAROUND: So in lots of released builds of firefox a completely broken strndup()
- # is present. It does not NULL terminate its string output. It is unconditionally
- # defined, and overrides the libc strndup() function on platforms where it
- # exists. For this reason we (for now) unconditionally define strndup().
-
# Required functions
AC_CHECK_FUNCS([gmtime_r],
[AC_DEFINE([HAVE_GMTIME_R], 1, [Whether gmtime_r() is available])],