Release version 0.19.4

diff --git a/NEWS b/NEWS
index ea64056d2ff6fffd03a9e8eb29604dd947bbaa1d..4bae3c21374d1fc63dd4dd71ad08efde789a2e59 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+0.19.4 (unstable)
+ * 'trust anchor' now adds/removes certificate anchors
+ * 'trust list' lists trust policy stuff
+ * 'p11-kit extract' is now 'trust extract'
+ * 'p11-kit extract-trust' is now 'trust extract-compat'
+ * Workarounds for working on broken zfsonlinux.org [#68525]
+ * Add --with-module-config parameter to the configure script [#68122]
+ * Add support for removing stored PKCS#11 objects in trust module
+ * Various debugging tweaks
+
 0.19.3 (unstable)
  * Fix up problems with automake testing
  * Fix a bunch of memory leaks in newly refactored code

diff --git a/configure.ac b/configure.ac
index 5a64e208c4c40781f909d9d290d3314c4e3ccee3..955e52f99a6c85fe6b7daff420fa67f16007ff57 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.61)
 
 AC_INIT([p11-kit],
-       [0.19.3],
+       [0.19.4],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=p11-glue],
        [p11-kit],
        [http://p11-glue.freedesktop.org/p11-kit.html])

diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index e839841924d564257c26841a2201c3dd31cad980..4d6ce6b28770322c5d7358d69eaea697473075f7 100644 (file)
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -77,6 +77,7 @@ content_files=p11-kit-config.xml p11-kit-sharing.xml \
        p11-kit-trust.xml \
        p11-kit.xml \
        pkcs11.conf.xml \
+       trust.xml \
        annotation-glossary.xml \
        $(NULL)
 
@@ -147,9 +148,11 @@ endif # ENABLE_GTK_DOC
 MAN_IN_FILES = \
        $(man8_MANS:.8=.xml) \
        $(man5_MANS:.5=.xml) \
+       $(man1_MANS:.1=.xml) \
        $(NULL)
 
 CLEANFILES += \
+       $(man1_MANS) \
        $(man5_MANS) \
        $(man8_MANS) \
        $(NULL)

diff --git a/trust/Makefile.am b/trust/Makefile.am
index 7410f5d84da9fba36c8a0f66e7e4f8ad41acdc0e..d6d291feb068ba6d29d8d0fdc25ff404549267f9 100644 (file)
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -104,7 +104,7 @@ trust_SOURCES = \
        extract-openssl.c \
        extract-pem.c \
        extract-cer.c \
-       list.c \
+       list.c list.h \
        openssl.asn openssl.asn.h \
        save.c save.h \
        trust.c \

diff --git a/trust/anchor.c b/trust/anchor.c
index a111e14f13d13b62a23bbd7f033f3ea0c6401ff9..d00bef38973525bac59f7176dc99471b521f30ed 100644 (file)
--- a/trust/anchor.c
+++ b/trust/anchor.c
@@ -172,7 +172,7 @@ files_to_attrs (int argc,
        p11_parser *parser;
        p11_array *parsed;
        p11_array *array;
-       int ret;
+       int ret = P11_PARSE_SUCCESS;
        int i, j;
 
        array = p11_array_new (p11_attrs_free);

diff --git a/trust/extract.c b/trust/extract.c
index d12d18b239a5514cc4014ebb68d47f5690fa3328..1a38f11d7fad48bc4a81089707732d553b437302 100644 (file)
--- a/trust/extract.c
+++ b/trust/extract.c
@@ -288,8 +288,8 @@ int
 p11_trust_extract_compat (int argc,
                           char *argv[])
 {
-       char *path;
-       char *path2;
+       char *path = NULL;
+       char *path2 = NULL;
        int error;
 
        argv[argc] = NULL;