From 825c37950e52af08de5111d34084be4724ea4691 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 18 May 2017 13:01:47 +0200 Subject: [PATCH 01/79] Make "trust anchor --remove" work again --- p11-kit-modifiable.patch | 158 +++++++++++++++++++++++++++++++++++++++ p11-kit.spec | 7 +- 2 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 p11-kit-modifiable.patch diff --git a/p11-kit-modifiable.patch b/p11-kit-modifiable.patch new file mode 100644 index 0000000..958bc4f --- /dev/null +++ b/p11-kit-modifiable.patch @@ -0,0 +1,158 @@ +From acf8c4a91a76bf8049f6bfbd95b04e2e36bae4ea Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Thu, 18 May 2017 10:45:26 +0200 +Subject: [PATCH 1/2] Revert "trust: Honor "modifiable" setting in persist + file" + +This reverts commit 8eed1e60b0921d05872e2f43eee9088cef038d7e, which +broke "trust anchor --remove". +--- + trust/input/verisign-v1.p11-kit | 1 - + trust/parser.c | 10 +--------- + trust/test-parser.c | 1 - + 3 files changed, 1 insertion(+), 11 deletions(-) + +diff --git a/trust/input/verisign-v1.p11-kit b/trust/input/verisign-v1.p11-kit +index aea49ea..eaa080d 100644 +--- a/trust/input/verisign-v1.p11-kit ++++ b/trust/input/verisign-v1.p11-kit +@@ -1,6 +1,5 @@ + [p11-kit-object-v1] + trusted: true +-modifiable: false + + -----BEGIN CERTIFICATE----- + MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkG +diff --git a/trust/parser.c b/trust/parser.c +index 52d1128..41513d4 100644 +--- a/trust/parser.c ++++ b/trust/parser.c +@@ -610,7 +610,6 @@ p11_parser_format_persist (p11_parser *parser, + { + CK_BBOOL modifiablev = CK_TRUE; + CK_ATTRIBUTE *attrs; +- CK_ATTRIBUTE *attr; + p11_array *objects; + bool ret; + int i; +@@ -631,14 +630,7 @@ p11_parser_format_persist (p11_parser *parser, + ret = p11_persist_read (parser->persist, parser->basename, data, length, objects); + if (ret) { + for (i = 0; i < objects->num; i++) { +- /* By default, we mark objects read from a persist +- * file as modifiable, as the persist format is +- * writable. However, if CKA_MODIFIABLE is explictly +- * set in the file, respect the setting. */ +- attrs = objects->elem[i]; +- attr = p11_attrs_find_valid (objects->elem[i], CKA_MODIFIABLE); +- if (!attr) +- attrs = p11_attrs_build (attrs, &modifiable, NULL); ++ attrs = p11_attrs_build (objects->elem[i], &modifiable, NULL); + sink_object (parser, attrs); + } + } +diff --git a/trust/test-parser.c b/trust/test-parser.c +index 088cff9..b5c2525 100644 +--- a/trust/test-parser.c ++++ b/trust/test-parser.c +@@ -168,7 +168,6 @@ test_parse_p11_kit_persist (void) + { CKA_CLASS, &certificate, sizeof (certificate) }, + { CKA_VALUE, (void *)verisign_v1_ca, sizeof (verisign_v1_ca) }, + { CKA_TRUSTED, &truev, sizeof (truev) }, +- { CKA_MODIFIABLE, &falsev, sizeof (falsev) }, + { CKA_X_DISTRUSTED, &falsev, sizeof (falsev) }, + { CKA_INVALID }, + }; +-- +2.9.4 + + +From 66c6a7e912d39d66cd4cc91375ac7be418bf7176 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Thu, 18 May 2017 11:11:45 +0200 +Subject: [PATCH 2/2] trust: Check magic comment in persist file for + modifiablity + +A persistent file written by the trust module starts with the line "# +This file has been auto-generated and written by p11-kit". This can +be used as a magic word to determine whether the objects read from a +.p11-kit file are read-only. +--- + trust/parser.c | 6 +++++- + trust/persist.c | 9 ++++++++- + trust/test-token.c | 1 + + 3 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/trust/parser.c b/trust/parser.c +index 41513d4..abe86fc 100644 +--- a/trust/parser.c ++++ b/trust/parser.c +@@ -49,6 +49,7 @@ + #include "pem.h" + #include "pkcs11x.h" + #include "persist.h" ++#include "types.h" + #include "x509.h" + + #include +@@ -630,7 +631,10 @@ p11_parser_format_persist (p11_parser *parser, + ret = p11_persist_read (parser->persist, parser->basename, data, length, objects); + if (ret) { + for (i = 0; i < objects->num; i++) { +- attrs = p11_attrs_build (objects->elem[i], &modifiable, NULL); ++ CK_BBOOL generatedv; ++ attrs = objects->elem[i]; ++ if (p11_attrs_find_bool (attrs, CKA_X_GENERATED, &generatedv) && generatedv) ++ attrs = p11_attrs_build (attrs, &modifiable, NULL); + sink_object (parser, attrs); + } + } +diff --git a/trust/persist.c b/trust/persist.c +index 63a531e..928260e 100644 +--- a/trust/persist.c ++++ b/trust/persist.c +@@ -631,6 +631,9 @@ p11_persist_read (p11_persist *persist, + CK_ATTRIBUTE *attrs; + bool failed; + bool skip; ++ CK_BBOOL generatedv = CK_FALSE; ++ CK_ATTRIBUTE generated = { CKA_X_GENERATED, &generatedv, sizeof (generatedv) }; ++ static const char comment[] = "# This file has been auto-generated and written by p11-kit."; + + return_val_if_fail (persist != NULL, false); + return_val_if_fail (objects != NULL, false); +@@ -639,6 +642,10 @@ p11_persist_read (p11_persist *persist, + attrs = NULL; + failed = false; + ++ if (length >= sizeof (comment) - 1 && ++ memcmp ((const char *)data, comment, sizeof (comment) - 1) == 0) ++ generatedv = CK_TRUE; ++ + p11_lexer_init (&lexer, filename, (const char *)data, length); + while (p11_lexer_next (&lexer, &failed)) { + switch (lexer.tok_type) { +@@ -650,7 +657,7 @@ p11_persist_read (p11_persist *persist, + p11_lexer_msg (&lexer, "unrecognized or invalid section header"); + skip = true; + } else { +- attrs = p11_attrs_build (NULL, NULL); ++ attrs = p11_attrs_build (NULL, &generated, NULL); + return_val_if_fail (attrs != NULL, false); + skip = false; + } +diff --git a/trust/test-token.c b/trust/test-token.c +index ad22fcb..3e7d735 100644 +--- a/trust/test-token.c ++++ b/trust/test-token.c +@@ -610,6 +610,7 @@ static void + test_modify_multiple (void) + { + const char *test_data = ++ "# This file has been auto-generated and written by p11-kit.\n" + "[p11-kit-object-v1]\n" + "class: data\n" + "label: \"first\"\n" +-- +2.9.4 + diff --git a/p11-kit.spec b/p11-kit.spec index 683b312..d444c46 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,12 +1,13 @@ Name: p11-kit Version: 0.23.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for loading and sharing PKCS#11 modules License: BSD URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat +Patch0: p11-kit-modifiable.patch BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel @@ -61,6 +62,7 @@ feature is still experimental. %prep %setup -q +%patch0 -p1 %build # These paths are the source paths that come from the plan here: @@ -133,6 +135,9 @@ fi %changelog +* Thu May 18 2017 Daiki Ueno - 0.23.5-2 +- Make "trust anchor --remove" work again + * Thu Mar 2 2017 Daiki Ueno - 0.23.5-1 - Update to 0.23.5 release - Rename -tools subpackage to -server and remove systemd unit files From 5b0ab739055afe0ce27ef64972e02f18654e955f Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 18 May 2017 14:41:25 +0200 Subject: [PATCH 02/79] Update p11-kit-modifiable.patch to simplify the logic --- p11-kit-modifiable.patch | 98 ++++++++++++++++++++++++++++++++++++++++ p11-kit.spec | 5 +- 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/p11-kit-modifiable.patch b/p11-kit-modifiable.patch index 958bc4f..3d4b4d3 100644 --- a/p11-kit-modifiable.patch +++ b/p11-kit-modifiable.patch @@ -156,3 +156,101 @@ index ad22fcb..3e7d735 100644 -- 2.9.4 +From d661194319f2375c1764125b449bf924c0cbc8a1 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Thu, 18 May 2017 14:27:36 +0200 +Subject: [PATCH] trust: Simplify the check for the magic + +Instead of reusing the CKA_X_GENERATED attribute, check the file +contents directly in the caller side. +--- + trust/parser.c | 7 +++---- + trust/persist.c | 19 +++++++++++-------- + trust/persist.h | 3 +++ + 3 files changed, 17 insertions(+), 12 deletions(-) + +diff --git a/trust/parser.c b/trust/parser.c +index abe86fc..f92cdc9 100644 +--- a/trust/parser.c ++++ b/trust/parser.c +@@ -630,11 +630,10 @@ p11_parser_format_persist (p11_parser *parser, + + ret = p11_persist_read (parser->persist, parser->basename, data, length, objects); + if (ret) { ++ if (!p11_persist_is_generated (data, length)) ++ modifiablev = CK_FALSE; + for (i = 0; i < objects->num; i++) { +- CK_BBOOL generatedv; +- attrs = objects->elem[i]; +- if (p11_attrs_find_bool (attrs, CKA_X_GENERATED, &generatedv) && generatedv) +- attrs = p11_attrs_build (attrs, &modifiable, NULL); ++ attrs = p11_attrs_build (objects->elem[i], &modifiable, NULL); + sink_object (parser, attrs); + } + } +diff --git a/trust/persist.c b/trust/persist.c +index 928260e..887b316 100644 +--- a/trust/persist.c ++++ b/trust/persist.c +@@ -70,6 +70,16 @@ p11_persist_magic (const unsigned char *data, + return (strnstr ((char *)data, "[" PERSIST_HEADER "]", length) != NULL); + } + ++bool ++p11_persist_is_generated (const unsigned char *data, ++ size_t length) ++{ ++ static const char comment[] = ++ "# This file has been auto-generated and written by p11-kit."; ++ return length >= sizeof (comment) - 1 && ++ memcmp ((const char *)data, comment, sizeof (comment) - 1) == 0; ++} ++ + p11_persist * + p11_persist_new (void) + { +@@ -631,9 +641,6 @@ p11_persist_read (p11_persist *persist, + CK_ATTRIBUTE *attrs; + bool failed; + bool skip; +- CK_BBOOL generatedv = CK_FALSE; +- CK_ATTRIBUTE generated = { CKA_X_GENERATED, &generatedv, sizeof (generatedv) }; +- static const char comment[] = "# This file has been auto-generated and written by p11-kit."; + + return_val_if_fail (persist != NULL, false); + return_val_if_fail (objects != NULL, false); +@@ -642,10 +649,6 @@ p11_persist_read (p11_persist *persist, + attrs = NULL; + failed = false; + +- if (length >= sizeof (comment) - 1 && +- memcmp ((const char *)data, comment, sizeof (comment) - 1) == 0) +- generatedv = CK_TRUE; +- + p11_lexer_init (&lexer, filename, (const char *)data, length); + while (p11_lexer_next (&lexer, &failed)) { + switch (lexer.tok_type) { +@@ -657,7 +660,7 @@ p11_persist_read (p11_persist *persist, + p11_lexer_msg (&lexer, "unrecognized or invalid section header"); + skip = true; + } else { +- attrs = p11_attrs_build (NULL, &generated, NULL); ++ attrs = p11_attrs_build (NULL, NULL); + return_val_if_fail (attrs != NULL, false); + skip = false; + } +diff --git a/trust/persist.h b/trust/persist.h +index 0ef142c..6344e4e 100644 +--- a/trust/persist.h ++++ b/trust/persist.h +@@ -60,4 +60,7 @@ bool p11_persist_write (p11_persist *persist, + + void p11_persist_free (p11_persist *persist); + ++bool p11_persist_is_generated (const unsigned char *data, ++ size_t length); ++ + #endif /* P11_PERSIST_H_ */ +-- +2.9.4 + diff --git a/p11-kit.spec b/p11-kit.spec index d444c46..2148501 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ Name: p11-kit Version: 0.23.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for loading and sharing PKCS#11 modules License: BSD @@ -135,6 +135,9 @@ fi %changelog +* Thu May 18 2017 Daiki Ueno - 0.23.5-3 +- Update p11-kit-modifiable.patch to simplify the logic + * Thu May 18 2017 Daiki Ueno - 0.23.5-2 - Make "trust anchor --remove" work again From 177c164bce203dd1434d6a2d6626ee57924d45af Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 2 Jun 2017 10:01:07 +0200 Subject: [PATCH 03/79] Update to 0.23.7 release --- p11-kit-modifiable.patch | 256 --------------------------------------- p11-kit.spec | 9 +- sources | 2 +- 3 files changed, 6 insertions(+), 261 deletions(-) delete mode 100644 p11-kit-modifiable.patch diff --git a/p11-kit-modifiable.patch b/p11-kit-modifiable.patch deleted file mode 100644 index 3d4b4d3..0000000 --- a/p11-kit-modifiable.patch +++ /dev/null @@ -1,256 +0,0 @@ -From acf8c4a91a76bf8049f6bfbd95b04e2e36bae4ea Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Thu, 18 May 2017 10:45:26 +0200 -Subject: [PATCH 1/2] Revert "trust: Honor "modifiable" setting in persist - file" - -This reverts commit 8eed1e60b0921d05872e2f43eee9088cef038d7e, which -broke "trust anchor --remove". ---- - trust/input/verisign-v1.p11-kit | 1 - - trust/parser.c | 10 +--------- - trust/test-parser.c | 1 - - 3 files changed, 1 insertion(+), 11 deletions(-) - -diff --git a/trust/input/verisign-v1.p11-kit b/trust/input/verisign-v1.p11-kit -index aea49ea..eaa080d 100644 ---- a/trust/input/verisign-v1.p11-kit -+++ b/trust/input/verisign-v1.p11-kit -@@ -1,6 +1,5 @@ - [p11-kit-object-v1] - trusted: true --modifiable: false - - -----BEGIN CERTIFICATE----- - MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkG -diff --git a/trust/parser.c b/trust/parser.c -index 52d1128..41513d4 100644 ---- a/trust/parser.c -+++ b/trust/parser.c -@@ -610,7 +610,6 @@ p11_parser_format_persist (p11_parser *parser, - { - CK_BBOOL modifiablev = CK_TRUE; - CK_ATTRIBUTE *attrs; -- CK_ATTRIBUTE *attr; - p11_array *objects; - bool ret; - int i; -@@ -631,14 +630,7 @@ p11_parser_format_persist (p11_parser *parser, - ret = p11_persist_read (parser->persist, parser->basename, data, length, objects); - if (ret) { - for (i = 0; i < objects->num; i++) { -- /* By default, we mark objects read from a persist -- * file as modifiable, as the persist format is -- * writable. However, if CKA_MODIFIABLE is explictly -- * set in the file, respect the setting. */ -- attrs = objects->elem[i]; -- attr = p11_attrs_find_valid (objects->elem[i], CKA_MODIFIABLE); -- if (!attr) -- attrs = p11_attrs_build (attrs, &modifiable, NULL); -+ attrs = p11_attrs_build (objects->elem[i], &modifiable, NULL); - sink_object (parser, attrs); - } - } -diff --git a/trust/test-parser.c b/trust/test-parser.c -index 088cff9..b5c2525 100644 ---- a/trust/test-parser.c -+++ b/trust/test-parser.c -@@ -168,7 +168,6 @@ test_parse_p11_kit_persist (void) - { CKA_CLASS, &certificate, sizeof (certificate) }, - { CKA_VALUE, (void *)verisign_v1_ca, sizeof (verisign_v1_ca) }, - { CKA_TRUSTED, &truev, sizeof (truev) }, -- { CKA_MODIFIABLE, &falsev, sizeof (falsev) }, - { CKA_X_DISTRUSTED, &falsev, sizeof (falsev) }, - { CKA_INVALID }, - }; --- -2.9.4 - - -From 66c6a7e912d39d66cd4cc91375ac7be418bf7176 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Thu, 18 May 2017 11:11:45 +0200 -Subject: [PATCH 2/2] trust: Check magic comment in persist file for - modifiablity - -A persistent file written by the trust module starts with the line "# -This file has been auto-generated and written by p11-kit". This can -be used as a magic word to determine whether the objects read from a -.p11-kit file are read-only. ---- - trust/parser.c | 6 +++++- - trust/persist.c | 9 ++++++++- - trust/test-token.c | 1 + - 3 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/trust/parser.c b/trust/parser.c -index 41513d4..abe86fc 100644 ---- a/trust/parser.c -+++ b/trust/parser.c -@@ -49,6 +49,7 @@ - #include "pem.h" - #include "pkcs11x.h" - #include "persist.h" -+#include "types.h" - #include "x509.h" - - #include -@@ -630,7 +631,10 @@ p11_parser_format_persist (p11_parser *parser, - ret = p11_persist_read (parser->persist, parser->basename, data, length, objects); - if (ret) { - for (i = 0; i < objects->num; i++) { -- attrs = p11_attrs_build (objects->elem[i], &modifiable, NULL); -+ CK_BBOOL generatedv; -+ attrs = objects->elem[i]; -+ if (p11_attrs_find_bool (attrs, CKA_X_GENERATED, &generatedv) && generatedv) -+ attrs = p11_attrs_build (attrs, &modifiable, NULL); - sink_object (parser, attrs); - } - } -diff --git a/trust/persist.c b/trust/persist.c -index 63a531e..928260e 100644 ---- a/trust/persist.c -+++ b/trust/persist.c -@@ -631,6 +631,9 @@ p11_persist_read (p11_persist *persist, - CK_ATTRIBUTE *attrs; - bool failed; - bool skip; -+ CK_BBOOL generatedv = CK_FALSE; -+ CK_ATTRIBUTE generated = { CKA_X_GENERATED, &generatedv, sizeof (generatedv) }; -+ static const char comment[] = "# This file has been auto-generated and written by p11-kit."; - - return_val_if_fail (persist != NULL, false); - return_val_if_fail (objects != NULL, false); -@@ -639,6 +642,10 @@ p11_persist_read (p11_persist *persist, - attrs = NULL; - failed = false; - -+ if (length >= sizeof (comment) - 1 && -+ memcmp ((const char *)data, comment, sizeof (comment) - 1) == 0) -+ generatedv = CK_TRUE; -+ - p11_lexer_init (&lexer, filename, (const char *)data, length); - while (p11_lexer_next (&lexer, &failed)) { - switch (lexer.tok_type) { -@@ -650,7 +657,7 @@ p11_persist_read (p11_persist *persist, - p11_lexer_msg (&lexer, "unrecognized or invalid section header"); - skip = true; - } else { -- attrs = p11_attrs_build (NULL, NULL); -+ attrs = p11_attrs_build (NULL, &generated, NULL); - return_val_if_fail (attrs != NULL, false); - skip = false; - } -diff --git a/trust/test-token.c b/trust/test-token.c -index ad22fcb..3e7d735 100644 ---- a/trust/test-token.c -+++ b/trust/test-token.c -@@ -610,6 +610,7 @@ static void - test_modify_multiple (void) - { - const char *test_data = -+ "# This file has been auto-generated and written by p11-kit.\n" - "[p11-kit-object-v1]\n" - "class: data\n" - "label: \"first\"\n" --- -2.9.4 - -From d661194319f2375c1764125b449bf924c0cbc8a1 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Thu, 18 May 2017 14:27:36 +0200 -Subject: [PATCH] trust: Simplify the check for the magic - -Instead of reusing the CKA_X_GENERATED attribute, check the file -contents directly in the caller side. ---- - trust/parser.c | 7 +++---- - trust/persist.c | 19 +++++++++++-------- - trust/persist.h | 3 +++ - 3 files changed, 17 insertions(+), 12 deletions(-) - -diff --git a/trust/parser.c b/trust/parser.c -index abe86fc..f92cdc9 100644 ---- a/trust/parser.c -+++ b/trust/parser.c -@@ -630,11 +630,10 @@ p11_parser_format_persist (p11_parser *parser, - - ret = p11_persist_read (parser->persist, parser->basename, data, length, objects); - if (ret) { -+ if (!p11_persist_is_generated (data, length)) -+ modifiablev = CK_FALSE; - for (i = 0; i < objects->num; i++) { -- CK_BBOOL generatedv; -- attrs = objects->elem[i]; -- if (p11_attrs_find_bool (attrs, CKA_X_GENERATED, &generatedv) && generatedv) -- attrs = p11_attrs_build (attrs, &modifiable, NULL); -+ attrs = p11_attrs_build (objects->elem[i], &modifiable, NULL); - sink_object (parser, attrs); - } - } -diff --git a/trust/persist.c b/trust/persist.c -index 928260e..887b316 100644 ---- a/trust/persist.c -+++ b/trust/persist.c -@@ -70,6 +70,16 @@ p11_persist_magic (const unsigned char *data, - return (strnstr ((char *)data, "[" PERSIST_HEADER "]", length) != NULL); - } - -+bool -+p11_persist_is_generated (const unsigned char *data, -+ size_t length) -+{ -+ static const char comment[] = -+ "# This file has been auto-generated and written by p11-kit."; -+ return length >= sizeof (comment) - 1 && -+ memcmp ((const char *)data, comment, sizeof (comment) - 1) == 0; -+} -+ - p11_persist * - p11_persist_new (void) - { -@@ -631,9 +641,6 @@ p11_persist_read (p11_persist *persist, - CK_ATTRIBUTE *attrs; - bool failed; - bool skip; -- CK_BBOOL generatedv = CK_FALSE; -- CK_ATTRIBUTE generated = { CKA_X_GENERATED, &generatedv, sizeof (generatedv) }; -- static const char comment[] = "# This file has been auto-generated and written by p11-kit."; - - return_val_if_fail (persist != NULL, false); - return_val_if_fail (objects != NULL, false); -@@ -642,10 +649,6 @@ p11_persist_read (p11_persist *persist, - attrs = NULL; - failed = false; - -- if (length >= sizeof (comment) - 1 && -- memcmp ((const char *)data, comment, sizeof (comment) - 1) == 0) -- generatedv = CK_TRUE; -- - p11_lexer_init (&lexer, filename, (const char *)data, length); - while (p11_lexer_next (&lexer, &failed)) { - switch (lexer.tok_type) { -@@ -657,7 +660,7 @@ p11_persist_read (p11_persist *persist, - p11_lexer_msg (&lexer, "unrecognized or invalid section header"); - skip = true; - } else { -- attrs = p11_attrs_build (NULL, &generated, NULL); -+ attrs = p11_attrs_build (NULL, NULL); - return_val_if_fail (attrs != NULL, false); - skip = false; - } -diff --git a/trust/persist.h b/trust/persist.h -index 0ef142c..6344e4e 100644 ---- a/trust/persist.h -+++ b/trust/persist.h -@@ -60,4 +60,7 @@ bool p11_persist_write (p11_persist *persist, - - void p11_persist_free (p11_persist *persist); - -+bool p11_persist_is_generated (const unsigned char *data, -+ size_t length); -+ - #endif /* P11_PERSIST_H_ */ --- -2.9.4 - diff --git a/p11-kit.spec b/p11-kit.spec index 2148501..b1edec4 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,13 +1,12 @@ Name: p11-kit -Version: 0.23.5 -Release: 3%{?dist} +Version: 0.23.7 +Release: 1%{?dist} Summary: Library for loading and sharing PKCS#11 modules License: BSD URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat -Patch0: p11-kit-modifiable.patch BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel @@ -62,7 +61,6 @@ feature is still experimental. %prep %setup -q -%patch0 -p1 %build # These paths are the source paths that come from the plan here: @@ -135,6 +133,9 @@ fi %changelog +* Fri Jun 2 2017 Daiki Ueno - 0.23.7-1 +- Update to 0.23.7 release + * Thu May 18 2017 Daiki Ueno - 0.23.5-3 - Update p11-kit-modifiable.patch to simplify the logic diff --git a/sources b/sources index 0c0cf6b..1ced4f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (p11-kit-0.23.5.tar.gz) = 5276db3c9bb14d5e0441e7b781033b1684edfc1d4da88a9c9ce501ed1f6121918d3afe6725ceb0e2d65fc253c2f9eebf37c3380741de6c1b09cec06ae86417a7 +SHA512 (p11-kit-0.23.7.tar.gz) = c9f492220a963726cd1883c276a4a3e607c07f77a34253797beb9f11e671cadcc1b1fa85baa746a0c5bc3f439a8c362e0b2f86796500215fa05efb5446f2baf8 From 046e3e68af10cc4c98b24cb243e80d0c7202a5fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 02:03:31 +0000 Subject: [PATCH 04/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index b1edec4..66159ab 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ Name: p11-kit Version: 0.23.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for loading and sharing PKCS#11 modules License: BSD @@ -133,6 +133,9 @@ fi %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.23.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jun 2 2017 Daiki Ueno - 0.23.7-1 - Update to 0.23.7 release From b6ffbd9b704964e740ef891871c618d3ab45db02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 04:44:04 +0000 Subject: [PATCH 05/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 66159ab..ba71e3a 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ Name: p11-kit Version: 0.23.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for loading and sharing PKCS#11 modules License: BSD @@ -133,6 +133,9 @@ fi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.23.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.23.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 6bd9b5a1b75cceccca8212aba5fd1d26325a317d Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 15 Aug 2017 14:56:14 +0200 Subject: [PATCH 06/79] Update to 0.23.8 release --- p11-kit.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index ba71e3a..bdd3178 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ Name: p11-kit -Version: 0.23.7 -Release: 3%{?dist} +Version: 0.23.8 +Release: 1%{?dist} Summary: Library for loading and sharing PKCS#11 modules License: BSD @@ -133,6 +133,9 @@ fi %changelog +* Tue Aug 15 2017 Daiki Ueno - 0.23.8-1 +- Update to 0.23.8 release + * Thu Aug 03 2017 Fedora Release Engineering - 0.23.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 1ced4f7..f8458d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (p11-kit-0.23.7.tar.gz) = c9f492220a963726cd1883c276a4a3e607c07f77a34253797beb9f11e671cadcc1b1fa85baa746a0c5bc3f439a8c362e0b2f86796500215fa05efb5446f2baf8 +SHA512 (p11-kit-0.23.8.tar.gz) = cf3b28e4bed8cc18ef49fa7af1e4ad04f1b97dbd08f1e0bab07c280f0aa35306c01e35896bc990c9ed7bdecd6c5ce697ccb95288ef04dd3740db384343ea2f24 From 5c8eae497fbb795830e86b0492a677f9761a7d27 Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Mon, 28 Aug 2017 15:57:41 +0200 Subject: [PATCH 07/79] Fix a regression caused by a recent nss.rpm change, add a %%ghost file for %%{_libdir}/libnssckbi.so that p11-kit-trust scripts install. --- p11-kit.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index bdd3178..586be17 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ Name: p11-kit Version: 0.23.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for loading and sharing PKCS#11 modules License: BSD @@ -123,6 +123,7 @@ fi %files trust %{_bindir}/trust %dir %{_libdir}/pkcs11 +%ghost %{_libdir}/libnssckbi.so %{_libdir}/pkcs11/p11-kit-trust.so %{_datadir}/p11-kit/modules/p11-kit-trust.module %{_libexecdir}/p11-kit/trust-extract-compat @@ -133,6 +134,10 @@ fi %changelog +* Fri Aug 25 2017 Kai Engert - 0.23.8-2 +- Fix a regression caused by a recent nss.rpm change, add a %%ghost file + for %%{_libdir}/libnssckbi.so that p11-kit-trust scripts install. + * Tue Aug 15 2017 Daiki Ueno - 0.23.8-1 - Update to 0.23.8 release From 5dd4e32775ce5bd43b0fe4458ef06dd1762df578 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 4 Oct 2017 11:19:08 +0200 Subject: [PATCH 08/79] Update to 0.23.9-1 - pdate to upstream 0.23.9 --- .gitignore | 2 ++ p11-kit.spec | 11 +++++++++-- sources | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bdef1dd..d9dfc82 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /*.src.rpm /p11-kit-0.*/ /x86_64/ +/trust-extract-compat +/p11-kit-0.23.9.tar.gz diff --git a/p11-kit.spec b/p11-kit.spec index 586be17..6819744 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,7 @@ +# This spec file has been automatically updated +Version: 0.23.9 +Release: 1%{?dist} Name: p11-kit -Version: 0.23.8 -Release: 2%{?dist} Summary: Library for loading and sharing PKCS#11 modules License: BSD @@ -12,6 +13,9 @@ BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel BuildRequires: gtk-doc BuildRequires: systemd +# Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 +# Remove this once it is fixed +BuildRequires: pkgconfig(glib-2.0) %description p11-kit provides a way to load and enumerate PKCS#11 modules, as well @@ -134,6 +138,9 @@ fi %changelog +* Wed Oct 04 2017 Daiki Ueno - 0.23.9-1 +- pdate to upstream 0.23.9 + * Fri Aug 25 2017 Kai Engert - 0.23.8-2 - Fix a regression caused by a recent nss.rpm change, add a %%ghost file for %%{_libdir}/libnssckbi.so that p11-kit-trust scripts install. diff --git a/sources b/sources index f8458d5..d8660d0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (p11-kit-0.23.8.tar.gz) = cf3b28e4bed8cc18ef49fa7af1e4ad04f1b97dbd08f1e0bab07c280f0aa35306c01e35896bc990c9ed7bdecd6c5ce697ccb95288ef04dd3740db384343ea2f24 +SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 +SHA512 (p11-kit-0.23.9.tar.gz) = 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed From a55411e1136089ce5ee3689b4986d6363069def2 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 4 Oct 2017 11:56:36 +0200 Subject: [PATCH 09/79] Fix typo in the previous changelog --- p11-kit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 6819744..b8ca7fa 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -139,7 +139,7 @@ fi %changelog * Wed Oct 04 2017 Daiki Ueno - 0.23.9-1 -- pdate to upstream 0.23.9 +- Update to upstream 0.23.9 * Fri Aug 25 2017 Kai Engert - 0.23.8-2 - Fix a regression caused by a recent nss.rpm change, add a %%ghost file From 6586159cc3be350b234631bfe5406994aac14674 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 5 Oct 2017 15:44:02 +0200 Subject: [PATCH 10/79] Update to 0.23.9-2 - server: Make it possible to eval envvar settings --- .gitignore | 3 ++ p11-kit-client.service | 11 ++++++++ p11-kit-server-eval-env.patch | 52 +++++++++++++++++++++++++++++++++++ p11-kit.spec | 12 ++++++-- sources | 1 + 5 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 p11-kit-client.service create mode 100644 p11-kit-server-eval-env.patch diff --git a/.gitignore b/.gitignore index d9dfc82..f2d8374 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ /x86_64/ /trust-extract-compat /p11-kit-0.23.9.tar.gz +/p11-kit-client.service +/trust-extract-compat +/p11-kit-0.23.9.tar.gz diff --git a/p11-kit-client.service b/p11-kit-client.service new file mode 100644 index 0000000..c9b8e30 --- /dev/null +++ b/p11-kit-client.service @@ -0,0 +1,11 @@ +[Unit] +Description=p11-kit client + +[Service] +Type=oneshot +RemainAfterExit=true +RuntimeDirectory=p11-kit +ExecStart=/usr/bin/true + +[Install] +WantedBy=default.target diff --git a/p11-kit-server-eval-env.patch b/p11-kit-server-eval-env.patch new file mode 100644 index 0000000..cd2a812 --- /dev/null +++ b/p11-kit-server-eval-env.patch @@ -0,0 +1,52 @@ +From 031912fa844c4f3da327c8b2578d9d9ce2a6473e Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Thu, 5 Oct 2017 10:59:02 +0200 +Subject: [PATCH] server: Make it possible to eval envvar settings + +Previously, calling "eval $(p11-kit server)" from shell hung because +the program didn't properly close stdout before forking. +--- + p11-kit/server.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/p11-kit/server.c b/p11-kit/server.c +index 97e18e2..96c77ec 100644 +--- a/p11-kit/server.c ++++ b/p11-kit/server.c +@@ -346,6 +346,17 @@ server_loop (Server *server, + if (server->socket == -1) + return 1; + ++ if (!quiet) { ++ char *path; ++ ++ path = p11_path_encode (server->socket_name); ++ printf ("P11_KIT_SERVER_ADDRESS=unix:path=%s\n", path); ++ free (path); ++ printf ("P11_KIT_SERVER_PID=%d\n", getpid ()); ++ fflush (stdout); ++ close (STDOUT_FILENO); ++ } ++ + /* run as daemon */ + if (!foreground) { + pid = fork (); +@@ -372,15 +383,6 @@ server_loop (Server *server, + + sigprocmask (SIG_BLOCK, &blockset, NULL); + +- if (!quiet) { +- char *path; +- +- path = p11_path_encode (server->socket_name); +- printf ("P11_KIT_SERVER_ADDRESS=unix:path=%s\n", path); +- free (path); +- printf ("P11_KIT_SERVER_PID=%d\n", getpid ()); +- } +- + /* accept connections */ + ret = 0; + for (;;) { +-- +2.13.6 + diff --git a/p11-kit.spec b/p11-kit.spec index b8ca7fa..b12fd7d 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,7 @@ # This spec file has been automatically updated Version: 0.23.9 -Release: 1%{?dist} +Release: 2%{?dist} +Patch1: p11-kit-server-eval-env.patch Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -8,6 +9,7 @@ License: BSD URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat +Source2: p11-kit-client.service BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel @@ -64,7 +66,7 @@ feature is still experimental. %prep -%setup -q +%autosetup -p1 %build # These paths are the source paths that come from the plan here: @@ -80,6 +82,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/pkcs11/*.la install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/p11-kit/ # Install the example conf with %%doc instead rm $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/pkcs11.conf.example +mkdir -p $RPM_BUILD_ROOT%{_userunitdir} +install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_userunitdir} %check make check @@ -134,10 +138,14 @@ fi %files server %{_libdir}/pkcs11/p11-kit-client.so +%{_userunitdir}/p11-kit-client.service %{_libexecdir}/p11-kit/p11-kit-server %changelog +* Thu Oct 05 2017 Daiki Ueno - 0.23.9-2 +- server: Make it possible to eval envvar settings + * Wed Oct 04 2017 Daiki Ueno - 0.23.9-1 - Update to upstream 0.23.9 diff --git a/sources b/sources index d8660d0..e959f3c 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ +SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 SHA512 (p11-kit-0.23.9.tar.gz) = 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed From cc8b3032668ddd2f9072d4545d6d4922dfb59efe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 18:06:40 +0000 Subject: [PATCH 11/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index b12fd7d..6f2cb4c 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.9 -Release: 2%{?dist} +Release: 3%{?dist} Patch1: p11-kit-server-eval-env.patch Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -143,6 +143,9 @@ fi %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 0.23.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Oct 05 2017 Daiki Ueno - 0.23.9-2 - server: Make it possible to eval envvar settings From ee56d8dd4a0a6083bf8f18dcd37f8d4dfc12bca8 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 21 Sep 2017 00:35:32 +0200 Subject: [PATCH 12/79] tests: Add initial integration test for p11-kit These are documented here and will be used to ensure that p11-kit works as expected. https://fedoraproject.org/wiki/CI This is just the first such test. Feel free to edit it if there are mistakes or add others, or check out the docs: https://fedoraproject.org/wiki/CI/Tests --- tests/.gitignore | 2 + tests/tests.yml | 14 ++++ .../Makefile | 64 +++++++++++++++++++ .../PURPOSE | 17 +++++ .../runtest.sh | 59 +++++++++++++++++ 5 files changed, 156 insertions(+) create mode 100644 tests/.gitignore create mode 100644 tests/tests.yml create mode 100644 tests/trust-anchor-complains-about-invalid-attribute-and/Makefile create mode 100644 tests/trust-anchor-complains-about-invalid-attribute-and/PURPOSE create mode 100755 tests/trust-anchor-complains-about-invalid-attribute-and/runtest.sh diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..13555f0 --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,2 @@ +*.retry +artifacts/ diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..6188ad8 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,14 @@ +--- +# This first play always runs on the local staging system +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + - atomic + - container + tests: + - trust-anchor-complains-about-invalid-attribute-and + required_packages: + - openssl + - p11-kit diff --git a/tests/trust-anchor-complains-about-invalid-attribute-and/Makefile b/tests/trust-anchor-complains-about-invalid-attribute-and/Makefile new file mode 100644 index 0000000..0f10a06 --- /dev/null +++ b/tests/trust-anchor-complains-about-invalid-attribute-and/Makefile @@ -0,0 +1,64 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/p11-kit/trust-anchor-complains-about-invalid-attribute-and +# Description: Test for trust anchor complains about invalid attribute and +# Author: Hubert Kario +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2017 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/CoreOS/p11-kit/trust-anchor-complains-about-invalid-attribute-and +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Hubert Kario " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Test for trust anchor complains about invalid attribute and" >> $(METADATA) + @echo "Type: Regression" >> $(METADATA) + @echo "TestTime: 2m" >> $(METADATA) + @echo "RunFor: p11-kit" >> $(METADATA) + @echo "Requires: openssl p11-kit" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: -RHEL4 -RHEL6 -RHELClient5 -RHELServer5" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/trust-anchor-complains-about-invalid-attribute-and/PURPOSE b/tests/trust-anchor-complains-about-invalid-attribute-and/PURPOSE new file mode 100644 index 0000000..e7886f9 --- /dev/null +++ b/tests/trust-anchor-complains-about-invalid-attribute-and/PURPOSE @@ -0,0 +1,17 @@ +PURPOSE of /CoreOS/p11-kit/trust-anchor-complains-about-invalid-attribute-and +Description: Test for trust anchor complains about invalid attribute and +Author: Hubert Kario +Bug summary: trust anchor complains about invalid attribute and fails when a new certificate tries to store into trust place + +Steps to Reproduce: +1. /etc/pki/tls/certs/make-dummy-cert mycert-tmp.pem +2. openssl x509 -in mycert-tmp.pem -addtrust clientAuth -addtrust serverAuth -addtrust emailProtection -out mycert.pem +3. trust anchor --store mycert.pem + +Actual results: +p11-kit: the CKA_TRUSTED attribute is not valid for the object +p11-kit: couldn't create object: Certain fields have invalid values + + +Expected results: +Certificate is stored in trust place. diff --git a/tests/trust-anchor-complains-about-invalid-attribute-and/runtest.sh b/tests/trust-anchor-complains-about-invalid-attribute-and/runtest.sh new file mode 100755 index 0000000..3ca17e1 --- /dev/null +++ b/tests/trust-anchor-complains-about-invalid-attribute-and/runtest.sh @@ -0,0 +1,59 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/p11-kit/trust-anchor-complains-about-invalid-attribute-and +# Description: Test for trust anchor complains about invalid attribute and +# Author: Hubert Kario +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2017 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGE="p11-kit" + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm $PACKAGE + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlRun "rlFileBackup --clean /etc/pki" + rlPhaseEnd + + rlPhaseStartTest + DUMMY_MAKER_BIN="/etc/pki/tls/certs/make-dummy-cert" + [ -x /usr/bin/make-dummy-cert ] && DUMMY_MAKER_BIN="/usr/bin/make-dummy-cert" + rlRun "$DUMMY_MAKER_BIN mycert-tmp.pem" + rlRun "openssl x509 -in mycert-tmp.pem -addtrust clientAuth -addtrust serverAuth -addtrust emailProtection -out mycert.pem" + rlAssertNotExists "/etc/pki/ca-trust/source/localhost.localdomain.p11-kit" + rlRun -s "trust anchor --store mycert.pem" + rlAssertNotGrep "p11-kit:" $rlRun_LOG + rlAssertExists "/etc/pki/ca-trust/source/localhost.localdomain.p11-kit" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rlFileRestore" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd From c47f98db286704d3acc8c8ad8a4c8bc1351abe1b Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 28 Feb 2018 10:22:39 +0100 Subject: [PATCH 13/79] Update to 0.23.10-1 - Update to upstream 0.23.10 release --- .gitignore | 3 ++ p11-kit-server-eval-env.patch | 52 ----------------------------------- p11-kit.spec | 8 ++++-- sources | 2 +- 4 files changed, 9 insertions(+), 56 deletions(-) delete mode 100644 p11-kit-server-eval-env.patch diff --git a/.gitignore b/.gitignore index f2d8374..775a045 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ /p11-kit-client.service /trust-extract-compat /p11-kit-0.23.9.tar.gz +/p11-kit-client.service +/trust-extract-compat +/p11-kit-0.23.10.tar.gz diff --git a/p11-kit-server-eval-env.patch b/p11-kit-server-eval-env.patch deleted file mode 100644 index cd2a812..0000000 --- a/p11-kit-server-eval-env.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 031912fa844c4f3da327c8b2578d9d9ce2a6473e Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Thu, 5 Oct 2017 10:59:02 +0200 -Subject: [PATCH] server: Make it possible to eval envvar settings - -Previously, calling "eval $(p11-kit server)" from shell hung because -the program didn't properly close stdout before forking. ---- - p11-kit/server.c | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -diff --git a/p11-kit/server.c b/p11-kit/server.c -index 97e18e2..96c77ec 100644 ---- a/p11-kit/server.c -+++ b/p11-kit/server.c -@@ -346,6 +346,17 @@ server_loop (Server *server, - if (server->socket == -1) - return 1; - -+ if (!quiet) { -+ char *path; -+ -+ path = p11_path_encode (server->socket_name); -+ printf ("P11_KIT_SERVER_ADDRESS=unix:path=%s\n", path); -+ free (path); -+ printf ("P11_KIT_SERVER_PID=%d\n", getpid ()); -+ fflush (stdout); -+ close (STDOUT_FILENO); -+ } -+ - /* run as daemon */ - if (!foreground) { - pid = fork (); -@@ -372,15 +383,6 @@ server_loop (Server *server, - - sigprocmask (SIG_BLOCK, &blockset, NULL); - -- if (!quiet) { -- char *path; -- -- path = p11_path_encode (server->socket_name); -- printf ("P11_KIT_SERVER_ADDRESS=unix:path=%s\n", path); -- free (path); -- printf ("P11_KIT_SERVER_PID=%d\n", getpid ()); -- } -- - /* accept connections */ - ret = 0; - for (;;) { --- -2.13.6 - diff --git a/p11-kit.spec b/p11-kit.spec index 6f2cb4c..3e7931d 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,7 +1,6 @@ # This spec file has been automatically updated -Version: 0.23.9 -Release: 3%{?dist} -Patch1: p11-kit-server-eval-env.patch +Version: 0.23.10 +Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -143,6 +142,9 @@ fi %changelog +* Wed Feb 28 2018 Daiki Ueno - 0.23.10-1 +- Update to upstream 0.23.10 release + * Thu Feb 08 2018 Fedora Release Engineering - 0.23.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index e959f3c..3fa1635 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 -SHA512 (p11-kit-0.23.9.tar.gz) = 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed +SHA512 (p11-kit-0.23.10.tar.gz) = 42a004613f951e4e18c10cd204bcba348267cc7b3ae0d9f26d69012b086af446947660575d5751539b8d4dd77fa9b684054ad5ac978119e0a2e94fcdf9842178 From aca332d737967b91ffccdcee8269c0ee1c1bcb83 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 8 Mar 2018 13:39:54 +0100 Subject: [PATCH 14/79] Add gcc to BuildRequires --- p11-kit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/p11-kit.spec b/p11-kit.spec index 3e7931d..c224a27 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -10,6 +10,7 @@ Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source1: trust-extract-compat Source2: p11-kit-client.service +BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel BuildRequires: gtk-doc From 7aacdf97b0dcf88ebb780fdd90281aaf7d0661d0 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 30 May 2018 16:37:38 +0200 Subject: [PATCH 15/79] Update to 0.23.12-1 - Update to upstream 0.23.11 release --- .gitignore | 3 +++ p11-kit.spec | 6 ++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 775a045..13a4b49 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ /p11-kit-client.service /trust-extract-compat /p11-kit-0.23.10.tar.gz +/p11-kit-client.service +/trust-extract-compat +/p11-kit-0.23.12.tar.gz diff --git a/p11-kit.spec b/p11-kit.spec index c224a27..7ba7277 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.23.10 +Version: 0.23.12 Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -10,7 +10,6 @@ Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source1: trust-extract-compat Source2: p11-kit-client.service -BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel BuildRequires: gtk-doc @@ -143,6 +142,9 @@ fi %changelog +* Wed May 30 2018 Daiki Ueno - 0.23.12-1 +- Update to upstream 0.23.11 release + * Wed Feb 28 2018 Daiki Ueno - 0.23.10-1 - Update to upstream 0.23.10 release diff --git a/sources b/sources index 3fa1635..477911e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 -SHA512 (p11-kit-0.23.10.tar.gz) = 42a004613f951e4e18c10cd204bcba348267cc7b3ae0d9f26d69012b086af446947660575d5751539b8d4dd77fa9b684054ad5ac978119e0a2e94fcdf9842178 +SHA512 (p11-kit-0.23.12.tar.gz) = ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726 From 43eeabd53816b4e83b1241de6d66e83b0ff641df Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 7 Jun 2018 17:21:01 +0200 Subject: [PATCH 16/79] Restore BR: gcc, which was mistakenly removed --- p11-kit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/p11-kit.spec b/p11-kit.spec index 7ba7277..6655950 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -10,6 +10,7 @@ Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source1: trust-extract-compat Source2: p11-kit-client.service +BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel BuildRequires: gtk-doc From d1d2411f5331eed80785c1d0b0c917ecf1590778 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 15:22:37 +0000 Subject: [PATCH 17/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 6655950..040e01d 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.12 -Release: 1%{?dist} +Release: 2%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -143,6 +143,9 @@ fi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.23.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed May 30 2018 Daiki Ueno - 0.23.12-1 - Update to upstream 0.23.11 release From 9612d368ccdf1880a1c215ea2eafdb62a36b0d3b Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 10 Aug 2018 19:00:16 +0200 Subject: [PATCH 18/79] Update to upstream 0.23.13 release --- p11-kit.spec | 11 ++++++++--- sources | 4 +--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 040e01d..625f00b 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.23.12 -Release: 2%{?dist} +Version: 0.23.13 +Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -14,7 +14,7 @@ BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel BuildRequires: gtk-doc -BuildRequires: systemd +BuildRequires: systemd-devel # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) @@ -140,9 +140,14 @@ fi %{_libdir}/pkcs11/p11-kit-client.so %{_userunitdir}/p11-kit-client.service %{_libexecdir}/p11-kit/p11-kit-server +%{_userunitdir}/p11-kit-server.service +%{_userunitdir}/p11-kit-server.socket %changelog +* Fri Aug 10 2018 Daiki Ueno - 0.23.13-1 +- Update to upstream 0.23.13 release + * Fri Jul 13 2018 Fedora Release Engineering - 0.23.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 477911e..57abc1a 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b -SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 -SHA512 (p11-kit-0.23.12.tar.gz) = ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726 +SHA512 (p11-kit-0.23.13.tar.gz) = bdf97867250fec20cf7e813bfe4ecee9d613ee0cf245fe5e97c0bc99446fa61e616756ce2785ae98cfd4fe55276ad6070828e1ef8ad154fac0e741ceb038a9c7 From 06e64a0086ebf882f1446a28509c2217892d44ad Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 15 Aug 2018 14:15:08 +0200 Subject: [PATCH 19/79] Fix invalid memory access on proxy cleanup --- p11-kit-proxy-cleanup.patch | 77 +++++++++++++++++++++++++++++++++++++ p11-kit.spec | 6 ++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 p11-kit-proxy-cleanup.patch diff --git a/p11-kit-proxy-cleanup.patch b/p11-kit-proxy-cleanup.patch new file mode 100644 index 0000000..b911e62 --- /dev/null +++ b/p11-kit-proxy-cleanup.patch @@ -0,0 +1,77 @@ +From 3e68b0054b82eda93b073cc7ad5d20d2158a694c Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Mon, 13 Aug 2018 15:23:03 +0200 +Subject: [PATCH] proxy: Avoid invalid memory access when unloading proxy + module + +When loading and unloading p11-kit-proxy.so with pkcs11-tool, it +accesses already free'd memory area: + +$ valgrind pkcs11-tool --module p11-kit-proxy.so -L +==25173== Invalid read of size 8 +==25173== at 0x64BF493: p11_proxy_module_cleanup (proxy.c:1724) +==25173== by 0x64BD028: _p11_kit_fini (proxy-init.c:65) +==25173== by 0x401477C: _dl_close_worker (in /usr/lib64/ld-2.27.so) +==25173== by 0x4014E1D: _dl_close (in /usr/lib64/ld-2.27.so) +==25173== by 0x5E08C4E: _dl_catch_exception (in /usr/lib64/libc-2.27.so) +==25173== by 0x5E08CDE: _dl_catch_error (in /usr/lib64/libc-2.27.so) +==25173== by 0x58B1724: _dlerror_run (in /usr/lib64/libdl-2.27.so) +==25173== by 0x58B1113: dlclose (in /usr/lib64/libdl-2.27.so) +==25173== by 0x11E5A7: ??? (in /usr/bin/pkcs11-tool) +==25173== by 0x110023: ??? (in /usr/bin/pkcs11-tool) +==25173== by 0x5CF624A: (below main) (in /usr/lib64/libc-2.27.so) +==25173== Address 0x61231c8 is 552 bytes inside a block of size 584 free'd +==25173== at 0x4C2FDAC: free (vg_replace_malloc.c:530) +==25173== by 0x6548492: p11_virtual_unwrap (virtual.c:2902) +==25173== by 0x64BF492: p11_proxy_module_cleanup (proxy.c:1723) +--- + p11-kit/proxy.c | 17 ++++------------- + 1 file changed, 4 insertions(+), 13 deletions(-) + +diff --git a/p11-kit/proxy.c b/p11-kit/proxy.c +index 31b9bb2..b7fb63d 100644 +--- a/p11-kit/proxy.c ++++ b/p11-kit/proxy.c +@@ -1720,8 +1720,8 @@ p11_proxy_module_cleanup (void) + + for (; state != NULL; state = next) { + next = state->next; +- p11_virtual_unwrap (state->wrapped); + p11_kit_modules_release (state->loaded); ++ p11_virtual_unwrap (state->wrapped); + } + } + +@@ -1731,16 +1731,6 @@ p11_proxy_module_check (CK_FUNCTION_LIST_PTR module) + return (module->C_WaitForSlotEvent == module_C_WaitForSlotEvent); + } + +-static void +-proxy_module_free (p11_virtual *virt) +-{ +- State *state = (State *)virt; +- +- p11_virtual_unwrap (state->wrapped); +- p11_kit_modules_release (state->loaded); +- free (state); +-} +- + CK_RV + p11_proxy_module_create (CK_FUNCTION_LIST_PTR *module, + CK_FUNCTION_LIST_PTR *modules) +@@ -1758,9 +1748,10 @@ p11_proxy_module_create (CK_FUNCTION_LIST_PTR *module, + p11_virtual_init (&state->virt, &proxy_functions, state, NULL); + state->last_handle = FIRST_HANDLE; + state->loaded = modules_dup (modules); +- state->wrapped = p11_virtual_wrap (&state->virt, (p11_destroyer)proxy_module_free); ++ state->wrapped = p11_virtual_wrap (&state->virt, (p11_destroyer)p11_virtual_uninit); + if (state->wrapped == NULL) { +- proxy_module_free (&state->virt); ++ p11_kit_modules_release (state->loaded); ++ free (state); + return CKR_GENERAL_ERROR; + } + +-- +2.17.1 + diff --git a/p11-kit.spec b/p11-kit.spec index 625f00b..42bc3a4 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.13 -Release: 1%{?dist} +Release: 2%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -9,6 +9,7 @@ URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat Source2: p11-kit-client.service +Patch: p11-kit-proxy-cleanup.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 @@ -145,6 +146,9 @@ fi %changelog +* Wed Aug 15 2018 Daiki Ueno - 0.23.13-2 +- Fix invalid memory access on proxy cleanup + * Fri Aug 10 2018 Daiki Ueno - 0.23.13-1 - Update to upstream 0.23.13 release From 3d4fe24764a94d6ad27631e8b4d317a0bbb83bb7 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 15 Aug 2018 15:14:31 +0200 Subject: [PATCH 20/79] Forcibly link with libpthread --- p11-kit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 42bc3a4..015645a 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.13 -Release: 2%{?dist} +Release: 3%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -72,7 +72,7 @@ feature is still experimental. %build # These paths are the source paths that come from the plan here: # https://fedoraproject.org/wiki/Features/SharedSystemCertificates:SubTasks -%configure --disable-static --enable-doc --with-trust-paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source --disable-silent-rules +%configure --disable-static --enable-doc --with-trust-paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source --disable-silent-rules LIBS='-lpthread' make %{?_smp_mflags} V=1 %install @@ -146,6 +146,9 @@ fi %changelog +* Wed Aug 15 2018 Daiki Ueno - 0.23.13-3 +- Forcibly link with libpthread to avoid regressions (rhbz#1615038) + * Wed Aug 15 2018 Daiki Ueno - 0.23.13-2 - Fix invalid memory access on proxy cleanup From ba047365fdd8c5f9b4ac38a6903ab317dd3363ef Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 7 Sep 2018 17:05:40 +0200 Subject: [PATCH 21/79] Prepare for the new release --- p11-kit.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 015645a..bf2d152 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -9,7 +9,6 @@ URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat Source2: p11-kit-client.service -Patch: p11-kit-proxy-cleanup.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 @@ -72,7 +71,7 @@ feature is still experimental. %build # These paths are the source paths that come from the plan here: # https://fedoraproject.org/wiki/Features/SharedSystemCertificates:SubTasks -%configure --disable-static --enable-doc --with-trust-paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source --disable-silent-rules LIBS='-lpthread' +%configure --disable-static --enable-doc --with-trust-paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source --disable-silent-rules make %{?_smp_mflags} V=1 %install From 34daa9f6da66c28f1f5c3539d12290a846db99fc Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 7 Sep 2018 17:09:49 +0200 Subject: [PATCH 22/79] Remove unused patch --- p11-kit-proxy-cleanup.patch | 77 ------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 p11-kit-proxy-cleanup.patch diff --git a/p11-kit-proxy-cleanup.patch b/p11-kit-proxy-cleanup.patch deleted file mode 100644 index b911e62..0000000 --- a/p11-kit-proxy-cleanup.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 3e68b0054b82eda93b073cc7ad5d20d2158a694c Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Mon, 13 Aug 2018 15:23:03 +0200 -Subject: [PATCH] proxy: Avoid invalid memory access when unloading proxy - module - -When loading and unloading p11-kit-proxy.so with pkcs11-tool, it -accesses already free'd memory area: - -$ valgrind pkcs11-tool --module p11-kit-proxy.so -L -==25173== Invalid read of size 8 -==25173== at 0x64BF493: p11_proxy_module_cleanup (proxy.c:1724) -==25173== by 0x64BD028: _p11_kit_fini (proxy-init.c:65) -==25173== by 0x401477C: _dl_close_worker (in /usr/lib64/ld-2.27.so) -==25173== by 0x4014E1D: _dl_close (in /usr/lib64/ld-2.27.so) -==25173== by 0x5E08C4E: _dl_catch_exception (in /usr/lib64/libc-2.27.so) -==25173== by 0x5E08CDE: _dl_catch_error (in /usr/lib64/libc-2.27.so) -==25173== by 0x58B1724: _dlerror_run (in /usr/lib64/libdl-2.27.so) -==25173== by 0x58B1113: dlclose (in /usr/lib64/libdl-2.27.so) -==25173== by 0x11E5A7: ??? (in /usr/bin/pkcs11-tool) -==25173== by 0x110023: ??? (in /usr/bin/pkcs11-tool) -==25173== by 0x5CF624A: (below main) (in /usr/lib64/libc-2.27.so) -==25173== Address 0x61231c8 is 552 bytes inside a block of size 584 free'd -==25173== at 0x4C2FDAC: free (vg_replace_malloc.c:530) -==25173== by 0x6548492: p11_virtual_unwrap (virtual.c:2902) -==25173== by 0x64BF492: p11_proxy_module_cleanup (proxy.c:1723) ---- - p11-kit/proxy.c | 17 ++++------------- - 1 file changed, 4 insertions(+), 13 deletions(-) - -diff --git a/p11-kit/proxy.c b/p11-kit/proxy.c -index 31b9bb2..b7fb63d 100644 ---- a/p11-kit/proxy.c -+++ b/p11-kit/proxy.c -@@ -1720,8 +1720,8 @@ p11_proxy_module_cleanup (void) - - for (; state != NULL; state = next) { - next = state->next; -- p11_virtual_unwrap (state->wrapped); - p11_kit_modules_release (state->loaded); -+ p11_virtual_unwrap (state->wrapped); - } - } - -@@ -1731,16 +1731,6 @@ p11_proxy_module_check (CK_FUNCTION_LIST_PTR module) - return (module->C_WaitForSlotEvent == module_C_WaitForSlotEvent); - } - --static void --proxy_module_free (p11_virtual *virt) --{ -- State *state = (State *)virt; -- -- p11_virtual_unwrap (state->wrapped); -- p11_kit_modules_release (state->loaded); -- free (state); --} -- - CK_RV - p11_proxy_module_create (CK_FUNCTION_LIST_PTR *module, - CK_FUNCTION_LIST_PTR *modules) -@@ -1758,9 +1748,10 @@ p11_proxy_module_create (CK_FUNCTION_LIST_PTR *module, - p11_virtual_init (&state->virt, &proxy_functions, state, NULL); - state->last_handle = FIRST_HANDLE; - state->loaded = modules_dup (modules); -- state->wrapped = p11_virtual_wrap (&state->virt, (p11_destroyer)proxy_module_free); -+ state->wrapped = p11_virtual_wrap (&state->virt, (p11_destroyer)p11_virtual_uninit); - if (state->wrapped == NULL) { -- proxy_module_free (&state->virt); -+ p11_kit_modules_release (state->loaded); -+ free (state); - return CKR_GENERAL_ERROR; - } - --- -2.17.1 - From 9eea0c39786d2bce0daa8628b4e4a63cc48fe895 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 7 Sep 2018 17:30:42 +0200 Subject: [PATCH 23/79] Update to 0.23.14-1 - Update to upstream 0.23.14 release --- .gitignore | 3 +++ p11-kit.spec | 7 +++++-- sources | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 13a4b49..092a8fb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ /p11-kit-client.service /trust-extract-compat /p11-kit-0.23.12.tar.gz +/p11-kit-client.service +/trust-extract-compat +/p11-kit-0.23.14.tar.gz diff --git a/p11-kit.spec b/p11-kit.spec index bf2d152..7d8db44 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.23.13 -Release: 3%{?dist} +Version: 0.23.14 +Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -145,6 +145,9 @@ fi %changelog +* Fri Sep 07 2018 Daiki Ueno - 0.23.14-1 +- Update to upstream 0.23.14 release + * Wed Aug 15 2018 Daiki Ueno - 0.23.13-3 - Forcibly link with libpthread to avoid regressions (rhbz#1615038) diff --git a/sources b/sources index 57abc1a..4a817b4 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (p11-kit-0.23.13.tar.gz) = bdf97867250fec20cf7e813bfe4ecee9d613ee0cf245fe5e97c0bc99446fa61e616756ce2785ae98cfd4fe55276ad6070828e1ef8ad154fac0e741ceb038a9c7 +SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b +SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 +SHA512 (p11-kit-0.23.14.tar.gz) = fc7e7e0745d7f8e5d783a1f38bad9bbe65b56d54897b6ba2c3118a0d912451c2d48dd113a875e7f7bfcff8fbd6b4905472fcd120630661c12029a16d2b13add4 From faedf1d3d64513e2dc60d059411839c16770a791 Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 22 Nov 2018 16:42:03 +0100 Subject: [PATCH 24/79] Remove ldconfig scriptlet, now done via. transfiletrigger in glibc. --- p11-kit.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 7d8db44..72f41c9 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -89,14 +89,10 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_userunitdir} make check -%post -p /sbin/ldconfig - %post trust %{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so \ %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 -%postun -p /sbin/ldconfig - %postun trust if [ $1 -eq 0 ] ; then # package removal @@ -145,6 +141,9 @@ fi %changelog +* Mon Oct 29 2018 James Antill +- Remove ldconfig scriptlet, now done via. transfiletrigger in glibc. + * Fri Sep 07 2018 Daiki Ueno - 0.23.14-1 - Update to upstream 0.23.14 release From 8eaf66b00108872637d1eb3f440d4e756c814bc6 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 22 Nov 2018 16:48:09 +0100 Subject: [PATCH 25/79] Bump release --- p11-kit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 72f41c9..7ae3b9b 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.14 -Release: 1%{?dist} +Release: 2%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -141,7 +141,7 @@ fi %changelog -* Mon Oct 29 2018 James Antill +* Mon Oct 29 2018 James Antill - 0.23.14-2 - Remove ldconfig scriptlet, now done via. transfiletrigger in glibc. * Fri Sep 07 2018 Daiki Ueno - 0.23.14-1 From 9fc8dfbdd0ea58b2ea1474753e47879cc01a7432 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 11 Jan 2019 18:50:49 +0100 Subject: [PATCH 26/79] use spaces instead of tabs consistently --- p11-kit.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 7ae3b9b..b34110c 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.23.14 -Release: 2%{?dist} +Version: 0.23.14 +Release: 2%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -8,13 +8,13 @@ License: BSD URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat -Source2: p11-kit-client.service +Source2: p11-kit-client.service BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel BuildRequires: gtk-doc -BuildRequires: systemd-devel +BuildRequires: systemd-devel # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) @@ -35,11 +35,11 @@ developing applications that use %{name}. %package trust -Summary: System trust module from %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives -Conflicts: nss < 3.14.3-9 +Summary: System trust module from %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives +Conflicts: nss < 3.14.3-9 %description trust The %{name}-trust package contains a system trust PKCS#11 module which @@ -141,6 +141,9 @@ fi %changelog +* Fri Jan 11 2018 Nils Philippsen +- use spaces instead of tabs consistently + * Mon Oct 29 2018 James Antill - 0.23.14-2 - Remove ldconfig scriptlet, now done via. transfiletrigger in glibc. From 43974200652425924a39d665bbf6d08932e925da Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 11 Jan 2019 20:11:47 +0100 Subject: [PATCH 27/79] prefer fixed closures to libffi closures fixes #1656245, patch by Daiki Ueno --- ...er-fixed-closures-to-libffi-closures.patch | 71 +++++++++++++++++++ p11-kit.spec | 2 + 2 files changed, 73 insertions(+) create mode 100644 0001-prefer-fixed-closures-to-libffi-closures.patch diff --git a/0001-prefer-fixed-closures-to-libffi-closures.patch b/0001-prefer-fixed-closures-to-libffi-closures.patch new file mode 100644 index 0000000..4b8d0b2 --- /dev/null +++ b/0001-prefer-fixed-closures-to-libffi-closures.patch @@ -0,0 +1,71 @@ +From 6e1046de2233fba7875d3d6a1b260192678dd0ad Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Fri, 19 Oct 2018 10:21:36 +0200 +Subject: [PATCH] virtual: Prefer fixed closures to libffi closures + +On some circumstances (such as when loading p11-kit-proxy from httpd), +it is known that creation of libffi closure always fails, due to +SELinux policy. Although this is harmless, it pollutes the journal +and gives wrong hints when troubleshooting. This patch changes the +order of preference of libffi vs pre-compiled closures to avoid that. +--- + p11-kit/virtual.c | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/p11-kit/virtual.c b/p11-kit/virtual.c +index 6abfe7a..338239f 100644 +--- a/p11-kit/virtual.c ++++ b/p11-kit/virtual.c +@@ -2832,9 +2832,14 @@ p11_virtual_wrap (p11_virtual *virt, + p11_destroyer destroyer) + { + Wrapper *wrapper; ++ CK_FUNCTION_LIST *result; + + return_val_if_fail (virt != NULL, NULL); + ++ result = p11_virtual_wrap_fixed (virt, destroyer); ++ if (result) ++ return result; ++ + wrapper = calloc (1, sizeof (Wrapper)); + return_val_if_fail (wrapper != NULL, NULL); + +@@ -2844,8 +2849,10 @@ p11_virtual_wrap (p11_virtual *virt, + wrapper->bound.version.minor = CRYPTOKI_VERSION_MINOR; + wrapper->fixed_index = -1; + +- if (!init_wrapper_funcs (wrapper)) +- return p11_virtual_wrap_fixed (virt, destroyer); ++ if (!init_wrapper_funcs (wrapper)) { ++ free (wrapper); ++ return_val_if_reached (NULL); ++ } + + assert ((void *)wrapper == (void *)&wrapper->bound); + assert (p11_virtual_is_wrapper (&wrapper->bound)); +@@ -2859,7 +2866,11 @@ CK_FUNCTION_LIST * + p11_virtual_wrap (p11_virtual *virt, + p11_destroyer destroyer) + { +- return p11_virtual_wrap_fixed (virt, destroyer); ++ CK_FUNCTION_LIST *result; ++ ++ result = p11_virtual_wrap_fixed (virt, destroyer); ++ return_val_if_fail (result != NULL, NULL); ++ return result; + } + + #endif /* !FFI_CLOSURES */ +@@ -3068,8 +3079,6 @@ p11_virtual_wrap_fixed (p11_virtual *virt, + } + p11_mutex_unlock (&p11_virtual_mutex); + +- return_val_if_fail (result != NULL, NULL); +- + return result; + } + +-- +2.19.2 + diff --git a/p11-kit.spec b/p11-kit.spec index b34110c..0a60222 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -9,6 +9,7 @@ URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat Source2: p11-kit-client.service +Patch0: 0001-prefer-fixed-closures-to-libffi-closures.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 @@ -143,6 +144,7 @@ fi %changelog * Fri Jan 11 2018 Nils Philippsen - use spaces instead of tabs consistently +- prefer fixed closures to libffi closures (#1656245, patch by Daiki Ueno) * Mon Oct 29 2018 James Antill - 0.23.14-2 - Remove ldconfig scriptlet, now done via. transfiletrigger in glibc. From 57a71d3f42ac93edbdfd4ac19f62f37b872fa35c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 11 Jan 2019 20:14:26 +0100 Subject: [PATCH 28/79] bump release --- p11-kit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 0a60222..411d7fc 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.14 -Release: 2%{?dist} +Release: 3%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -142,7 +142,7 @@ fi %changelog -* Fri Jan 11 2018 Nils Philippsen +* Fri Jan 11 2019 Nils Philippsen - 0.23.14-3 - use spaces instead of tabs consistently - prefer fixed closures to libffi closures (#1656245, patch by Daiki Ueno) From 98a4ac63a26d2dd81f330a34e683274bd13c97ba Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 21 Jan 2019 11:16:21 +0100 Subject: [PATCH 29/79] Remove upstreamed patch --- p11-kit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 411d7fc..6a03301 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -9,7 +9,6 @@ URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat Source2: p11-kit-client.service -Patch0: 0001-prefer-fixed-closures-to-libffi-closures.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 From 6464a54d39de967face608613fc41527209e9e93 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 21 Jan 2019 11:20:38 +0100 Subject: [PATCH 30/79] Remove upstreamed patch --- ...er-fixed-closures-to-libffi-closures.patch | 71 ------------------- 1 file changed, 71 deletions(-) delete mode 100644 0001-prefer-fixed-closures-to-libffi-closures.patch diff --git a/0001-prefer-fixed-closures-to-libffi-closures.patch b/0001-prefer-fixed-closures-to-libffi-closures.patch deleted file mode 100644 index 4b8d0b2..0000000 --- a/0001-prefer-fixed-closures-to-libffi-closures.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 6e1046de2233fba7875d3d6a1b260192678dd0ad Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Fri, 19 Oct 2018 10:21:36 +0200 -Subject: [PATCH] virtual: Prefer fixed closures to libffi closures - -On some circumstances (such as when loading p11-kit-proxy from httpd), -it is known that creation of libffi closure always fails, due to -SELinux policy. Although this is harmless, it pollutes the journal -and gives wrong hints when troubleshooting. This patch changes the -order of preference of libffi vs pre-compiled closures to avoid that. ---- - p11-kit/virtual.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/p11-kit/virtual.c b/p11-kit/virtual.c -index 6abfe7a..338239f 100644 ---- a/p11-kit/virtual.c -+++ b/p11-kit/virtual.c -@@ -2832,9 +2832,14 @@ p11_virtual_wrap (p11_virtual *virt, - p11_destroyer destroyer) - { - Wrapper *wrapper; -+ CK_FUNCTION_LIST *result; - - return_val_if_fail (virt != NULL, NULL); - -+ result = p11_virtual_wrap_fixed (virt, destroyer); -+ if (result) -+ return result; -+ - wrapper = calloc (1, sizeof (Wrapper)); - return_val_if_fail (wrapper != NULL, NULL); - -@@ -2844,8 +2849,10 @@ p11_virtual_wrap (p11_virtual *virt, - wrapper->bound.version.minor = CRYPTOKI_VERSION_MINOR; - wrapper->fixed_index = -1; - -- if (!init_wrapper_funcs (wrapper)) -- return p11_virtual_wrap_fixed (virt, destroyer); -+ if (!init_wrapper_funcs (wrapper)) { -+ free (wrapper); -+ return_val_if_reached (NULL); -+ } - - assert ((void *)wrapper == (void *)&wrapper->bound); - assert (p11_virtual_is_wrapper (&wrapper->bound)); -@@ -2859,7 +2866,11 @@ CK_FUNCTION_LIST * - p11_virtual_wrap (p11_virtual *virt, - p11_destroyer destroyer) - { -- return p11_virtual_wrap_fixed (virt, destroyer); -+ CK_FUNCTION_LIST *result; -+ -+ result = p11_virtual_wrap_fixed (virt, destroyer); -+ return_val_if_fail (result != NULL, NULL); -+ return result; - } - - #endif /* !FFI_CLOSURES */ -@@ -3068,8 +3079,6 @@ p11_virtual_wrap_fixed (p11_virtual *virt, - } - p11_mutex_unlock (&p11_virtual_mutex); - -- return_val_if_fail (result != NULL, NULL); -- - return result; - } - --- -2.19.2 - From f820d48c88f62bcb78a27ef3e2d1c2035a9c05a9 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 21 Jan 2019 16:13:15 +0100 Subject: [PATCH 31/79] Update to 0.23.15-1 - Update to upstream 0.23.15 release --- .gitignore | 3 +++ p11-kit.spec | 7 +++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 092a8fb..a6c0618 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ /p11-kit-client.service /trust-extract-compat /p11-kit-0.23.14.tar.gz +/p11-kit-client.service +/trust-extract-compat +/p11-kit-0.23.15.tar.gz diff --git a/p11-kit.spec b/p11-kit.spec index 6a03301..60c60b4 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.23.14 -Release: 3%{?dist} +Version: 0.23.15 +Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -141,6 +141,9 @@ fi %changelog +* Mon Jan 21 2019 Daiki Ueno - 0.23.15-1 +- Update to upstream 0.23.15 release + * Fri Jan 11 2019 Nils Philippsen - 0.23.14-3 - use spaces instead of tabs consistently - prefer fixed closures to libffi closures (#1656245, patch by Daiki Ueno) diff --git a/sources b/sources index 4a817b4..cb7930a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 -SHA512 (p11-kit-0.23.14.tar.gz) = fc7e7e0745d7f8e5d783a1f38bad9bbe65b56d54897b6ba2c3118a0d912451c2d48dd113a875e7f7bfcff8fbd6b4905472fcd120630661c12029a16d2b13add4 +SHA512 (p11-kit-0.23.15.tar.gz) = d703eec12626b79551ce337521f7ea7b1a0b64c211d7a93d831dd28ec1de77c7b58358c1588bf82d70f047c01ad9433fa8a286d1a25ae3f6b0ee6016b8c42950 From 470464b6a63901ccb080d7409d3c822d0f3a41ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 17:46:59 +0000 Subject: [PATCH 32/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 60c60b4..8fa91c0 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.15 -Release: 1%{?dist} +Release: 2%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -141,6 +141,9 @@ fi %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.23.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 21 2019 Daiki Ueno - 0.23.15-1 - Update to upstream 0.23.15 release From dc76f22c046b6fc3ecc3f28dd147813dfcb7f11b Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 18 Feb 2019 18:23:44 +0100 Subject: [PATCH 33/79] trust: Ignore unreadable content in anchors Fixes rhbz#1675441 --- ...Ignore-unreadable-content-in-anchors.patch | 181 ++++++++++++++++++ p11-kit.spec | 6 +- 2 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 0001-trust-Ignore-unreadable-content-in-anchors.patch diff --git a/0001-trust-Ignore-unreadable-content-in-anchors.patch b/0001-trust-Ignore-unreadable-content-in-anchors.patch new file mode 100644 index 0000000..cb65e24 --- /dev/null +++ b/0001-trust-Ignore-unreadable-content-in-anchors.patch @@ -0,0 +1,181 @@ +From e2170b295992cb7fdf115227a78028ac3780619f Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Mon, 18 Feb 2019 14:53:49 +0100 +Subject: [PATCH] trust: Ignore unreadable content in anchors + +This amends eb503f3a1467f21a5ecc9ae84ae23b216afc102f. Instead of +failing C_FindObjectsInit, treat any errors internally and accumulates +the successfully loaded certificates. + +Reported by Andrej Kvasnica in: +https://bugzilla.redhat.com/show_bug.cgi?id=1675441 +--- + trust/module.c | 3 +- + trust/test-module.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ + trust/token.c | 23 ++++++-------- + 3 files changed, 88 insertions(+), 15 deletions(-) + +diff --git a/trust/module.c b/trust/module.c +index 1722340..ec3333d 100644 +--- a/trust/module.c ++++ b/trust/module.c +@@ -1198,8 +1198,7 @@ sys_C_FindObjectsInit (CK_SESSION_HANDLE handle, + indices[n++] = session->index; + if (want_token_objects) { + if (!session->loaded) +- if (p11_token_load (session->token) < 0) +- rv = CKR_FUNCTION_FAILED; ++ p11_token_load (session->token); + if (rv == CKR_OK) { + session->loaded = CK_TRUE; + indices[n++] = p11_token_index (session->token); +diff --git a/trust/test-module.c b/trust/test-module.c +index 1e8d812..4024d81 100644 +--- a/trust/test-module.c ++++ b/trust/test-module.c +@@ -163,6 +163,80 @@ setup_writable (void *unused) + p11_parser_formats (test.parser, p11_parser_format_persist, NULL); + } + ++/* This is similar to setup(), but it adds an unreadable content in ++ * the anchor directory. */ ++static void ++setup_unreadable (void *unused) ++{ ++ CK_C_INITIALIZE_ARGS args; ++ const char *paths; ++ char *p, *pp, *anchors; ++ FILE *f, *ff; ++ char buffer[4096]; ++ char *arguments; ++ CK_ULONG count; ++ CK_RV rv; ++ ++ memset (&test, 0, sizeof (test)); ++ ++ /* This is the entry point of the trust module, linked to this test */ ++ rv = C_GetFunctionList (&test.module); ++ assert (rv == CKR_OK); ++ ++ test.directory = p11_test_directory ("test-module"); ++ anchors = p11_path_build (test.directory, "anchors", NULL); ++#ifdef OS_UNIX ++ if (mkdir (anchors, S_IRWXU) < 0) ++#else ++ if (mkdir (anchors) < 0) ++#endif ++ assert_fail ("mkdir()", anchors); ++ ++ p = p11_path_build (anchors, "unreadable", NULL); ++ f = fopen (p, "w"); ++ fwrite ("foo", 3, 1, f); ++ fclose (f); ++ chmod (p, 0); ++ free (p); ++ ++ pp = p11_path_build (anchors, "thawte", NULL); ++ ff = fopen (pp, "w"); ++ f = fopen (SRCDIR "/trust/fixtures/thawte.pem", "r"); ++ while (!feof (f)) { ++ size_t size; ++ size = fread (buffer, 1, sizeof (buffer), f); ++ if (ferror (f)) ++ assert_fail ("fread()", ++ SRCDIR "/trust/fixtures/thawte.pem"); ++ fwrite (buffer, 1, size, ff); ++ if (ferror (ff)) ++ assert_fail ("write()", pp); ++ } ++ free (pp); ++ fclose (ff); ++ fclose (f); ++ free (anchors); ++ ++ memset (&args, 0, sizeof (args)); ++ paths = SRCDIR "/trust/input" P11_PATH_SEP \ ++ SRCDIR "/trust/fixtures/self-signed-with-ku.der"; ++ if (asprintf (&arguments, "paths='%s%c%s'", ++ paths, P11_PATH_SEP_C, test.directory) < 0) ++ assert (false && "not reached"); ++ args.pReserved = arguments; ++ args.flags = CKF_OS_LOCKING_OK; ++ ++ rv = test.module->C_Initialize (&args); ++ assert (rv == CKR_OK); ++ ++ free (arguments); ++ ++ count = NUM_SLOTS; ++ rv = test.module->C_GetSlotList (CK_TRUE, test.slots, &count); ++ assert (rv == CKR_OK); ++ assert (count == NUM_SLOTS); ++} ++ + static void + test_get_slot_list (void) + { +@@ -1324,5 +1398,8 @@ main (int argc, + p11_fixture (NULL, NULL); + p11_test (test_token_write_protected, "/module/token-write-protected"); + ++ p11_fixture (setup_unreadable, teardown); ++ p11_test (test_find_certificates, "/module/unreadable"); ++ + return p11_test_run (argc, argv); + } +diff --git a/trust/token.c b/trust/token.c +index b91a1d0..8c75d06 100644 +--- a/trust/token.c ++++ b/trust/token.c +@@ -266,8 +266,8 @@ loader_load_directory (p11_token *token, + return_val_if_fail (path != NULL, -1); + + ret = loader_load_if_file (token, path); +- return_val_if_fail (ret >=0, -1); +- total += ret; ++ if (ret >= 0) ++ total += ret; + + /* Make note that this file was seen */ + p11_dict_remove (present, path); +@@ -328,8 +328,8 @@ loader_load_path (p11_token *token, + p11_dict_iterate (present, &iter); + while (p11_dict_next (&iter, (void **)&filename, NULL)) { + ret = loader_load_if_file (token, filename); +- return_val_if_fail (ret >= 0, ret); +- total += ret; ++ if (ret >= 0) ++ total += ret; + } + } + +@@ -377,20 +377,17 @@ p11_token_load (p11_token *token) + int ret; + + ret = loader_load_path (token, token->path, &is_dir); +- if (ret < 0) +- return -1; +- total += ret; ++ if (ret >= 0) ++ total += ret; + + if (is_dir) { + ret = loader_load_path (token, token->anchors, &is_dir); +- if (ret < 0) +- return -1; +- total += ret; ++ if (ret >= 0) ++ total += ret; + + ret = loader_load_path (token, token->blacklist, &is_dir); +- if (ret < 0) +- return -1; +- total += ret; ++ if (ret >= 0) ++ total += ret; + } + + return total; +-- +2.20.1 + diff --git a/p11-kit.spec b/p11-kit.spec index 8fa91c0..7eb7c1c 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.15 -Release: 2%{?dist} +Release: 3%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -9,6 +9,7 @@ URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat Source2: p11-kit-client.service +Patch0: 0001-trust-Ignore-unreadable-content-in-anchors.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 @@ -141,6 +142,9 @@ fi %changelog +* Mon Feb 18 2019 Daiki Ueno - 0.23.15-3 +- trust: Ignore unreadable content in anchors + * Fri Feb 01 2019 Fedora Release Engineering - 0.23.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 7b3e3f565ed46043a80e8c90ef1273efb9ef27a3 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 23 May 2019 11:59:09 +0200 Subject: [PATCH 34/79] Prepare for the rebase --- ...Ignore-unreadable-content-in-anchors.patch | 181 ------------------ p11-kit.spec | 1 - 2 files changed, 182 deletions(-) delete mode 100644 0001-trust-Ignore-unreadable-content-in-anchors.patch diff --git a/0001-trust-Ignore-unreadable-content-in-anchors.patch b/0001-trust-Ignore-unreadable-content-in-anchors.patch deleted file mode 100644 index cb65e24..0000000 --- a/0001-trust-Ignore-unreadable-content-in-anchors.patch +++ /dev/null @@ -1,181 +0,0 @@ -From e2170b295992cb7fdf115227a78028ac3780619f Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Mon, 18 Feb 2019 14:53:49 +0100 -Subject: [PATCH] trust: Ignore unreadable content in anchors - -This amends eb503f3a1467f21a5ecc9ae84ae23b216afc102f. Instead of -failing C_FindObjectsInit, treat any errors internally and accumulates -the successfully loaded certificates. - -Reported by Andrej Kvasnica in: -https://bugzilla.redhat.com/show_bug.cgi?id=1675441 ---- - trust/module.c | 3 +- - trust/test-module.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ - trust/token.c | 23 ++++++-------- - 3 files changed, 88 insertions(+), 15 deletions(-) - -diff --git a/trust/module.c b/trust/module.c -index 1722340..ec3333d 100644 ---- a/trust/module.c -+++ b/trust/module.c -@@ -1198,8 +1198,7 @@ sys_C_FindObjectsInit (CK_SESSION_HANDLE handle, - indices[n++] = session->index; - if (want_token_objects) { - if (!session->loaded) -- if (p11_token_load (session->token) < 0) -- rv = CKR_FUNCTION_FAILED; -+ p11_token_load (session->token); - if (rv == CKR_OK) { - session->loaded = CK_TRUE; - indices[n++] = p11_token_index (session->token); -diff --git a/trust/test-module.c b/trust/test-module.c -index 1e8d812..4024d81 100644 ---- a/trust/test-module.c -+++ b/trust/test-module.c -@@ -163,6 +163,80 @@ setup_writable (void *unused) - p11_parser_formats (test.parser, p11_parser_format_persist, NULL); - } - -+/* This is similar to setup(), but it adds an unreadable content in -+ * the anchor directory. */ -+static void -+setup_unreadable (void *unused) -+{ -+ CK_C_INITIALIZE_ARGS args; -+ const char *paths; -+ char *p, *pp, *anchors; -+ FILE *f, *ff; -+ char buffer[4096]; -+ char *arguments; -+ CK_ULONG count; -+ CK_RV rv; -+ -+ memset (&test, 0, sizeof (test)); -+ -+ /* This is the entry point of the trust module, linked to this test */ -+ rv = C_GetFunctionList (&test.module); -+ assert (rv == CKR_OK); -+ -+ test.directory = p11_test_directory ("test-module"); -+ anchors = p11_path_build (test.directory, "anchors", NULL); -+#ifdef OS_UNIX -+ if (mkdir (anchors, S_IRWXU) < 0) -+#else -+ if (mkdir (anchors) < 0) -+#endif -+ assert_fail ("mkdir()", anchors); -+ -+ p = p11_path_build (anchors, "unreadable", NULL); -+ f = fopen (p, "w"); -+ fwrite ("foo", 3, 1, f); -+ fclose (f); -+ chmod (p, 0); -+ free (p); -+ -+ pp = p11_path_build (anchors, "thawte", NULL); -+ ff = fopen (pp, "w"); -+ f = fopen (SRCDIR "/trust/fixtures/thawte.pem", "r"); -+ while (!feof (f)) { -+ size_t size; -+ size = fread (buffer, 1, sizeof (buffer), f); -+ if (ferror (f)) -+ assert_fail ("fread()", -+ SRCDIR "/trust/fixtures/thawte.pem"); -+ fwrite (buffer, 1, size, ff); -+ if (ferror (ff)) -+ assert_fail ("write()", pp); -+ } -+ free (pp); -+ fclose (ff); -+ fclose (f); -+ free (anchors); -+ -+ memset (&args, 0, sizeof (args)); -+ paths = SRCDIR "/trust/input" P11_PATH_SEP \ -+ SRCDIR "/trust/fixtures/self-signed-with-ku.der"; -+ if (asprintf (&arguments, "paths='%s%c%s'", -+ paths, P11_PATH_SEP_C, test.directory) < 0) -+ assert (false && "not reached"); -+ args.pReserved = arguments; -+ args.flags = CKF_OS_LOCKING_OK; -+ -+ rv = test.module->C_Initialize (&args); -+ assert (rv == CKR_OK); -+ -+ free (arguments); -+ -+ count = NUM_SLOTS; -+ rv = test.module->C_GetSlotList (CK_TRUE, test.slots, &count); -+ assert (rv == CKR_OK); -+ assert (count == NUM_SLOTS); -+} -+ - static void - test_get_slot_list (void) - { -@@ -1324,5 +1398,8 @@ main (int argc, - p11_fixture (NULL, NULL); - p11_test (test_token_write_protected, "/module/token-write-protected"); - -+ p11_fixture (setup_unreadable, teardown); -+ p11_test (test_find_certificates, "/module/unreadable"); -+ - return p11_test_run (argc, argv); - } -diff --git a/trust/token.c b/trust/token.c -index b91a1d0..8c75d06 100644 ---- a/trust/token.c -+++ b/trust/token.c -@@ -266,8 +266,8 @@ loader_load_directory (p11_token *token, - return_val_if_fail (path != NULL, -1); - - ret = loader_load_if_file (token, path); -- return_val_if_fail (ret >=0, -1); -- total += ret; -+ if (ret >= 0) -+ total += ret; - - /* Make note that this file was seen */ - p11_dict_remove (present, path); -@@ -328,8 +328,8 @@ loader_load_path (p11_token *token, - p11_dict_iterate (present, &iter); - while (p11_dict_next (&iter, (void **)&filename, NULL)) { - ret = loader_load_if_file (token, filename); -- return_val_if_fail (ret >= 0, ret); -- total += ret; -+ if (ret >= 0) -+ total += ret; - } - } - -@@ -377,20 +377,17 @@ p11_token_load (p11_token *token) - int ret; - - ret = loader_load_path (token, token->path, &is_dir); -- if (ret < 0) -- return -1; -- total += ret; -+ if (ret >= 0) -+ total += ret; - - if (is_dir) { - ret = loader_load_path (token, token->anchors, &is_dir); -- if (ret < 0) -- return -1; -- total += ret; -+ if (ret >= 0) -+ total += ret; - - ret = loader_load_path (token, token->blacklist, &is_dir); -- if (ret < 0) -- return -1; -- total += ret; -+ if (ret >= 0) -+ total += ret; - } - - return total; --- -2.20.1 - diff --git a/p11-kit.spec b/p11-kit.spec index 7eb7c1c..0c820ea 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -9,7 +9,6 @@ URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz Source1: trust-extract-compat Source2: p11-kit-client.service -Patch0: 0001-trust-Ignore-unreadable-content-in-anchors.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 From ecfcfecd4f289f9b8f95a5beb8e5381a930c9fa7 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 23 May 2019 12:03:19 +0200 Subject: [PATCH 35/79] Update to 0.23.16-1 - Update to upstream 0.23.16 release --- .gitignore | 3 +++ p11-kit.spec | 7 +++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a6c0618..d4d43ff 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ /p11-kit-client.service /trust-extract-compat /p11-kit-0.23.15.tar.gz +/p11-kit-client.service +/trust-extract-compat +/p11-kit-0.23.16.tar.gz diff --git a/p11-kit.spec b/p11-kit.spec index 0c820ea..279fdf6 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.23.15 -Release: 3%{?dist} +Version: 0.23.16 +Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -141,6 +141,9 @@ fi %changelog +* Thu May 23 2019 Daiki Ueno - 0.23.16-1 +- Update to upstream 0.23.16 release + * Mon Feb 18 2019 Daiki Ueno - 0.23.15-3 - trust: Ignore unreadable content in anchors diff --git a/sources b/sources index cb7930a..ce88d15 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 -SHA512 (p11-kit-0.23.15.tar.gz) = d703eec12626b79551ce337521f7ea7b1a0b64c211d7a93d831dd28ec1de77c7b58358c1588bf82d70f047c01ad9433fa8a286d1a25ae3f6b0ee6016b8c42950 +SHA512 (p11-kit-0.23.16.tar.gz) = 36af13a18633698149c3b19458dce74d4441e184772229779335859a87af3997a59c2c590d8150dec52a3c58fe185c2281c589892b8fb87276f11fbc2c017d61 From 84adaeaf49f9275c496301a9199ed53b3c02b970 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 23 May 2019 14:35:12 +0200 Subject: [PATCH 36/79] Update to 0.23.16.1-1 - Update to upstream 0.23.16.1 release --- .gitignore | 3 +++ p11-kit.spec | 5 ++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d4d43ff..2750aeb 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ /p11-kit-client.service /trust-extract-compat /p11-kit-0.23.16.tar.gz +/p11-kit-client.service +/trust-extract-compat +/p11-kit-0.23.16.1.tar.gz diff --git a/p11-kit.spec b/p11-kit.spec index 279fdf6..3cb623f 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.23.16 +Version: 0.23.16.1 Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -141,6 +141,9 @@ fi %changelog +* Thu May 23 2019 Daiki Ueno - 0.23.16.1-1 +- Update to upstream 0.23.16.1 release + * Thu May 23 2019 Daiki Ueno - 0.23.16-1 - Update to upstream 0.23.16 release diff --git a/sources b/sources index ce88d15..2fecf01 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 -SHA512 (p11-kit-0.23.16.tar.gz) = 36af13a18633698149c3b19458dce74d4441e184772229779335859a87af3997a59c2c590d8150dec52a3c58fe185c2281c589892b8fb87276f11fbc2c017d61 +SHA512 (p11-kit-0.23.16.1.tar.gz) = 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7 From fe4702010af4c7d68aa36ca34f42b8ac430da816 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 23:51:18 +0000 Subject: [PATCH 37/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 3cb623f..13d1113 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -141,6 +141,9 @@ fi %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.23.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu May 23 2019 Daiki Ueno - 0.23.16.1-1 - Update to upstream 0.23.16.1 release From 984c7b95a60584fa0c11bc05c399d6ef0bccc0d2 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 30 Sep 2019 17:06:15 +0200 Subject: [PATCH 38/79] Update to 0.23.18.1-1 - Update to upstream 0.23.18.1 release --- .gitignore | 3 +++ p11-kit.spec | 7 +++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2750aeb..19022e0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ /p11-kit-client.service /trust-extract-compat /p11-kit-0.23.16.1.tar.gz +/p11-kit-client.service +/trust-extract-compat +/p11-kit-0.23.18.1.tar.gz diff --git a/p11-kit.spec b/p11-kit.spec index 13d1113..910e70a 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.23.16.1 -Release: 2%{?dist} +Version: 0.23.18.1 +Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -141,6 +141,9 @@ fi %changelog +* Mon Sep 30 2019 Daiki Ueno - 0.23.18.1-1 +- Update to upstream 0.23.18.1 release + * Thu Jul 25 2019 Fedora Release Engineering - 0.23.16.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2fecf01..7d2c9cc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 -SHA512 (p11-kit-0.23.16.1.tar.gz) = 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7 +SHA512 (p11-kit-0.23.18.1.tar.gz) = 941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd From f77861decaf912f7c4d0ac78fc4b2ba2137fb03e Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 22 Jan 2020 09:57:49 +0100 Subject: [PATCH 39/79] Update to 0.23.19-1 --- .gitignore | 1 + p11-kit.spec | 10 ++++++++-- sources | 4 +--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 19022e0..2daf75f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /p11-kit-client.service /trust-extract-compat /p11-kit-0.23.18.1.tar.gz +/p11-kit-0.23.19.tar.xz diff --git a/p11-kit.spec b/p11-kit.spec index 910e70a..0a779d0 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,12 +1,12 @@ # This spec file has been automatically updated -Version: 0.23.18.1 +Version: 0.23.19 Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules License: BSD URL: http://p11-glue.freedesktop.org/p11-kit.html -Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz +Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz Source1: trust-extract-compat Source2: p11-kit-client.service @@ -15,6 +15,7 @@ BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel BuildRequires: gtk-doc BuildRequires: systemd-devel +BuildRequires: bash-completion # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) @@ -117,6 +118,7 @@ fi %{_mandir}/man1/trust.1.gz %{_mandir}/man8/p11-kit.8.gz %{_mandir}/man5/pkcs11.conf.5.gz +%{_datadir}/bash-completion/completions/p11-kit %files devel %{_includedir}/p11-kit-1/ @@ -131,6 +133,7 @@ fi %{_libdir}/pkcs11/p11-kit-trust.so %{_datadir}/p11-kit/modules/p11-kit-trust.module %{_libexecdir}/p11-kit/trust-extract-compat +%{_datadir}/bash-completion/completions/trust %files server %{_libdir}/pkcs11/p11-kit-client.so @@ -141,6 +144,9 @@ fi %changelog +* Wed Jan 22 2020 Daiki Ueno - 0.23.19-1 +- Update to upstream 0.23.19 release + * Mon Sep 30 2019 Daiki Ueno - 0.23.18.1-1 - Update to upstream 0.23.18.1 release diff --git a/sources b/sources index 7d2c9cc..5b6c8f3 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b -SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42 -SHA512 (p11-kit-0.23.18.1.tar.gz) = 941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd +SHA512 (p11-kit-0.23.19.tar.xz) = 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2 From 704551f6007001217cc90083b832953a8c39dde8 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 22 Jan 2020 10:02:44 +0100 Subject: [PATCH 40/79] Check archive signature in %prep --- .gitignore | 1 + ...462225C3B46F34879FC8496CD605848ED7E69871.gpg | Bin 0 -> 48528 bytes p11-kit.spec | 14 ++++++++++---- sources | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg diff --git a/.gitignore b/.gitignore index 2daf75f..36bedb4 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /trust-extract-compat /p11-kit-0.23.18.1.tar.gz /p11-kit-0.23.19.tar.xz +/p11-kit-0.23.19.tar.xz.sig diff --git a/gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg b/gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg new file mode 100644 index 0000000000000000000000000000000000000000..30cd72996164fbba16fd2ee7098b8d28633c03e8 GIT binary patch literal 48528 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 LgW^y2I9&e=>2^@# literal 0 HcmV?d00001 diff --git a/p11-kit.spec b/p11-kit.spec index 0a779d0..bba68e3 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -7,8 +7,10 @@ Summary: Library for loading and sharing PKCS#11 modules License: BSD URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz -Source1: trust-extract-compat -Source2: p11-kit-client.service +Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz.sig +Source2: gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg +Source3: trust-extract-compat +Source4: p11-kit-client.service BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 @@ -19,6 +21,7 @@ BuildRequires: bash-completion # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) +BuildRequires: gnupg2 %description p11-kit provides a way to load and enumerate PKCS#11 modules, as well @@ -67,6 +70,8 @@ feature is still experimental. %prep +gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} + %autosetup -p1 %build @@ -80,11 +85,11 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/pkcs11/*.la -install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/p11-kit/ +install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/p11-kit/ # Install the example conf with %%doc instead rm $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/pkcs11.conf.example mkdir -p $RPM_BUILD_ROOT%{_userunitdir} -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_userunitdir} +install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir} %check make check @@ -146,6 +151,7 @@ fi %changelog * Wed Jan 22 2020 Daiki Ueno - 0.23.19-1 - Update to upstream 0.23.19 release +- Check archive signature in %%prep * Mon Sep 30 2019 Daiki Ueno - 0.23.18.1-1 - Update to upstream 0.23.18.1 release diff --git a/sources b/sources index 5b6c8f3..c49b5ca 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (p11-kit-0.23.19.tar.xz) = 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2 +SHA512 (p11-kit-0.23.19.tar.xz.sig) = 4757347a822f9ea82aa0b6771776a02056786a9371fdb2a3acc14f0fee724a80de2ea9b270aa99ef27db1b5aebadfdacf52013092ebcfaeb37cf9b350c850435 From e5a2bc3f85019976d1b9af65d8c583aad35934e3 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 22 Jan 2020 10:06:42 +0100 Subject: [PATCH 41/79] Switch to using Meson as the build system --- p11-kit.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index bba68e3..393df0f 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -15,7 +15,9 @@ Source4: p11-kit-client.service BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel +BuildRequires: gettext BuildRequires: gtk-doc +BuildRequires: meson BuildRequires: systemd-devel BuildRequires: bash-completion # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 @@ -77,22 +79,22 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %build # These paths are the source paths that come from the plan here: # https://fedoraproject.org/wiki/Features/SharedSystemCertificates:SubTasks -%configure --disable-static --enable-doc --with-trust-paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source --disable-silent-rules -make %{?_smp_mflags} V=1 +%meson -Dgtk_doc=true -Dman=true -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source +%meson_build %install -make install DESTDIR=$RPM_BUILD_ROOT +%meson_install mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/pkcs11/*.la install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/p11-kit/ # Install the example conf with %%doc instead -rm $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/pkcs11.conf.example +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} +mv $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/pkcs11.conf.example $RPM_BUILD_ROOT%{_docdir}/%{name}/pkcs11.conf.example mkdir -p $RPM_BUILD_ROOT%{_userunitdir} install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir} +%find_lang %{name} %check -make check +%meson_test %post trust @@ -106,11 +108,11 @@ if [ $1 -eq 0 ] ; then fi -%files +%files -f %{name}.lang %{!?_licensedir:%global license %%doc} %license COPYING %doc AUTHORS NEWS README -%doc p11-kit/pkcs11.conf.example +%{_docdir}/%{name}/pkcs11.conf.example %dir %{_sysconfdir}/pkcs11 %dir %{_sysconfdir}/pkcs11/modules %dir %{_datadir}/p11-kit @@ -152,6 +154,7 @@ fi * Wed Jan 22 2020 Daiki Ueno - 0.23.19-1 - Update to upstream 0.23.19 release - Check archive signature in %%prep +- Switch to using Meson as the build system * Mon Sep 30 2019 Daiki Ueno - 0.23.18.1-1 - Update to upstream 0.23.18.1 release From 6ca21e06930c8e9afff0b875dc7df3b457552987 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 29 Jan 2020 17:54:49 +0100 Subject: [PATCH 42/79] Update to 0.23.20-1 --- .gitignore | 1 + p11-kit-0.23.20.tar.xz.sig | Bin 0 -> 580 bytes p11-kit.spec | 5 ++++- sources | 3 +-- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 p11-kit-0.23.20.tar.xz.sig diff --git a/.gitignore b/.gitignore index 36bedb4..462a842 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /p11-kit-0.23.18.1.tar.gz /p11-kit-0.23.19.tar.xz /p11-kit-0.23.19.tar.xz.sig +/p11-kit-0.23.20.tar.xz diff --git a/p11-kit-0.23.20.tar.xz.sig b/p11-kit-0.23.20.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..f1e2607bf66f484a87d8191e4aed67ac4341b86a GIT binary patch literal 580 zcmV-K0=xZ*0zm`-0SEvq79j*iA|=DLZ#0LW$VqJ01%!^*=9qB>0$wqo*#3b?q^D%lTb~IrfwVW*$3jk(XVm71YsiIb*c@H6h z)uWFya_OO&Ypb@Xq9v}z+P1Ko@zN8g_xD$|Xn6Yi0Y01BZy}msnL#S!%M}rtD8X&R zAdI}yZS=wZknB-@u^LU&$^!Ac~oTgf6$7KfvGX zr}~5Jtxy$Qx>Nj(#yg&>b%xEwQQQ#5D3uhDm>RHvV=2Ntp%x-0)g{itN|x;#2kWe4 S7+;SIs)k0F^l$gFJ&BhJpA<^~ literal 0 HcmV?d00001 diff --git a/p11-kit.spec b/p11-kit.spec index 393df0f..99889e7 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.23.19 +Version: 0.23.20 Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -151,6 +151,9 @@ fi %changelog +* Wed Jan 29 2020 Daiki Ueno - 0.23.20-1 +- Update to upstream 0.23.20 release + * Wed Jan 22 2020 Daiki Ueno - 0.23.19-1 - Update to upstream 0.23.19 release - Check archive signature in %%prep diff --git a/sources b/sources index c49b5ca..a8b9a06 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (p11-kit-0.23.19.tar.xz) = 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2 -SHA512 (p11-kit-0.23.19.tar.xz.sig) = 4757347a822f9ea82aa0b6771776a02056786a9371fdb2a3acc14f0fee724a80de2ea9b270aa99ef27db1b5aebadfdacf52013092ebcfaeb37cf9b350c850435 +SHA512 (p11-kit-0.23.20.tar.xz) = 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57 From 3d3fc1ffba6d639d339d1483b56496c5a2e9e189 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 13:00:58 +0000 Subject: [PATCH 43/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 99889e7..fff2e57 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.20 -Release: 1%{?dist} +Release: 2%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -151,6 +151,9 @@ fi %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.23.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Daiki Ueno - 0.23.20-1 - Update to upstream 0.23.20 release From 3be0aa7251dff57dc264a6895f915c2eaf36ed2e Mon Sep 17 00:00:00 2001 From: Packit Service Date: Tue, 18 Aug 2020 14:45:29 +0000 Subject: [PATCH 44/79] [packit] 0.23.21 upstream release Upstream tag: 0.23.21 Upstream commit: fd8b56f3 Signed-off-by: Packit Service --- .gitignore | 1 + .packit.yaml | 24 ++++++++++++++++++++++++ README.packit | 3 +++ p11-kit-0.23.21.tar.xz.sig | Bin 0 -> 580 bytes p11-kit.spec | 5 ++++- sources | 2 +- 6 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit create mode 100644 p11-kit-0.23.21.tar.xz.sig diff --git a/.gitignore b/.gitignore index 462a842..cb18d47 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /p11-kit-0.23.19.tar.xz /p11-kit-0.23.19.tar.xz.sig /p11-kit-0.23.20.tar.xz +/p11-kit-0.23.21.tar.xz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..12ba12c --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,24 @@ +specfile_path: p11-kit.spec +synced_files: + - p11-kit.spec + - .packit.yaml +upstream_package_name: p11-kit +downstream_package_name: p11-kit + +# Use only populated spec files and upstream sources. +actions: + post-upstream-clone: + - wget https://src.fedoraproject.org/rpms/p11-kit/raw/master/f/p11-kit.spec + - wget https://src.fedoraproject.org/rpms/p11-kit/raw/master/f/p11-kit-client.service + - wget https://src.fedoraproject.org/rpms/p11-kit/raw/master/f/trust-extract-compat + get-current-version: + - "git describe --abbrev=0" + create-archive: + - "wget https://github.com/p11-glue/p11-kit/releases/download/$PACKIT_PROJECT_VERSION/p11-kit-$PACKIT_PROJECT_VERSION.tar.xz" + - "wget https://github.com/p11-glue/p11-kit/releases/download/$PACKIT_PROJECT_VERSION/p11-kit-$PACKIT_PROJECT_VERSION.tar.xz.sig" + +jobs: + - job: propose_downstream + trigger: release + metadata: + dist_git_branches: fedora-all diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..6610a56 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.14.1.dev26+gb5da23c. diff --git a/p11-kit-0.23.21.tar.xz.sig b/p11-kit-0.23.21.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..599cbcaa3741c94c3a9d29bc587112fd8766580a GIT binary patch literal 580 zcmV-K0=xZ*0zm`-0SEvq79j*iA|=DLZ#0LW$VqJ01%!^*=9qB>0$)4lW(^#5Wo~ak zXKr;aZ*pe<3JDO_1%!^*=9qCQI1m7hc(H3e;!Y_DBJY%${o|@-V0{K>DH!U>SvW3k zmY;{Me^f&~pb=8EC--wOvv7gJQrl$FjZ6##)UWg8dz2C=84YYr{TR*-^-*=KJO#)J z`ja@4Sl97t5}CeXWJ3HdUj`jtrUnvLO&_mqj>J(s9)V0V34mP;t}GlTEe#cYb*p8Q zJ-{IZqpC|1lj`ZGqhD}a{;jX-fA1Lwc@A}N1QIM}HSTDVdb$pTKGj))8Lro3A^d3y z+VPkjrXqITVuy#RZM0Xsv})hcs*7c;X6m5`83CoVK7)JL+{>L`0_RlQ_Dbw}(NC}4 zeNPQYf!!cD_rlF2g~Vlq^7(PUT#0?BjVDz5&{dwpt--VB!}d{Dk5bSHS}Kx%Ve_7$ z*8%xi2?WKAj&Ae^8P~TIC$!{Bzp{^^C|A-pucX%B^zDsQBQ<0kaXH3o zvj>3xHp3I1OLTJ-3>BNsnVS~ru?NI_A~IW9Vtk6_X8@Y(r>!`p!bO4zk=0H1ZiK - 0.23.21-2 +- new upstream release: 0.23.21 + * Tue Jul 28 2020 Fedora Release Engineering - 0.23.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a8b9a06..42ac915 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (p11-kit-0.23.20.tar.xz) = 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57 +SHA512 (p11-kit-0.23.21.tar.xz) = 4c796ca2c72a650f105a7a70aa62e55edb12e1c151e91ef92bfeee6c5c68982b36023400b42c4efcb1d351b7848e8618c26607cdb0f77b48ae40e2ecfd713e3e From 4ccfb55efba160ba73f2e3275cff6ad870ab2cb2 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Thu, 12 Nov 2020 18:45:53 +0100 Subject: [PATCH 45/79] Add an explicit build dependency on xsltproc --- p11-kit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 6f827ac..32d5127 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.21 -Release: 2%{?dist} +Release: 3%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -24,6 +24,7 @@ BuildRequires: bash-completion # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) BuildRequires: gnupg2 +BuildRequires: /usr/bin/xsltproc %description p11-kit provides a way to load and enumerate PKCS#11 modules, as well @@ -151,6 +152,9 @@ fi %changelog +* Thu Nov 12 2020 Alexander Sosedkin - 0.23.21-3 +- Add an explicit build dependency on xsltproc + * Tue Aug 18 2020 Packit Service - 0.23.21-2 - new upstream release: 0.23.21 From c67066c471ae77d4fb7b72f4465695f5c454ccad Mon Sep 17 00:00:00 2001 From: Packit Service Date: Fri, 11 Dec 2020 18:14:41 +0000 Subject: [PATCH 46/79] [packit] 0.23.22 upstream release Upstream tag: 0.23.22 Upstream commit: bd97afbf Signed-off-by: Packit Service --- .gitignore | 1 + README.packit | 2 +- p11-kit-0.23.22.tar.xz.sig | Bin 0 -> 580 bytes p11-kit.spec | 39 +++++++++++++++++++++++++++++++++++-- sources | 2 +- 5 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 p11-kit-0.23.22.tar.xz.sig diff --git a/.gitignore b/.gitignore index cb18d47..bc5520f 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /p11-kit-0.23.19.tar.xz.sig /p11-kit-0.23.20.tar.xz /p11-kit-0.23.21.tar.xz +/p11-kit-0.23.22.tar.xz diff --git a/README.packit b/README.packit index 6610a56..f2e7df3 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.14.1.dev26+gb5da23c. +The file was generated using packit 0.21.1.dev11+g485bd88. diff --git a/p11-kit-0.23.22.tar.xz.sig b/p11-kit-0.23.22.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..6ef001e021400211896d7cde2ea969d72b40170c GIT binary patch literal 580 zcmV-K0=xZ*0zm`-0SEvq79j*iA|=DLZ#0LW$VqJ01%!^*=9qB>0$%}}C%`sX#k z@+EO&X5M!|dst(0s5|j5m1?1%0~dJ`75%cn3J#s=x=}o1hsqG&!AGl(hlLx07ZB6p zX^{axJG#awb}+EUx;PXz?{6idTYHZLv}TmG@> z(W`r-gPNK=pF4l})bSf{<_QJQ+Q7p*#q+fCSP@s5EeuqXn|x)J5PcnZ^V8NQCUC}z zckYB6Rl!(biwMPzMwFZ~^=L&`-(f7ZxY_<trH*LCoj-nr+1ROgzJI_YQg+o#?FtlO@J#aWiAT9>PZ29zN7%qwJ8eV+g%FOc0@ zT9W8O6&5X5wDgoxl*+tugScihD|p#TPFd)hKrqgA=O0ZE(`hlkT_mj7a!0wWfMdI literal 0 HcmV?d00001 diff --git a/p11-kit.spec b/p11-kit.spec index 32d5127..bbad9e3 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.23.21 -Release: 3%{?dist} +Version: 0.23.22 +Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -152,6 +152,41 @@ fi %changelog +* Fri Dec 11 2020 Packit Service - 0.23.22-1 +- Release 0.23.22 (Daiki Ueno) +- Follow-up to arithmetic overflow fix (David Cook) +- Check for arithmetic overflows before allocating (David Cook) +- Check attribute length against buffer size (David Cook) +- Fix bounds check in p11_rpc_buffer_get_byte_array (David Cook) +- Fix buffer overflow in log_token_info (David Cook) +- common: Don't assume __STDC_VERSION__ is always defined (Daiki Ueno) +- compat: getauxval: correct compiler macro for FreeBSD (Daiki Ueno) +- compat: fdwalk: add guard for Linux specific local variables (Daiki Ueno) +- meson: Add missing libtasn1 dependency (Daiki Ueno) +- travis: Add freebsd build (Daiki Ueno) +- anchor: Prefer persistent format when storing anchor (Daiki Ueno) +- travis: Run "make check" along with "make distcheck" for coverage (Daiki Ueno) +- travis: Use python3 as the default Python interpreter (Daiki Ueno) +- travis: Route to Ubuntu 20.04 base image (Daiki Ueno) +- meson: Set -fstack-protector for MinGW64 cross build (Daiki Ueno) +- meson: expand ternary operator in function call for compatibility (Daiki Ueno) +- meson: Use custom_target for generating external XML entities (Daiki Ueno) +- meson: Allow building manpages without gtk-doc (Jan Alexander Steffens (heftig)) +- Rename is_path_component to is_path_separator (Alexander Sosedkin) +- Use is_path_component in one more place (Alexander Sosedkin) +- Remove more duplicate separators in p11_path_build (Alexander Sosedkin) +- common: Fix infloop in p11_path_build (Daiki Ueno) +- proxy: C_CloseAllSessions: Make sure that calloc args are non-zero (Daiki Ueno) +- build: Use calloc in a consistent manner (Daiki Ueno) +- meson: Allow override of default bashcompdir. Fixes meson regression (issue #322). Pass -Dbashcompdir=/xxx to meson. (John Hein) +- common: Check for a NULL locale before freeing it (Tavian Barnes) +- p11_test_copy_setgid: Skip setgid tests on nosuid filesystems (Anders Kaseorg) +- unix-peer: replace incorrect include1 (Rosen Penev) +- test-compat: Skip getprogname test if BUILDDIR contains a symlink (Daiki Ueno) +- add trust-extract-compat into EXTRA-DIST (Xℹ Ruoyao) +- meson: install trust-extract-compat (Xℹ Ruoyao) +- rename trust-extract-compat.in to trust-extract-compat (Xℹ Ruoyao) + * Thu Nov 12 2020 Alexander Sosedkin - 0.23.21-3 - Add an explicit build dependency on xsltproc diff --git a/sources b/sources index 42ac915..66d9389 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (p11-kit-0.23.21.tar.xz) = 4c796ca2c72a650f105a7a70aa62e55edb12e1c151e91ef92bfeee6c5c68982b36023400b42c4efcb1d351b7848e8618c26607cdb0f77b48ae40e2ecfd713e3e +SHA512 (p11-kit-0.23.22.tar.xz) = 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080 From 6b30a6f6a1fbf2bd377b43be8510e8ecd1819d48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 22:48:14 +0000 Subject: [PATCH 47/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index bbad9e3..6f0f9a2 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.22 -Release: 1%{?dist} +Release: 2%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -152,6 +152,9 @@ fi %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.23.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Dec 11 2020 Packit Service - 0.23.22-1 - Release 0.23.22 (Daiki Ueno) - Follow-up to arithmetic overflow fix (David Cook) From 1a69b38e16824165f458ab7b62b2f6bba453d9a0 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 27 Jan 2021 17:31:23 +0100 Subject: [PATCH 48/79] Suppress intentional memleak in getprogname emulation (#1905581) --- p11-kit-0.23.22-progname-leak.patch | 87 +++++++++++++++++++++++++++++ p11-kit.spec | 6 +- 2 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 p11-kit-0.23.22-progname-leak.patch diff --git a/p11-kit-0.23.22-progname-leak.patch b/p11-kit-0.23.22-progname-leak.patch new file mode 100644 index 0000000..0f1dd6e --- /dev/null +++ b/p11-kit-0.23.22-progname-leak.patch @@ -0,0 +1,87 @@ +From 40fbf74b02b8ad6625e3aa49d2cdef2b52e47a04 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Mon, 25 Jan 2021 18:24:01 +0100 +Subject: [PATCH] compat: Pacify ASan complaints on intentionally leaked buffer + +Reported by Viktor Ashirov in: +https://bugzilla.redhat.com/show_bug.cgi?id=1905581 +--- + common/compat.c | 25 +++++++++++++++++++------ + common/library.c | 9 +++++++++ + 2 files changed, 28 insertions(+), 6 deletions(-) + +diff --git a/common/compat.c b/common/compat.c +index 4390cef..d6c5af6 100644 +--- a/common/compat.c ++++ b/common/compat.c +@@ -100,6 +100,19 @@ extern char *program_invocation_short_name; + extern char *__progname; + #endif + ++#ifdef __linux__ ++/* This symbol is also defined in library.c so as to be freed by the library ++ * destructor. If weak symbols are not supported nor library.c is not linked we ++ * simply leak the memory allocated with realpath(). */ ++#ifdef __GNUC__ ++extern char *p11_program_realpath; ++ ++char *p11_program_realpath __attribute__((weak)); ++#else ++static char *p11_program_realpath; ++#endif ++#endif ++ + const char * + getprogname (void) + { +@@ -124,14 +137,14 @@ getprogname (void) + * Logic borrowed from: + * . + */ +- static char *buf; +- +- if (!buf) +- buf = realpath ("/proc/self/exe", NULL); ++ if (!p11_program_realpath) ++ p11_program_realpath = realpath ("/proc/self/exe", NULL); + +- if (buf && strncmp (buf, name, strlen (buf)) == 0) ++ if (p11_program_realpath && ++ strncmp (p11_program_realpath, name, ++ strlen (p11_program_realpath)) == 0) + /* Use the executable path if the prefix matches. */ +- name = strrchr (buf, '/') + 1; ++ name = strrchr (p11_program_realpath, '/') + 1; + else + /* Otherwise fall back to + * program_invocation_short_name. */ +diff --git a/common/library.c b/common/library.c +index 891344a..1581702 100644 +--- a/common/library.c ++++ b/common/library.c +@@ -82,6 +82,11 @@ unsigned int p11_forkid = 1; + extern locale_t p11_message_locale; + #endif + ++#ifdef __linux__ ++/* used only under __linux__ in the getprogname() emulation in compat.c. */ ++char *p11_program_realpath; ++#endif ++ + static char * + thread_local_message (void) + { +@@ -190,6 +195,10 @@ p11_library_uninit (void) + #endif + p11_mutex_uninit (&p11_virtual_mutex); + p11_mutex_uninit (&p11_library_mutex); ++ ++#ifdef __linux__ ++ free (p11_program_realpath); ++#endif + } + + #endif /* OS_UNIX */ +-- +2.29.2 + diff --git a/p11-kit.spec b/p11-kit.spec index 6f0f9a2..b49219a 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.22 -Release: 2%{?dist} +Release: 3%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -11,6 +11,7 @@ Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source2: gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg Source3: trust-extract-compat Source4: p11-kit-client.service +Patch0: p11-kit-0.23.22-progname-leak.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 @@ -152,6 +153,9 @@ fi %changelog +* Tue Jan 26 2021 Daiki Ueno - 0.23.22-3 +- Suppress intentional memleak in getprogname emulation (#1905581) + * Tue Jan 26 2021 Fedora Release Engineering - 0.23.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a8a44de793419e18c928524438fc3dbdb9f0bffc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 17:33:30 +0000 Subject: [PATCH 49/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index b49219a..25f93a8 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.22 -Release: 3%{?dist} +Release: 4%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -153,6 +153,9 @@ fi %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.23.22-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Daiki Ueno - 0.23.22-3 - Suppress intentional memleak in getprogname emulation (#1905581) From fd9096a458945df642998862dc21101893f4c162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 8 Jan 2022 11:12:38 +0100 Subject: [PATCH 50/79] Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 25f93a8..99bcae7 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.23.22 -Release: 4%{?dist} +Release: 5%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -153,6 +153,9 @@ fi %changelog +* Sat Jan 08 2022 Miro Hrončok - 0.23.22-5 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + * Thu Jul 22 2021 Fedora Release Engineering - 0.23.22-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 10b866233d5265d8797b16d221676ce84933c8b6 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Mon, 17 Jan 2022 14:53:26 +0000 Subject: [PATCH 51/79] [packit] 0.24.1 upstream release Upstream tag: 0.24.1 Upstream commit: dd0590d4 Signed-off-by: Packit Service --- .gitignore | 1 + .packit.yaml | 9 +++------ README.packit | 2 +- p11-kit-0.24.1.tar.xz.sig | Bin 0 -> 566 bytes p11-kit.spec | 25 ++++++++++++++++++++++--- sources | 2 +- 6 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 p11-kit-0.24.1.tar.xz.sig diff --git a/.gitignore b/.gitignore index bc5520f..177599a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /p11-kit-0.23.20.tar.xz /p11-kit-0.23.21.tar.xz /p11-kit-0.23.22.tar.xz +/p11-kit-0.24.1.tar.xz diff --git a/.packit.yaml b/.packit.yaml index 12ba12c..fff496e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,16 +1,13 @@ specfile_path: p11-kit.spec -synced_files: - - p11-kit.spec - - .packit.yaml upstream_package_name: p11-kit downstream_package_name: p11-kit # Use only populated spec files and upstream sources. actions: post-upstream-clone: - - wget https://src.fedoraproject.org/rpms/p11-kit/raw/master/f/p11-kit.spec - - wget https://src.fedoraproject.org/rpms/p11-kit/raw/master/f/p11-kit-client.service - - wget https://src.fedoraproject.org/rpms/p11-kit/raw/master/f/trust-extract-compat + - wget https://src.fedoraproject.org/rpms/p11-kit/raw/rawhide/f/p11-kit.spec + - wget https://src.fedoraproject.org/rpms/p11-kit/raw/rawhide/f/p11-kit-client.service + - wget https://src.fedoraproject.org/rpms/p11-kit/raw/rawhide/f/trust-extract-compat get-current-version: - "git describe --abbrev=0" create-archive: diff --git a/README.packit b/README.packit index f2e7df3..45640bd 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.21.1.dev11+g485bd88. +The file was generated using packit 0.43.1.dev8+ga0f2a9f. diff --git a/p11-kit-0.24.1.tar.xz.sig b/p11-kit-0.24.1.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..bfc093a7692f3e40039a2f4a8deab7160234168e GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*iA|=DLZ#0LW$VqJ01%!^*=9qB>0%7HW-~b8<5Y`2R zj@Raxaj2sY|9exNS+()9>7uSw+;C}vXJc8WK^f<4Wg4Y19YfDJ1ywxW)z#;lW@UCL?lmULiO_>uZC`i*4|y|s-%quUhVCk2 zB_|$(HwPs~|D`|n^o00L3MBe1fWrf5#}+QZ%(>xyz-bRoLJTs)gFy$M|7$p-w;+dqt^DHa2opxRzQ$WweDInelzrI EpIe9=Z2$lO literal 0 HcmV?d00001 diff --git a/p11-kit.spec b/p11-kit.spec index 99bcae7..f0ada61 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.23.22 -Release: 5%{?dist} +Version: 0.24.1 +Release: 1%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -11,7 +11,6 @@ Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source2: gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg Source3: trust-extract-compat Source4: p11-kit-client.service -Patch0: p11-kit-0.23.22-progname-leak.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 @@ -153,6 +152,26 @@ fi %changelog +* Mon Jan 17 2022 Packit Service - 0.24.1-1 +- Release 0.24.1 (Daiki Ueno) +- common: Support copying attribute array recursively (Daiki Ueno) +- common: Add assert_ptr_cmp (Daiki Ueno) +- gtkdoc: remove dependencies on custom target files (Eli Schwartz) +- doc: Replace occurrence of black list with blocklist (Daiki Ueno) +- build: Suppress cppcheck false-positive on array bounds (Daiki Ueno) +- ci: Use Docker image from the same repository (Daiki Ueno) +- ci: Integrate Docker image building to GitHub workflow (Daiki Ueno) +- rpc: Fallback to version 0 if server does not support negotiation (Daiki Ueno) +- build: Port e850e03be65ed573d0b69ee0408e776c08fad8a3 to meson (Daiki Ueno) +- Link libp11-kit so that it cannot unload (Emmanuel Dreyfus) +- trust: Use dngettext for plurals (Daiki Ueno) +- rpc: Support protocol version negotiation (Daiki Ueno) +- rpc: Separate authentication step from transaction (Daiki Ueno) +- Meson: p11_system_config_modules instead of p11_package_config_modules (Issam E. Maghni) +- shell: test -a|o is not POSIX (Issam E. Maghni) +- Meson: Add libtasn1 to trust programs (Issam E. Maghni) +- meson: optionalise glib's development files for gtk_doc (Đoàn Trần Công Danh) + * Sat Jan 08 2022 Miro Hrončok - 0.23.22-5 - Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 diff --git a/sources b/sources index 66d9389..1791414 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (p11-kit-0.23.22.tar.xz) = 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080 +SHA512 (p11-kit-0.24.1.tar.xz) = 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81 From 2797e8047822e4fcdd9363942e7fb4d598f849f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 22:42:57 +0000 Subject: [PATCH 52/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index f0ada61..20eae1d 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.24.1 -Release: 1%{?dist} +Release: 2%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -152,6 +152,9 @@ fi %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.24.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 17 2022 Packit Service - 0.24.1-1 - Release 0.24.1 (Daiki Ueno) - common: Support copying attribute array recursively (Daiki Ueno) From 957b7f3fbf6f63621d5006acbd0842ad9d12f5cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 02:29:51 +0000 Subject: [PATCH 53/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p11-kit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 20eae1d..973bf03 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.24.1 -Release: 2%{?dist} +Release: 3%{?dist} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -152,6 +152,9 @@ fi %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 0.24.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.24.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 1770b98d87cd566e6acf09027c2ffc902c1f1cac Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 18 Oct 2022 13:49:05 +0900 Subject: [PATCH 54/79] Opt into rpmautospec Signed-off-by: Daiki Ueno --- changelog | 364 ++++++++++++++++++++++++++++++++++++++++++++++++++ p11-kit.spec | 368 +-------------------------------------------------- 2 files changed, 367 insertions(+), 365 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..fe28d02 --- /dev/null +++ b/changelog @@ -0,0 +1,364 @@ +* Fri Jul 22 2022 Fedora Release Engineering - 0.24.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.24.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Jan 17 2022 Packit Service - 0.24.1-1 +- Release 0.24.1 (Daiki Ueno) +- common: Support copying attribute array recursively (Daiki Ueno) +- common: Add assert_ptr_cmp (Daiki Ueno) +- gtkdoc: remove dependencies on custom target files (Eli Schwartz) +- doc: Replace occurrence of black list with blocklist (Daiki Ueno) +- build: Suppress cppcheck false-positive on array bounds (Daiki Ueno) +- ci: Use Docker image from the same repository (Daiki Ueno) +- ci: Integrate Docker image building to GitHub workflow (Daiki Ueno) +- rpc: Fallback to version 0 if server does not support negotiation (Daiki Ueno) +- build: Port e850e03be65ed573d0b69ee0408e776c08fad8a3 to meson (Daiki Ueno) +- Link libp11-kit so that it cannot unload (Emmanuel Dreyfus) +- trust: Use dngettext for plurals (Daiki Ueno) +- rpc: Support protocol version negotiation (Daiki Ueno) +- rpc: Separate authentication step from transaction (Daiki Ueno) +- Meson: p11_system_config_modules instead of p11_package_config_modules (Issam E. Maghni) +- shell: test -a|o is not POSIX (Issam E. Maghni) +- Meson: Add libtasn1 to trust programs (Issam E. Maghni) +- meson: optionalise glib's development files for gtk_doc (Đoàn Trần Công Danh) + +* Sat Jan 08 2022 Miro Hrončok - 0.23.22-5 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + +* Thu Jul 22 2021 Fedora Release Engineering - 0.23.22-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Daiki Ueno - 0.23.22-3 +- Suppress intentional memleak in getprogname emulation (#1905581) + +* Tue Jan 26 2021 Fedora Release Engineering - 0.23.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Dec 11 2020 Packit Service - 0.23.22-1 +- Release 0.23.22 (Daiki Ueno) +- Follow-up to arithmetic overflow fix (David Cook) +- Check for arithmetic overflows before allocating (David Cook) +- Check attribute length against buffer size (David Cook) +- Fix bounds check in p11_rpc_buffer_get_byte_array (David Cook) +- Fix buffer overflow in log_token_info (David Cook) +- common: Don't assume __STDC_VERSION__ is always defined (Daiki Ueno) +- compat: getauxval: correct compiler macro for FreeBSD (Daiki Ueno) +- compat: fdwalk: add guard for Linux specific local variables (Daiki Ueno) +- meson: Add missing libtasn1 dependency (Daiki Ueno) +- travis: Add freebsd build (Daiki Ueno) +- anchor: Prefer persistent format when storing anchor (Daiki Ueno) +- travis: Run "make check" along with "make distcheck" for coverage (Daiki Ueno) +- travis: Use python3 as the default Python interpreter (Daiki Ueno) +- travis: Route to Ubuntu 20.04 base image (Daiki Ueno) +- meson: Set -fstack-protector for MinGW64 cross build (Daiki Ueno) +- meson: expand ternary operator in function call for compatibility (Daiki Ueno) +- meson: Use custom_target for generating external XML entities (Daiki Ueno) +- meson: Allow building manpages without gtk-doc (Jan Alexander Steffens (heftig)) +- Rename is_path_component to is_path_separator (Alexander Sosedkin) +- Use is_path_component in one more place (Alexander Sosedkin) +- Remove more duplicate separators in p11_path_build (Alexander Sosedkin) +- common: Fix infloop in p11_path_build (Daiki Ueno) +- proxy: C_CloseAllSessions: Make sure that calloc args are non-zero (Daiki Ueno) +- build: Use calloc in a consistent manner (Daiki Ueno) +- meson: Allow override of default bashcompdir. Fixes meson regression (issue #322). Pass -Dbashcompdir=/xxx to meson. (John Hein) +- common: Check for a NULL locale before freeing it (Tavian Barnes) +- p11_test_copy_setgid: Skip setgid tests on nosuid filesystems (Anders Kaseorg) +- unix-peer: replace incorrect include1 (Rosen Penev) +- test-compat: Skip getprogname test if BUILDDIR contains a symlink (Daiki Ueno) +- add trust-extract-compat into EXTRA-DIST (Xℹ Ruoyao) +- meson: install trust-extract-compat (Xℹ Ruoyao) +- rename trust-extract-compat.in to trust-extract-compat (Xℹ Ruoyao) + +* Thu Nov 12 2020 Alexander Sosedkin - 0.23.21-3 +- Add an explicit build dependency on xsltproc + +* Tue Aug 18 2020 Packit Service - 0.23.21-2 +- new upstream release: 0.23.21 + +* Tue Jul 28 2020 Fedora Release Engineering - 0.23.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Daiki Ueno - 0.23.20-1 +- Update to upstream 0.23.20 release + +* Wed Jan 22 2020 Daiki Ueno - 0.23.19-1 +- Update to upstream 0.23.19 release +- Check archive signature in %%prep +- Switch to using Meson as the build system + +* Mon Sep 30 2019 Daiki Ueno - 0.23.18.1-1 +- Update to upstream 0.23.18.1 release + +* Thu Jul 25 2019 Fedora Release Engineering - 0.23.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 23 2019 Daiki Ueno - 0.23.16.1-1 +- Update to upstream 0.23.16.1 release + +* Thu May 23 2019 Daiki Ueno - 0.23.16-1 +- Update to upstream 0.23.16 release + +* Mon Feb 18 2019 Daiki Ueno - 0.23.15-3 +- trust: Ignore unreadable content in anchors + +* Fri Feb 01 2019 Fedora Release Engineering - 0.23.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 21 2019 Daiki Ueno - 0.23.15-1 +- Update to upstream 0.23.15 release + +* Fri Jan 11 2019 Nils Philippsen - 0.23.14-3 +- use spaces instead of tabs consistently +- prefer fixed closures to libffi closures (#1656245, patch by Daiki Ueno) + +* Mon Oct 29 2018 James Antill - 0.23.14-2 +- Remove ldconfig scriptlet, now done via. transfiletrigger in glibc. + +* Fri Sep 07 2018 Daiki Ueno - 0.23.14-1 +- Update to upstream 0.23.14 release + +* Wed Aug 15 2018 Daiki Ueno - 0.23.13-3 +- Forcibly link with libpthread to avoid regressions (rhbz#1615038) + +* Wed Aug 15 2018 Daiki Ueno - 0.23.13-2 +- Fix invalid memory access on proxy cleanup + +* Fri Aug 10 2018 Daiki Ueno - 0.23.13-1 +- Update to upstream 0.23.13 release + +* Fri Jul 13 2018 Fedora Release Engineering - 0.23.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed May 30 2018 Daiki Ueno - 0.23.12-1 +- Update to upstream 0.23.11 release + +* Wed Feb 28 2018 Daiki Ueno - 0.23.10-1 +- Update to upstream 0.23.10 release + +* Thu Feb 08 2018 Fedora Release Engineering - 0.23.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Oct 05 2017 Daiki Ueno - 0.23.9-2 +- server: Make it possible to eval envvar settings + +* Wed Oct 04 2017 Daiki Ueno - 0.23.9-1 +- Update to upstream 0.23.9 + +* Fri Aug 25 2017 Kai Engert - 0.23.8-2 +- Fix a regression caused by a recent nss.rpm change, add a %%ghost file + for %%{_libdir}/libnssckbi.so that p11-kit-trust scripts install. + +* Tue Aug 15 2017 Daiki Ueno - 0.23.8-1 +- Update to 0.23.8 release + +* Thu Aug 03 2017 Fedora Release Engineering - 0.23.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.23.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jun 2 2017 Daiki Ueno - 0.23.7-1 +- Update to 0.23.7 release + +* Thu May 18 2017 Daiki Ueno - 0.23.5-3 +- Update p11-kit-modifiable.patch to simplify the logic + +* Thu May 18 2017 Daiki Ueno - 0.23.5-2 +- Make "trust anchor --remove" work again + +* Thu Mar 2 2017 Daiki Ueno - 0.23.5-1 +- Update to 0.23.5 release +- Rename -tools subpackage to -server and remove systemd unit files + +* Fri Feb 24 2017 Daiki Ueno - 0.23.4-3 +- Move p11-kit command back to main package + +* Fri Feb 24 2017 Daiki Ueno - 0.23.4-2 +- Split out command line tools to -tools subpackage, to avoid a + multilib issue with the main package. Suggested by Yanko Kaneti. + +* Wed Feb 22 2017 Daiki Ueno - 0.23.4-1 +- Update to 0.23.4 release + +* Sat Feb 11 2017 Fedora Release Engineering - 0.23.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 6 2017 Daiki Ueno - 0.23.3-2 +- Use internal hash implementation instead of NSS (#1390598) + +* Tue Dec 20 2016 Daiki Ueno - 0.23.3-1 +- Update to 0.23.3 release +- Adjust executables location from %%libdir to %%libexecdir + +* Thu Feb 04 2016 Fedora Release Engineering - 0.23.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 12 2016 Martin Preisler - 0.23.2-1 +- Update to stable 0.23.2 release + +* Tue Jun 30 2015 Martin Preisler - 0.23.1-4 +- In proxy module don't call C_Finalize on a forked process [#1217915] +- Do not deinitialize libffi's wrapper functions [#1217915] + +* Thu Jun 18 2015 Fedora Release Engineering - 0.23.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 Till Maas - 0.23.1-2 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Fri Feb 20 2015 Stef Walter - 0.23.1-1 +- Update to 0.23.1 release + +* Thu Oct 09 2014 Stef Walter - 0.22.1-1 +- Update to 0.22.1 release +- Use SubjectKeyIdentifier as a CKA_ID if possible rhbz#1148895 + +* Sat Oct 04 2014 Stef Walter 0.22.0-1 +- Update to 0.22.0 release + +* Wed Sep 17 2014 Stef Walter 0.21.3-1 +- Update to 0.21.3 release +- Includes definitions for trust extensions rhbz#1136817 + +* Fri Sep 05 2014 Stef Walter 0.21.2-1 +- Update to 0.21.2 release +- Fix problems with erroneous messages printed rhbz#1133857 + +* Sun Aug 17 2014 Fedora Release Engineering - 0.21.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Aug 07 2014 Stef Walter - 0.21.1-1 +- Update to 0.21.1 release + +* Wed Jul 30 2014 Tom Callaway - 0.20.3-3 +- fix license handling + +* Fri Jul 04 2014 Stef Walter - 0.20.3-2 +- Update to stable 0.20.3 release + +* Fri Jun 06 2014 Fedora Release Engineering - 0.20.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Jan 25 2014 Ville Skyttä - 0.20.2-2 +- Own the %%{_libdir}/pkcs11 dir in -trust. + +* Tue Jan 14 2014 Stef Walter - 0.20.2-1 +- Update to upstream stable 0.20.2 release +- Fix regression involving blacklisted anchors [#1041328] +- Support ppc64le in build [#1052707] + +* Mon Sep 09 2013 Stef Walter - 0.20.1-1 +- Update to upstream stable 0.20.1 release +- Extract compat trust data after we've changes +- Skip compat extraction if running as non-root +- Better failure messages when removing anchors + +* Thu Aug 29 2013 Stef Walter - 0.19.4-1 +- Update to new upstream 0.19.4 release + +* Sat Aug 03 2013 Fedora Release Engineering - 0.19.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 24 2013 Stef Walter - 0.19.3-1 +- Update to new upstream 0.19.3 release (#967822) + +* Wed Jun 05 2013 Stef Walter - 0.18.3-1 +- Update to new upstream stable release +- Fix intermittent firefox cert validation issues (#960230) +- Include the manual pages in the package + +* Tue May 14 2013 Stef Walter - 0.18.2-1 +- Update to new upstream stable release +- Reduce the libtasn1 dependency minimum version + +* Thu May 02 2013 Stef Walter - 0.18.1-1 +- Update to new upstream stable release +- 'p11-kit extract-trust' lives in libdir + +* Thu Apr 04 2013 Stef Walter - 0.18.0-1 +- Update to new upstream stable release +- Various logging tweaks (#928914, #928750) +- Make the 'p11-kit extract-trust' explicitly reject + additional arguments + +* Thu Mar 28 2013 Stef Walter - 0.17.5-1 +- Make 'p11-kit extract-trust' call update-ca-trust +- Work around 32-bit oveflow of certificate dates +- Build fixes + +* Tue Mar 26 2013 Stef Walter - 0.17.4-2 +- Pull in patch from upstream to fix build on ppc (#927394) + +* Wed Mar 20 2013 Stef Walter - 0.17.4-1 +- Update to upstream version 0.17.4 + +* Mon Mar 18 2013 Stef Walter - 0.17.3-1 +- Update to upstream version 0.17.3 +- Put the trust input paths in the right order + +* Tue Mar 12 2013 Stef Walter - 0.16.4-1 +- Update to upstream version 0.16.4 + +* Fri Mar 08 2013 Stef Walter - 0.16.3-1 +- Update to upstream version 0.16.3 +- Split out system trust module into its own package. +- p11-kit-trust provides an alternative to an nss module + +* Tue Mar 05 2013 Stef Walter - 0.16.1-1 +- Update to upstream version 0.16.1 +- Setup source directories as appropriate for Shared System Certificates feature + +* Tue Mar 05 2013 Stef Walter - 0.16.0-1 +- Update to upstream version 0.16.0 + +* Thu Feb 14 2013 Fedora Release Engineering - 0.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 17 2012 Kalev Lember - 0.14-1 +- Update to 0.14 + +* Fri Jul 20 2012 Fedora Release Engineering - 0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 16 2012 Kalev Lember - 0.13-1 +- Update to 0.13 + +* Tue Mar 27 2012 Kalev Lember - 0.12-1 +- Update to 0.12 +- Run self tests in %%check + +* Sat Feb 11 2012 Kalev Lember - 0.11-1 +- Update to 0.11 + +* Fri Jan 13 2012 Fedora Release Engineering - 0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 20 2011 Matthias Clasen - 0.9-1 +- Update to 0.9 + +* Wed Oct 26 2011 Kalev Lember - 0.8-1 +- Update to 0.8 + +* Mon Sep 19 2011 Matthias Clasen - 0.6-1 +- Update to 0.6 + +* Sun Sep 04 2011 Kalev Lember - 0.5-1 +- Update to 0.5 + +* Sun Aug 21 2011 Kalev Lember - 0.4-1 +- Update to 0.4 +- Install the example config file to documentation directory + +* Wed Aug 17 2011 Kalev Lember - 0.3-2 +- Tighten -devel subpackage deps (#725905) + +* Fri Jul 29 2011 Kalev Lember - 0.3-1 +- Update to 0.3 +- Upstream rewrote the ASL 2.0 bits, which makes the whole package + BSD-licensed + +* Tue Jul 12 2011 Kalev Lember - 0.2-1 +- Initial RPM release diff --git a/p11-kit.spec b/p11-kit.spec index 973bf03..3002354 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.24.1 -Release: 3%{?dist} +Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -23,6 +23,7 @@ BuildRequires: bash-completion # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(systemd) BuildRequires: gnupg2 BuildRequires: /usr/bin/xsltproc @@ -152,367 +153,4 @@ fi %changelog -* Fri Jul 22 2022 Fedora Release Engineering - 0.24.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.24.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Jan 17 2022 Packit Service - 0.24.1-1 -- Release 0.24.1 (Daiki Ueno) -- common: Support copying attribute array recursively (Daiki Ueno) -- common: Add assert_ptr_cmp (Daiki Ueno) -- gtkdoc: remove dependencies on custom target files (Eli Schwartz) -- doc: Replace occurrence of black list with blocklist (Daiki Ueno) -- build: Suppress cppcheck false-positive on array bounds (Daiki Ueno) -- ci: Use Docker image from the same repository (Daiki Ueno) -- ci: Integrate Docker image building to GitHub workflow (Daiki Ueno) -- rpc: Fallback to version 0 if server does not support negotiation (Daiki Ueno) -- build: Port e850e03be65ed573d0b69ee0408e776c08fad8a3 to meson (Daiki Ueno) -- Link libp11-kit so that it cannot unload (Emmanuel Dreyfus) -- trust: Use dngettext for plurals (Daiki Ueno) -- rpc: Support protocol version negotiation (Daiki Ueno) -- rpc: Separate authentication step from transaction (Daiki Ueno) -- Meson: p11_system_config_modules instead of p11_package_config_modules (Issam E. Maghni) -- shell: test -a|o is not POSIX (Issam E. Maghni) -- Meson: Add libtasn1 to trust programs (Issam E. Maghni) -- meson: optionalise glib's development files for gtk_doc (Đoàn Trần Công Danh) - -* Sat Jan 08 2022 Miro Hrončok - 0.23.22-5 -- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 - -* Thu Jul 22 2021 Fedora Release Engineering - 0.23.22-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Daiki Ueno - 0.23.22-3 -- Suppress intentional memleak in getprogname emulation (#1905581) - -* Tue Jan 26 2021 Fedora Release Engineering - 0.23.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Dec 11 2020 Packit Service - 0.23.22-1 -- Release 0.23.22 (Daiki Ueno) -- Follow-up to arithmetic overflow fix (David Cook) -- Check for arithmetic overflows before allocating (David Cook) -- Check attribute length against buffer size (David Cook) -- Fix bounds check in p11_rpc_buffer_get_byte_array (David Cook) -- Fix buffer overflow in log_token_info (David Cook) -- common: Don't assume __STDC_VERSION__ is always defined (Daiki Ueno) -- compat: getauxval: correct compiler macro for FreeBSD (Daiki Ueno) -- compat: fdwalk: add guard for Linux specific local variables (Daiki Ueno) -- meson: Add missing libtasn1 dependency (Daiki Ueno) -- travis: Add freebsd build (Daiki Ueno) -- anchor: Prefer persistent format when storing anchor (Daiki Ueno) -- travis: Run "make check" along with "make distcheck" for coverage (Daiki Ueno) -- travis: Use python3 as the default Python interpreter (Daiki Ueno) -- travis: Route to Ubuntu 20.04 base image (Daiki Ueno) -- meson: Set -fstack-protector for MinGW64 cross build (Daiki Ueno) -- meson: expand ternary operator in function call for compatibility (Daiki Ueno) -- meson: Use custom_target for generating external XML entities (Daiki Ueno) -- meson: Allow building manpages without gtk-doc (Jan Alexander Steffens (heftig)) -- Rename is_path_component to is_path_separator (Alexander Sosedkin) -- Use is_path_component in one more place (Alexander Sosedkin) -- Remove more duplicate separators in p11_path_build (Alexander Sosedkin) -- common: Fix infloop in p11_path_build (Daiki Ueno) -- proxy: C_CloseAllSessions: Make sure that calloc args are non-zero (Daiki Ueno) -- build: Use calloc in a consistent manner (Daiki Ueno) -- meson: Allow override of default bashcompdir. Fixes meson regression (issue #322). Pass -Dbashcompdir=/xxx to meson. (John Hein) -- common: Check for a NULL locale before freeing it (Tavian Barnes) -- p11_test_copy_setgid: Skip setgid tests on nosuid filesystems (Anders Kaseorg) -- unix-peer: replace incorrect include1 (Rosen Penev) -- test-compat: Skip getprogname test if BUILDDIR contains a symlink (Daiki Ueno) -- add trust-extract-compat into EXTRA-DIST (Xℹ Ruoyao) -- meson: install trust-extract-compat (Xℹ Ruoyao) -- rename trust-extract-compat.in to trust-extract-compat (Xℹ Ruoyao) - -* Thu Nov 12 2020 Alexander Sosedkin - 0.23.21-3 -- Add an explicit build dependency on xsltproc - -* Tue Aug 18 2020 Packit Service - 0.23.21-2 -- new upstream release: 0.23.21 - -* Tue Jul 28 2020 Fedora Release Engineering - 0.23.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Daiki Ueno - 0.23.20-1 -- Update to upstream 0.23.20 release - -* Wed Jan 22 2020 Daiki Ueno - 0.23.19-1 -- Update to upstream 0.23.19 release -- Check archive signature in %%prep -- Switch to using Meson as the build system - -* Mon Sep 30 2019 Daiki Ueno - 0.23.18.1-1 -- Update to upstream 0.23.18.1 release - -* Thu Jul 25 2019 Fedora Release Engineering - 0.23.16.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 23 2019 Daiki Ueno - 0.23.16.1-1 -- Update to upstream 0.23.16.1 release - -* Thu May 23 2019 Daiki Ueno - 0.23.16-1 -- Update to upstream 0.23.16 release - -* Mon Feb 18 2019 Daiki Ueno - 0.23.15-3 -- trust: Ignore unreadable content in anchors - -* Fri Feb 01 2019 Fedora Release Engineering - 0.23.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 21 2019 Daiki Ueno - 0.23.15-1 -- Update to upstream 0.23.15 release - -* Fri Jan 11 2019 Nils Philippsen - 0.23.14-3 -- use spaces instead of tabs consistently -- prefer fixed closures to libffi closures (#1656245, patch by Daiki Ueno) - -* Mon Oct 29 2018 James Antill - 0.23.14-2 -- Remove ldconfig scriptlet, now done via. transfiletrigger in glibc. - -* Fri Sep 07 2018 Daiki Ueno - 0.23.14-1 -- Update to upstream 0.23.14 release - -* Wed Aug 15 2018 Daiki Ueno - 0.23.13-3 -- Forcibly link with libpthread to avoid regressions (rhbz#1615038) - -* Wed Aug 15 2018 Daiki Ueno - 0.23.13-2 -- Fix invalid memory access on proxy cleanup - -* Fri Aug 10 2018 Daiki Ueno - 0.23.13-1 -- Update to upstream 0.23.13 release - -* Fri Jul 13 2018 Fedora Release Engineering - 0.23.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed May 30 2018 Daiki Ueno - 0.23.12-1 -- Update to upstream 0.23.11 release - -* Wed Feb 28 2018 Daiki Ueno - 0.23.10-1 -- Update to upstream 0.23.10 release - -* Thu Feb 08 2018 Fedora Release Engineering - 0.23.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Oct 05 2017 Daiki Ueno - 0.23.9-2 -- server: Make it possible to eval envvar settings - -* Wed Oct 04 2017 Daiki Ueno - 0.23.9-1 -- Update to upstream 0.23.9 - -* Fri Aug 25 2017 Kai Engert - 0.23.8-2 -- Fix a regression caused by a recent nss.rpm change, add a %%ghost file - for %%{_libdir}/libnssckbi.so that p11-kit-trust scripts install. - -* Tue Aug 15 2017 Daiki Ueno - 0.23.8-1 -- Update to 0.23.8 release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.23.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.23.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jun 2 2017 Daiki Ueno - 0.23.7-1 -- Update to 0.23.7 release - -* Thu May 18 2017 Daiki Ueno - 0.23.5-3 -- Update p11-kit-modifiable.patch to simplify the logic - -* Thu May 18 2017 Daiki Ueno - 0.23.5-2 -- Make "trust anchor --remove" work again - -* Thu Mar 2 2017 Daiki Ueno - 0.23.5-1 -- Update to 0.23.5 release -- Rename -tools subpackage to -server and remove systemd unit files - -* Fri Feb 24 2017 Daiki Ueno - 0.23.4-3 -- Move p11-kit command back to main package - -* Fri Feb 24 2017 Daiki Ueno - 0.23.4-2 -- Split out command line tools to -tools subpackage, to avoid a - multilib issue with the main package. Suggested by Yanko Kaneti. - -* Wed Feb 22 2017 Daiki Ueno - 0.23.4-1 -- Update to 0.23.4 release - -* Sat Feb 11 2017 Fedora Release Engineering - 0.23.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 6 2017 Daiki Ueno - 0.23.3-2 -- Use internal hash implementation instead of NSS (#1390598) - -* Tue Dec 20 2016 Daiki Ueno - 0.23.3-1 -- Update to 0.23.3 release -- Adjust executables location from %%libdir to %%libexecdir - -* Thu Feb 04 2016 Fedora Release Engineering - 0.23.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 12 2016 Martin Preisler - 0.23.2-1 -- Update to stable 0.23.2 release - -* Tue Jun 30 2015 Martin Preisler - 0.23.1-4 -- In proxy module don't call C_Finalize on a forked process [#1217915] -- Do not deinitialize libffi's wrapper functions [#1217915] - -* Thu Jun 18 2015 Fedora Release Engineering - 0.23.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 21 2015 Till Maas - 0.23.1-2 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Fri Feb 20 2015 Stef Walter - 0.23.1-1 -- Update to 0.23.1 release - -* Thu Oct 09 2014 Stef Walter - 0.22.1-1 -- Update to 0.22.1 release -- Use SubjectKeyIdentifier as a CKA_ID if possible rhbz#1148895 - -* Sat Oct 04 2014 Stef Walter 0.22.0-1 -- Update to 0.22.0 release - -* Wed Sep 17 2014 Stef Walter 0.21.3-1 -- Update to 0.21.3 release -- Includes definitions for trust extensions rhbz#1136817 - -* Fri Sep 05 2014 Stef Walter 0.21.2-1 -- Update to 0.21.2 release -- Fix problems with erroneous messages printed rhbz#1133857 - -* Sun Aug 17 2014 Fedora Release Engineering - 0.21.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Aug 07 2014 Stef Walter - 0.21.1-1 -- Update to 0.21.1 release - -* Wed Jul 30 2014 Tom Callaway - 0.20.3-3 -- fix license handling - -* Fri Jul 04 2014 Stef Walter - 0.20.3-2 -- Update to stable 0.20.3 release - -* Fri Jun 06 2014 Fedora Release Engineering - 0.20.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Jan 25 2014 Ville Skyttä - 0.20.2-2 -- Own the %%{_libdir}/pkcs11 dir in -trust. - -* Tue Jan 14 2014 Stef Walter - 0.20.2-1 -- Update to upstream stable 0.20.2 release -- Fix regression involving blacklisted anchors [#1041328] -- Support ppc64le in build [#1052707] - -* Mon Sep 09 2013 Stef Walter - 0.20.1-1 -- Update to upstream stable 0.20.1 release -- Extract compat trust data after we've changes -- Skip compat extraction if running as non-root -- Better failure messages when removing anchors - -* Thu Aug 29 2013 Stef Walter - 0.19.4-1 -- Update to new upstream 0.19.4 release - -* Sat Aug 03 2013 Fedora Release Engineering - 0.19.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 24 2013 Stef Walter - 0.19.3-1 -- Update to new upstream 0.19.3 release (#967822) - -* Wed Jun 05 2013 Stef Walter - 0.18.3-1 -- Update to new upstream stable release -- Fix intermittent firefox cert validation issues (#960230) -- Include the manual pages in the package - -* Tue May 14 2013 Stef Walter - 0.18.2-1 -- Update to new upstream stable release -- Reduce the libtasn1 dependency minimum version - -* Thu May 02 2013 Stef Walter - 0.18.1-1 -- Update to new upstream stable release -- 'p11-kit extract-trust' lives in libdir - -* Thu Apr 04 2013 Stef Walter - 0.18.0-1 -- Update to new upstream stable release -- Various logging tweaks (#928914, #928750) -- Make the 'p11-kit extract-trust' explicitly reject - additional arguments - -* Thu Mar 28 2013 Stef Walter - 0.17.5-1 -- Make 'p11-kit extract-trust' call update-ca-trust -- Work around 32-bit oveflow of certificate dates -- Build fixes - -* Tue Mar 26 2013 Stef Walter - 0.17.4-2 -- Pull in patch from upstream to fix build on ppc (#927394) - -* Wed Mar 20 2013 Stef Walter - 0.17.4-1 -- Update to upstream version 0.17.4 - -* Mon Mar 18 2013 Stef Walter - 0.17.3-1 -- Update to upstream version 0.17.3 -- Put the trust input paths in the right order - -* Tue Mar 12 2013 Stef Walter - 0.16.4-1 -- Update to upstream version 0.16.4 - -* Fri Mar 08 2013 Stef Walter - 0.16.3-1 -- Update to upstream version 0.16.3 -- Split out system trust module into its own package. -- p11-kit-trust provides an alternative to an nss module - -* Tue Mar 05 2013 Stef Walter - 0.16.1-1 -- Update to upstream version 0.16.1 -- Setup source directories as appropriate for Shared System Certificates feature - -* Tue Mar 05 2013 Stef Walter - 0.16.0-1 -- Update to upstream version 0.16.0 - -* Thu Feb 14 2013 Fedora Release Engineering - 0.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Sep 17 2012 Kalev Lember - 0.14-1 -- Update to 0.14 - -* Fri Jul 20 2012 Fedora Release Engineering - 0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 16 2012 Kalev Lember - 0.13-1 -- Update to 0.13 - -* Tue Mar 27 2012 Kalev Lember - 0.12-1 -- Update to 0.12 -- Run self tests in %%check - -* Sat Feb 11 2012 Kalev Lember - 0.11-1 -- Update to 0.11 - -* Fri Jan 13 2012 Fedora Release Engineering - 0.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 20 2011 Matthias Clasen - 0.9-1 -- Update to 0.9 - -* Wed Oct 26 2011 Kalev Lember - 0.8-1 -- Update to 0.8 - -* Mon Sep 19 2011 Matthias Clasen - 0.6-1 -- Update to 0.6 - -* Sun Sep 04 2011 Kalev Lember - 0.5-1 -- Update to 0.5 - -* Sun Aug 21 2011 Kalev Lember - 0.4-1 -- Update to 0.4 -- Install the example config file to documentation directory - -* Wed Aug 17 2011 Kalev Lember - 0.3-2 -- Tighten -devel subpackage deps (#725905) - -* Fri Jul 29 2011 Kalev Lember - 0.3-1 -- Update to 0.3 -- Upstream rewrote the ASL 2.0 bits, which makes the whole package - BSD-licensed - -* Tue Jul 12 2011 Kalev Lember - 0.2-1 -- Initial RPM release +%autochangelog From b90c845b4f17af5a81f38c435e3eb512cd07125b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 12 Dec 2022 19:44:40 +0100 Subject: [PATCH 55/79] Port meson build script to C99 Related to: --- p11-kit-meson-c99.patch | 35 +++++++++++++++++++++++++++++++++++ p11-kit.spec | 1 + 2 files changed, 36 insertions(+) create mode 100644 p11-kit-meson-c99.patch diff --git a/p11-kit-meson-c99.patch b/p11-kit-meson-c99.patch new file mode 100644 index 0000000..6df78fa --- /dev/null +++ b/p11-kit-meson-c99.patch @@ -0,0 +1,35 @@ +Port meson build script to C99. The _Thread_local check used +an implicit int. Future compilers are likely to reject missing +int types by default. + +Patch configure.ac as well, although it is not used by the current +Fedora build. + +Submitted upstream: + +diff --git a/configure.ac b/configure.ac +index be3af55093874750..fc719c78c99c2ac3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -148,7 +148,7 @@ if test "$os_unix" = "yes"; then + [ac_cv_tls_keyword= + for keyword in _Thread_local __thread; do + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], +- [[static ]$keyword[ foo;]])], ++ [[static ]$keyword[ int foo;]])], + [ac_cv_tls_keyword=$keyword]) + done]) + if test -n "$ac_cv_tls_keyword"; then +diff --git a/meson.build b/meson.build +index 64bb3429aef1bb79..aaa3c1f50b5b943f 100644 +--- a/meson.build ++++ b/meson.build +@@ -200,7 +200,7 @@ if host_system != 'windows' + tls_test_code_template = ''' + #include + int main (void) { +-static @0@ foo; ++static @0@ int foo; + return 0; + } + ''' diff --git a/p11-kit.spec b/p11-kit.spec index 3002354..da38079 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -11,6 +11,7 @@ Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source2: gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg Source3: trust-extract-compat Source4: p11-kit-client.service +Patch0: p11-kit-meson-c99.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 From 4ffd376fc45648a6da7a5afa9a92cb5b9e72b30f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 23:11:59 +0000 Subject: [PATCH 56/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From b1c8544e780642ded0a54cae84cfd20e77c8f5c8 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 29 Jun 2023 10:02:08 +0000 Subject: [PATCH 57/79] [packit] 0.25.0 upstream release Upstream tag: 0.25.0 Upstream commit: a8cce8bd --- .gitignore | 3 + README.packit | 2 +- ...2225C3B46F34879FC8496CD605848ED7E69871.gpg | Bin 48528 -> 0 bytes p11-kit-0.23.20.tar.xz.sig | Bin 580 -> 0 bytes p11-kit-0.23.21.tar.xz.sig | Bin 580 -> 0 bytes p11-kit-0.23.22-progname-leak.patch | 87 ------------------ p11-kit-0.23.22.tar.xz.sig | Bin 580 -> 0 bytes p11-kit-0.24.1.tar.xz.sig | Bin 566 -> 0 bytes p11-kit-meson-c99.patch | 35 ------- p11-kit.spec | 16 ++-- sources | 4 +- 11 files changed, 14 insertions(+), 133 deletions(-) delete mode 100644 gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg delete mode 100644 p11-kit-0.23.20.tar.xz.sig delete mode 100644 p11-kit-0.23.21.tar.xz.sig delete mode 100644 p11-kit-0.23.22-progname-leak.patch delete mode 100644 p11-kit-0.23.22.tar.xz.sig delete mode 100644 p11-kit-0.24.1.tar.xz.sig delete mode 100644 p11-kit-meson-c99.patch diff --git a/.gitignore b/.gitignore index 177599a..46beaf7 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ /p11-kit-0.23.21.tar.xz /p11-kit-0.23.22.tar.xz /p11-kit-0.24.1.tar.xz +/p11-kit-0.25.0.tar.xz +/p11-kit-0.25.0.tar.xz.sig +/p11-kit-release-keyring.gpg diff --git a/README.packit b/README.packit index 45640bd..101115f 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.43.1.dev8+ga0f2a9f. +The file was generated using packit 0.77.0.post2+g06f877b. diff --git a/gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg b/gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg deleted file mode 100644 index 30cd72996164fbba16fd2ee7098b8d28633c03e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48528 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 LgW^y2I9&e=>2^@# diff --git a/p11-kit-0.23.20.tar.xz.sig b/p11-kit-0.23.20.tar.xz.sig deleted file mode 100644 index f1e2607bf66f484a87d8191e4aed67ac4341b86a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmV-K0=xZ*0zm`-0SEvq79j*iA|=DLZ#0LW$VqJ01%!^*=9qB>0$wqo*#3b?q^D%lTb~IrfwVW*$3jk(XVm71YsiIb*c@H6h z)uWFya_OO&Ypb@Xq9v}z+P1Ko@zN8g_xD$|Xn6Yi0Y01BZy}msnL#S!%M}rtD8X&R zAdI}yZS=wZknB-@u^LU&$^!Ac~oTgf6$7KfvGX zr}~5Jtxy$Qx>Nj(#yg&>b%xEwQQQ#5D3uhDm>RHvV=2Ntp%x-0)g{itN|x;#2kWe4 S7+;SIs)k0F^l$gFJ&BhJpA<^~ diff --git a/p11-kit-0.23.21.tar.xz.sig b/p11-kit-0.23.21.tar.xz.sig deleted file mode 100644 index 599cbcaa3741c94c3a9d29bc587112fd8766580a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmV-K0=xZ*0zm`-0SEvq79j*iA|=DLZ#0LW$VqJ01%!^*=9qB>0$)4lW(^#5Wo~ak zXKr;aZ*pe<3JDO_1%!^*=9qCQI1m7hc(H3e;!Y_DBJY%${o|@-V0{K>DH!U>SvW3k zmY;{Me^f&~pb=8EC--wOvv7gJQrl$FjZ6##)UWg8dz2C=84YYr{TR*-^-*=KJO#)J z`ja@4Sl97t5}CeXWJ3HdUj`jtrUnvLO&_mqj>J(s9)V0V34mP;t}GlTEe#cYb*p8Q zJ-{IZqpC|1lj`ZGqhD}a{;jX-fA1Lwc@A}N1QIM}HSTDVdb$pTKGj))8Lro3A^d3y z+VPkjrXqITVuy#RZM0Xsv})hcs*7c;X6m5`83CoVK7)JL+{>L`0_RlQ_Dbw}(NC}4 zeNPQYf!!cD_rlF2g~Vlq^7(PUT#0?BjVDz5&{dwpt--VB!}d{Dk5bSHS}Kx%Ve_7$ z*8%xi2?WKAj&Ae^8P~TIC$!{Bzp{^^C|A-pucX%B^zDsQBQ<0kaXH3o zvj>3xHp3I1OLTJ-3>BNsnVS~ru?NI_A~IW9Vtk6_X8@Y(r>!`p!bO4zk=0H1ZiK -Date: Mon, 25 Jan 2021 18:24:01 +0100 -Subject: [PATCH] compat: Pacify ASan complaints on intentionally leaked buffer - -Reported by Viktor Ashirov in: -https://bugzilla.redhat.com/show_bug.cgi?id=1905581 ---- - common/compat.c | 25 +++++++++++++++++++------ - common/library.c | 9 +++++++++ - 2 files changed, 28 insertions(+), 6 deletions(-) - -diff --git a/common/compat.c b/common/compat.c -index 4390cef..d6c5af6 100644 ---- a/common/compat.c -+++ b/common/compat.c -@@ -100,6 +100,19 @@ extern char *program_invocation_short_name; - extern char *__progname; - #endif - -+#ifdef __linux__ -+/* This symbol is also defined in library.c so as to be freed by the library -+ * destructor. If weak symbols are not supported nor library.c is not linked we -+ * simply leak the memory allocated with realpath(). */ -+#ifdef __GNUC__ -+extern char *p11_program_realpath; -+ -+char *p11_program_realpath __attribute__((weak)); -+#else -+static char *p11_program_realpath; -+#endif -+#endif -+ - const char * - getprogname (void) - { -@@ -124,14 +137,14 @@ getprogname (void) - * Logic borrowed from: - * . - */ -- static char *buf; -- -- if (!buf) -- buf = realpath ("/proc/self/exe", NULL); -+ if (!p11_program_realpath) -+ p11_program_realpath = realpath ("/proc/self/exe", NULL); - -- if (buf && strncmp (buf, name, strlen (buf)) == 0) -+ if (p11_program_realpath && -+ strncmp (p11_program_realpath, name, -+ strlen (p11_program_realpath)) == 0) - /* Use the executable path if the prefix matches. */ -- name = strrchr (buf, '/') + 1; -+ name = strrchr (p11_program_realpath, '/') + 1; - else - /* Otherwise fall back to - * program_invocation_short_name. */ -diff --git a/common/library.c b/common/library.c -index 891344a..1581702 100644 ---- a/common/library.c -+++ b/common/library.c -@@ -82,6 +82,11 @@ unsigned int p11_forkid = 1; - extern locale_t p11_message_locale; - #endif - -+#ifdef __linux__ -+/* used only under __linux__ in the getprogname() emulation in compat.c. */ -+char *p11_program_realpath; -+#endif -+ - static char * - thread_local_message (void) - { -@@ -190,6 +195,10 @@ p11_library_uninit (void) - #endif - p11_mutex_uninit (&p11_virtual_mutex); - p11_mutex_uninit (&p11_library_mutex); -+ -+#ifdef __linux__ -+ free (p11_program_realpath); -+#endif - } - - #endif /* OS_UNIX */ --- -2.29.2 - diff --git a/p11-kit-0.23.22.tar.xz.sig b/p11-kit-0.23.22.tar.xz.sig deleted file mode 100644 index 6ef001e021400211896d7cde2ea969d72b40170c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmV-K0=xZ*0zm`-0SEvq79j*iA|=DLZ#0LW$VqJ01%!^*=9qB>0$%}}C%`sX#k z@+EO&X5M!|dst(0s5|j5m1?1%0~dJ`75%cn3J#s=x=}o1hsqG&!AGl(hlLx07ZB6p zX^{axJG#awb}+EUx;PXz?{6idTYHZLv}TmG@> z(W`r-gPNK=pF4l})bSf{<_QJQ+Q7p*#q+fCSP@s5EeuqXn|x)J5PcnZ^V8NQCUC}z zckYB6Rl!(biwMPzMwFZ~^=L&`-(f7ZxY_<trH*LCoj-nr+1ROgzJI_YQg+o#?FtlO@J#aWiAT9>PZ29zN7%qwJ8eV+g%FOc0@ zT9W8O6&5X5wDgoxl*+tugScihD|p#TPFd)hKrqgA=O0ZE(`hlkT_mj7a!0wWfMdI diff --git a/p11-kit-0.24.1.tar.xz.sig b/p11-kit-0.24.1.tar.xz.sig deleted file mode 100644 index bfc093a7692f3e40039a2f4a8deab7160234168e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*iA|=DLZ#0LW$VqJ01%!^*=9qB>0%7HW-~b8<5Y`2R zj@Raxaj2sY|9exNS+()9>7uSw+;C}vXJc8WK^f<4Wg4Y19YfDJ1ywxW)z#;lW@UCL?lmULiO_>uZC`i*4|y|s-%quUhVCk2 zB_|$(HwPs~|D`|n^o00L3MBe1fWrf5#}+QZ%(>xyz-bRoLJTs)gFy$M|7$p-w;+dqt^DHa2opxRzQ$WweDInelzrI EpIe9=Z2$lO diff --git a/p11-kit-meson-c99.patch b/p11-kit-meson-c99.patch deleted file mode 100644 index 6df78fa..0000000 --- a/p11-kit-meson-c99.patch +++ /dev/null @@ -1,35 +0,0 @@ -Port meson build script to C99. The _Thread_local check used -an implicit int. Future compilers are likely to reject missing -int types by default. - -Patch configure.ac as well, although it is not used by the current -Fedora build. - -Submitted upstream: - -diff --git a/configure.ac b/configure.ac -index be3af55093874750..fc719c78c99c2ac3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -148,7 +148,7 @@ if test "$os_unix" = "yes"; then - [ac_cv_tls_keyword= - for keyword in _Thread_local __thread; do - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], -- [[static ]$keyword[ foo;]])], -+ [[static ]$keyword[ int foo;]])], - [ac_cv_tls_keyword=$keyword]) - done]) - if test -n "$ac_cv_tls_keyword"; then -diff --git a/meson.build b/meson.build -index 64bb3429aef1bb79..aaa3c1f50b5b943f 100644 ---- a/meson.build -+++ b/meson.build -@@ -200,7 +200,7 @@ if host_system != 'windows' - tls_test_code_template = ''' - #include - int main (void) { --static @0@ foo; -+static @0@ int foo; - return 0; - } - ''' diff --git a/p11-kit.spec b/p11-kit.spec index da38079..1ad9176 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.24.1 -Release: %{?autorelease}%{!?autorelease:1%{?dist}} +Version: 0.25.0 +Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -8,10 +8,9 @@ License: BSD URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz.sig -Source2: gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg +Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyring.gpg Source3: trust-extract-compat Source4: p11-kit-client.service -Patch0: p11-kit-meson-c99.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 @@ -46,8 +45,8 @@ developing applications that use %{name}. %package trust Summary: System trust module from %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): %{_sbindir}/alternatives +Requires(postun): %{_sbindir}/alternatives Conflicts: nss < 3.14.3-9 %description trust @@ -101,13 +100,12 @@ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir} %post trust -%{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so \ - %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 +%{_sbindir}/alternatives --install %{_libdir}/libnssckbi.so %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 %postun trust if [ $1 -eq 0 ] ; then # package removal - %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so + %{_sbindir}/alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so fi diff --git a/sources b/sources index 1791414..9e7be52 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (p11-kit-0.24.1.tar.xz) = 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81 +SHA512 (p11-kit-0.25.0.tar.xz) = e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe +SHA512 (p11-kit-0.25.0.tar.xz.sig) = dc87fa4c94b723f74ed279d372c15dbafc87aba83539d05e20a528d035ec14e8c3814bb62f0582acdaa542a42a467d6a53b3197be93cb020b66ad9fe2cf26752 +SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From 8c546cbf7c78f6f08ae5dd92cbc70286e4e5ee45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 18:27:01 +0000 Subject: [PATCH 58/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 93cc8c15cae5a07f3afd2c391b2b6ad87d02c12c Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 24 Aug 2023 10:37:57 +0900 Subject: [PATCH 59/79] Migrate License field to SPDX license identifier Signed-off-by: Daiki Ueno --- p11-kit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 1ad9176..eace013 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -4,7 +4,7 @@ Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules -License: BSD +License: BSD-3-Clause URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz.sig From aab0f5c7d6ac37efa86df453bffeef65d0550a88 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 26 Oct 2023 10:03:53 +0000 Subject: [PATCH 60/79] [packit] 0.25.1 upstream release Upstream tag: 0.25.1 Upstream commit: 3ee32232 --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 46beaf7..add35eb 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /p11-kit-0.25.0.tar.xz /p11-kit-0.25.0.tar.xz.sig /p11-kit-release-keyring.gpg +/p11-kit-0.25.1.tar.xz +/p11-kit-0.25.1.tar.xz.sig diff --git a/README.packit b/README.packit index 101115f..2a3acd4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.77.0.post2+g06f877b. +The file was generated using packit 0.84.0. diff --git a/p11-kit.spec b/p11-kit.spec index eace013..8859071 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.0 +Version: 0.25.1 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules diff --git a/sources b/sources index 9e7be52..a2d5228 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.0.tar.xz) = e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe -SHA512 (p11-kit-0.25.0.tar.xz.sig) = dc87fa4c94b723f74ed279d372c15dbafc87aba83539d05e20a528d035ec14e8c3814bb62f0582acdaa542a42a467d6a53b3197be93cb020b66ad9fe2cf26752 +SHA512 (p11-kit-0.25.1.tar.xz) = e12e32148e0924ac7dca4c6a4399cff0934df4f002a31e7ffc5c3cfd14a4c0a47225eb84abd73b7f36c8dfcc32f92756e90699335b830414e8f5eddeaa42c532 +SHA512 (p11-kit-0.25.1.tar.xz.sig) = 1278c27c774150bbab46df947d55fe96951f250bed9dc6c218faaa1020d686189c26d6569df2916b4730878123f69b4457faf422b0b48de13408faab8d4c9187 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From dd7fdb54d62056acac47137cf10ca4eb4d0fe39b Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 31 Oct 2023 09:27:24 +0000 Subject: [PATCH 61/79] [packit] 0.25.2 upstream release Upstream tag: 0.25.2 Upstream commit: 66d6b42e --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index add35eb..0209a25 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ /p11-kit-release-keyring.gpg /p11-kit-0.25.1.tar.xz /p11-kit-0.25.1.tar.xz.sig +/p11-kit-0.25.2.tar.xz +/p11-kit-0.25.2.tar.xz.sig diff --git a/README.packit b/README.packit index 2a3acd4..5998f60 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.84.0. +The file was generated using packit 0.85.0. diff --git a/p11-kit.spec b/p11-kit.spec index 8859071..ab4eea2 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.1 +Version: 0.25.2 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules diff --git a/sources b/sources index a2d5228..7f63c24 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.1.tar.xz) = e12e32148e0924ac7dca4c6a4399cff0934df4f002a31e7ffc5c3cfd14a4c0a47225eb84abd73b7f36c8dfcc32f92756e90699335b830414e8f5eddeaa42c532 -SHA512 (p11-kit-0.25.1.tar.xz.sig) = 1278c27c774150bbab46df947d55fe96951f250bed9dc6c218faaa1020d686189c26d6569df2916b4730878123f69b4457faf422b0b48de13408faab8d4c9187 +SHA512 (p11-kit-0.25.2.tar.xz) = 64df7600c1eedfba942a38eb32bda7fe869ed197449dff2b8470be37ba71f3eefc3990613d2f787d3300b18e87391cd8f8bb4b33277d51ec873548126137bd01 +SHA512 (p11-kit-0.25.2.tar.xz.sig) = 897c3a1280adb2b6e41f75dbb0943bf90981c04710fbaeed4dd93dd0694b4077c8e8b355dca1269e4de3f997273b95d3c71d61d774ef7b960967d72ddacfb8a3 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From 813fe621e6494b63d1fe2b6433a4b040ffb35cff Mon Sep 17 00:00:00 2001 From: Zoltan Fridrich Date: Wed, 8 Nov 2023 11:08:29 +0100 Subject: [PATCH 62/79] Replace "black list" with "blocklist" in package description Signed-off-by: Zoltan Fridrich --- p11-kit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index ab4eea2..59b278b 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -51,7 +51,7 @@ Conflicts: nss < 3.14.3-9 %description trust The %{name}-trust package contains a system trust PKCS#11 module which -contains certificate anchors and black lists. +contains certificate anchors and blocklists. %package server From ed0f630c7acfe5b9fa9a1b5d2fa87bd33880b4a9 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 15 Nov 2023 12:51:54 +0000 Subject: [PATCH 63/79] [packit] 0.25.3 upstream release Upstream tag: 0.25.3 Upstream commit: 917e02a3 --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0209a25..7b351bd 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ /p11-kit-0.25.1.tar.xz.sig /p11-kit-0.25.2.tar.xz /p11-kit-0.25.2.tar.xz.sig +/p11-kit-0.25.3.tar.xz +/p11-kit-0.25.3.tar.xz.sig diff --git a/README.packit b/README.packit index 5998f60..b6ea2f6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.85.0. +The file was generated using packit 0.85.0.post1.dev17+g1f3036b1. diff --git a/p11-kit.spec b/p11-kit.spec index 59b278b..866be52 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.2 +Version: 0.25.3 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules diff --git a/sources b/sources index 7f63c24..ca61d94 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.2.tar.xz) = 64df7600c1eedfba942a38eb32bda7fe869ed197449dff2b8470be37ba71f3eefc3990613d2f787d3300b18e87391cd8f8bb4b33277d51ec873548126137bd01 -SHA512 (p11-kit-0.25.2.tar.xz.sig) = 897c3a1280adb2b6e41f75dbb0943bf90981c04710fbaeed4dd93dd0694b4077c8e8b355dca1269e4de3f997273b95d3c71d61d774ef7b960967d72ddacfb8a3 +SHA512 (p11-kit-0.25.3.tar.xz) = ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c +SHA512 (p11-kit-0.25.3.tar.xz.sig) = 189a40b12e40818daff4aa6869d7e0fa342a42f3901d85fc52bb40f7023bb17790967be5ab9a183473fe8bb3e335a0d4d8c2b6345ccf811e90f8495009c085b8 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From 34faad315d01886e96c29a4d3049d1da50440471 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 11:39:08 +0000 Subject: [PATCH 64/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a088c987f21d8ef9ad3b25a7e0c7c0c3aea20a04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 11:44:40 +0000 Subject: [PATCH 65/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4591e32cb1e546a082ad3d2cece04c3b6bb967a2 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 31 Jan 2024 11:08:56 +0900 Subject: [PATCH 66/79] import-object: Avoid integer truncation on 32-bit platforms Fixes: #2261437 Signed-off-by: Daiki Ueno --- p11-kit-0.25.3-import-object.patch | 109 +++++++++++++++++++++++++++++ p11-kit.spec | 1 + 2 files changed, 110 insertions(+) create mode 100644 p11-kit-0.25.3-import-object.patch diff --git a/p11-kit-0.25.3-import-object.patch b/p11-kit-0.25.3-import-object.patch new file mode 100644 index 0000000..974e0cf --- /dev/null +++ b/p11-kit-0.25.3-import-object.patch @@ -0,0 +1,109 @@ +From d49c92c8420db6ee4c88515bdb014f68f4d471d9 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Sat, 2 Dec 2023 09:24:01 +0900 +Subject: [PATCH] import-object: Avoid integer truncation on 32-bit platforms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The build fails when compiling for 32-bit platforms with +-Werror=incompatible-pointer-types: + + CFLAGS="-m32 -march=i686 -Werror=incompatible-pointer-types -Werror=implicit -Werror=int-conversion" setarch i686 -- meson setup _build + setarch i686 -- meson compile -C _build -v + ... + + ../p11-kit/import-object.c: In function ‘add_attrs_pubkey_rsa’: + ../p11-kit/import-object.c:223:62: error: passing argument 3 of ‘p11_asn1_read’ from incompatible pointer type [-Werror=incompatible-pointer-types] + 223 | attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); + | ^~~~~~~~~~~~~~~~~~~~~~~~ + | | + | long unsigned int * + +Reported by Sam James in: +https://github.com/p11-glue/p11-kit/issues/608 + +Signed-off-by: Daiki Ueno +--- + p11-kit/import-object.c | 30 +++++++++++++++++++++++++++--- + 1 file changed, 27 insertions(+), 3 deletions(-) + +diff --git a/p11-kit/import-object.c b/p11-kit/import-object.c +index feee076..fb47b96 100644 +--- a/p11-kit/import-object.c ++++ b/p11-kit/import-object.c +@@ -55,6 +55,7 @@ + #endif + + #include ++#include + #include + #include + #include +@@ -201,6 +202,7 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, + CK_ATTRIBUTE attr_encrypt = { CKA_ENCRYPT, &tval, sizeof (tval) }; + CK_ATTRIBUTE attr_modulus = { CKA_MODULUS, }; + CK_ATTRIBUTE attr_exponent = { CKA_PUBLIC_EXPONENT, }; ++ size_t len = 0; + + pubkey = p11_asn1_read (info, "subjectPublicKey", &pubkey_len); + if (pubkey == NULL) { +@@ -220,17 +222,31 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, + goto cleanup; + } + +- attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); ++ attr_modulus.pValue = p11_asn1_read (asn, "modulus", &len); + if (attr_modulus.pValue == NULL) { + p11_message (_("failed to obtain modulus")); + goto cleanup; + } ++#if ULONG_MAX < SIZE_MAX ++ if (len > ULONG_MAX) { ++ p11_message (_("failed to obtain modulus")); ++ goto cleanup; ++ } ++#endif ++ attr_modulus.ulValueLen = len; + +- attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &attr_exponent.ulValueLen); ++ attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &len); + if (attr_exponent.pValue == NULL) { + p11_message (_("failed to obtain exponent")); + goto cleanup; + } ++#if ULONG_MAX < SIZE_MAX ++ if (len > ULONG_MAX) { ++ p11_message (_("failed to obtain exponent")); ++ goto cleanup; ++ } ++#endif ++ attr_exponent.ulValueLen = len; + + result = p11_attrs_build (attrs, &attr_key_type, &attr_encrypt, &attr_modulus, &attr_exponent, NULL); + if (result == NULL) { +@@ -260,12 +276,20 @@ add_attrs_pubkey_ec (CK_ATTRIBUTE *attrs, + CK_ATTRIBUTE attr_key_type = { CKA_KEY_TYPE, &key_type, sizeof (key_type) }; + CK_ATTRIBUTE attr_ec_params = { CKA_EC_PARAMS, }; + CK_ATTRIBUTE attr_ec_point = { CKA_EC_POINT, }; ++ size_t len = 0; + +- attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &attr_ec_params.ulValueLen); ++ attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &len); + if (attr_ec_params.pValue == NULL) { + p11_message (_("failed to obtain EC parameters")); + goto cleanup; + } ++#if ULONG_MAX < SIZE_MAX ++ if (len > ULONG_MAX) { ++ p11_message (_("failed to obtain EC parameters")); ++ goto cleanup; ++ } ++#endif ++ attr_ec_params.ulValueLen = len; + + /* subjectPublicKey is read as BIT STRING value which contains + * EC point data. We need to DER encode this data as OCTET STRING. +-- +2.43.0 + diff --git a/p11-kit.spec b/p11-kit.spec index 866be52..46b9cb6 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -11,6 +11,7 @@ Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyring.gpg Source3: trust-extract-compat Source4: p11-kit-client.service +Patch: p11-kit-0.25.3-import-object.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 From 5037388f87eb522bc90a94a9b5144936513d280d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 21 Jun 2024 15:31:43 -0400 Subject: [PATCH 67/79] Fix bash-completion build dependency The pkgconfig data has been split out into bash-completion-devel for F41. --- p11-kit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 46b9cb6..b268309 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -20,7 +20,7 @@ BuildRequires: gettext BuildRequires: gtk-doc BuildRequires: meson BuildRequires: systemd-devel -BuildRequires: bash-completion +BuildRequires: pkgconfig(bash-completion) # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) From 83f95a1eee36953e86a032a78fa1dd50681d1d5d Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 4 Jul 2024 10:52:10 +0000 Subject: [PATCH 68/79] Update to 0.25.5 upstream release Upstream tag: 0.25.5 Upstream commit: 0dd11336 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 + README.packit | 2 +- p11-kit-0.25.3-import-object.patch | 109 ----------------------------- p11-kit.spec | 3 +- sources | 4 +- 5 files changed, 6 insertions(+), 114 deletions(-) delete mode 100644 p11-kit-0.25.3-import-object.patch diff --git a/.gitignore b/.gitignore index 7b351bd..6db1df5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ /p11-kit-0.25.2.tar.xz.sig /p11-kit-0.25.3.tar.xz /p11-kit-0.25.3.tar.xz.sig +/p11-kit-0.25.5.tar.xz +/p11-kit-0.25.5.tar.xz.sig diff --git a/README.packit b/README.packit index b6ea2f6..f2be23e 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.85.0.post1.dev17+g1f3036b1. +The file was generated using packit 0.97.3.post1.dev7+g1954e49a. diff --git a/p11-kit-0.25.3-import-object.patch b/p11-kit-0.25.3-import-object.patch deleted file mode 100644 index 974e0cf..0000000 --- a/p11-kit-0.25.3-import-object.patch +++ /dev/null @@ -1,109 +0,0 @@ -From d49c92c8420db6ee4c88515bdb014f68f4d471d9 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Sat, 2 Dec 2023 09:24:01 +0900 -Subject: [PATCH] import-object: Avoid integer truncation on 32-bit platforms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The build fails when compiling for 32-bit platforms with --Werror=incompatible-pointer-types: - - CFLAGS="-m32 -march=i686 -Werror=incompatible-pointer-types -Werror=implicit -Werror=int-conversion" setarch i686 -- meson setup _build - setarch i686 -- meson compile -C _build -v - ... - - ../p11-kit/import-object.c: In function ‘add_attrs_pubkey_rsa’: - ../p11-kit/import-object.c:223:62: error: passing argument 3 of ‘p11_asn1_read’ from incompatible pointer type [-Werror=incompatible-pointer-types] - 223 | attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); - | ^~~~~~~~~~~~~~~~~~~~~~~~ - | | - | long unsigned int * - -Reported by Sam James in: -https://github.com/p11-glue/p11-kit/issues/608 - -Signed-off-by: Daiki Ueno ---- - p11-kit/import-object.c | 30 +++++++++++++++++++++++++++--- - 1 file changed, 27 insertions(+), 3 deletions(-) - -diff --git a/p11-kit/import-object.c b/p11-kit/import-object.c -index feee076..fb47b96 100644 ---- a/p11-kit/import-object.c -+++ b/p11-kit/import-object.c -@@ -55,6 +55,7 @@ - #endif - - #include -+#include - #include - #include - #include -@@ -201,6 +202,7 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, - CK_ATTRIBUTE attr_encrypt = { CKA_ENCRYPT, &tval, sizeof (tval) }; - CK_ATTRIBUTE attr_modulus = { CKA_MODULUS, }; - CK_ATTRIBUTE attr_exponent = { CKA_PUBLIC_EXPONENT, }; -+ size_t len = 0; - - pubkey = p11_asn1_read (info, "subjectPublicKey", &pubkey_len); - if (pubkey == NULL) { -@@ -220,17 +222,31 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, - goto cleanup; - } - -- attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); -+ attr_modulus.pValue = p11_asn1_read (asn, "modulus", &len); - if (attr_modulus.pValue == NULL) { - p11_message (_("failed to obtain modulus")); - goto cleanup; - } -+#if ULONG_MAX < SIZE_MAX -+ if (len > ULONG_MAX) { -+ p11_message (_("failed to obtain modulus")); -+ goto cleanup; -+ } -+#endif -+ attr_modulus.ulValueLen = len; - -- attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &attr_exponent.ulValueLen); -+ attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &len); - if (attr_exponent.pValue == NULL) { - p11_message (_("failed to obtain exponent")); - goto cleanup; - } -+#if ULONG_MAX < SIZE_MAX -+ if (len > ULONG_MAX) { -+ p11_message (_("failed to obtain exponent")); -+ goto cleanup; -+ } -+#endif -+ attr_exponent.ulValueLen = len; - - result = p11_attrs_build (attrs, &attr_key_type, &attr_encrypt, &attr_modulus, &attr_exponent, NULL); - if (result == NULL) { -@@ -260,12 +276,20 @@ add_attrs_pubkey_ec (CK_ATTRIBUTE *attrs, - CK_ATTRIBUTE attr_key_type = { CKA_KEY_TYPE, &key_type, sizeof (key_type) }; - CK_ATTRIBUTE attr_ec_params = { CKA_EC_PARAMS, }; - CK_ATTRIBUTE attr_ec_point = { CKA_EC_POINT, }; -+ size_t len = 0; - -- attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &attr_ec_params.ulValueLen); -+ attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &len); - if (attr_ec_params.pValue == NULL) { - p11_message (_("failed to obtain EC parameters")); - goto cleanup; - } -+#if ULONG_MAX < SIZE_MAX -+ if (len > ULONG_MAX) { -+ p11_message (_("failed to obtain EC parameters")); -+ goto cleanup; -+ } -+#endif -+ attr_ec_params.ulValueLen = len; - - /* subjectPublicKey is read as BIT STRING value which contains - * EC point data. We need to DER encode this data as OCTET STRING. --- -2.43.0 - diff --git a/p11-kit.spec b/p11-kit.spec index b268309..012a4b2 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.3 +Version: 0.25.5 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -11,7 +11,6 @@ Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyring.gpg Source3: trust-extract-compat Source4: p11-kit-client.service -Patch: p11-kit-0.25.3-import-object.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 diff --git a/sources b/sources index ca61d94..bed7eca 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.3.tar.xz) = ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c -SHA512 (p11-kit-0.25.3.tar.xz.sig) = 189a40b12e40818daff4aa6869d7e0fa342a42f3901d85fc52bb40f7023bb17790967be5ab9a183473fe8bb3e335a0d4d8c2b6345ccf811e90f8495009c085b8 +SHA512 (p11-kit-0.25.5.tar.xz) = 177ec6ff5eb891901078306dce2bf3f5c1a0e5c2a8c493bdf5a08ae1ff1240fdf6952961e973c373f80ac3d1d5a9927e07f4da49e4ff92269d992e744889fc94 +SHA512 (p11-kit-0.25.5.tar.xz.sig) = 2be5aa4ccbb889e32aed88fc1f7926c3ccaadc90cc6b15a187358c812eee4ce1712068d1f271766ac51366112c0619aad46cff345ed2edd009fb2fe7fb804493 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From 89bca1f9d6285a0b186ca7be4be860cff191dd77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 12 Jul 2024 14:44:23 +0200 Subject: [PATCH 69/79] Call alternatives without full path As part of https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin, alternatives is moved from /usr/sbin/alternatives to /usr/bin/alternatives. (This happened when alternatives rpm was rebuilt in a build environment with the updated definitions.) On traditional systems a compat symlink is created, so both paths work. This means that packages that use paths into /usr/sbin do not need to be rebuilt and will continue to work fine. Unfortunately, on ostree systems, the compat symlinks are missing, so calls to /usr/sbin/alternatives fail. In addition, when _this_ package will be rebuilt in an environment with the updated definitions, its script will try to call /usr/bin/alternatives, which in turn will not work on systems with an older build of alternatives, where only /usr/sbin/alternatives exists, but not /usr/bin/alternatives, and /usr/sbin is not a symlink to /usr/bin. There is no reason for or benefit from specifying the full path to binaries in scriptlets because the scriptlets are called with a well-defined $PATH. So drop the full path, so that the package works fine no matter where exactly alternatives is installed. --- p11-kit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 012a4b2..d93e173 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -100,12 +100,12 @@ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir} %post trust -%{_sbindir}/alternatives --install %{_libdir}/libnssckbi.so %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 +alternatives --install %{_libdir}/libnssckbi.so %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 %postun trust if [ $1 -eq 0 ] ; then # package removal - %{_sbindir}/alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so + alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so fi From 1c9cf0a627a7097f805c73364a9820da1415d3de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 21:16:09 +0000 Subject: [PATCH 70/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8a8660a738f8a5461aeb603b8ecfcef82bcfc97f Mon Sep 17 00:00:00 2001 From: Zoltan Fridrich Date: Tue, 8 Oct 2024 11:07:04 +0200 Subject: [PATCH 71/79] Integrate mingw-p11-kit into spec file Signed-off-by: Zoltan Fridrich --- p11-kit.spec | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index d93e173..79996ed 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,4 +1,11 @@ # This spec file has been automatically updated +%if 0%{?fedora} +%bcond_without mingw +%else +%bcond_with mingw +%endif + + Version: 0.25.5 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit @@ -27,6 +34,23 @@ BuildRequires: pkgconfig(systemd) BuildRequires: gnupg2 BuildRequires: /usr/bin/xsltproc +%if %{with mingw} +BuildRequires: ninja-build + +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-gcc +BuildRequires: mingw32-binutils +BuildRequires: mingw32-libffi +BuildRequires: mingw32-libtasn1 + +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc +BuildRequires: mingw64-binutils +BuildRequires: mingw64-libffi +BuildRequires: mingw64-libtasn1 +%endif + + %description p11-kit provides a way to load and enumerate PKCS#11 modules, as well as a standard configuration setup for installing PKCS#11 modules in @@ -64,6 +88,33 @@ export PKCS#11 modules through a Unix domain socket. Note that this feature is still experimental. +%if %{with mingw} +%package -n mingw32-%{name} +Summary: MinGW Library for loading and sharing PKCS#11 modules +Requires: pkgconfig +BuildArch: noarch + +%description -n mingw32-%{name} +p11-kit provides a way to load and enumerate PKCS#11 modules, as well as +a standard configuration setup for installing PKCS#11 modules in such a +way that they're discoverable. This library is cross-compiled for MinGW. + + +%package -n mingw64-%{name} +Summary: MinGW Library for loading and sharing PKCS#11 modules +Requires: pkgconfig +BuildArch: noarch + +%description -n mingw64-%{name} +p11-kit provides a way to load and enumerate PKCS#11 modules, as well as +a standard configuration setup for installing PKCS#11 modules in such a +way that they're discoverable. This library is cross-compiled for MinGW. + + +%{?mingw_debug_package} +%endif + + # solution taken from icedtea-web.spec %define multilib_arches ppc64 sparc64 x86_64 ppc64le %ifarch %{multilib_arches} @@ -79,11 +130,16 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %autosetup -p1 %build -# These paths are the source paths that come from the plan here: +# These paths are the source paths that come from the plan here: # https://fedoraproject.org/wiki/Features/SharedSystemCertificates:SubTasks %meson -Dgtk_doc=true -Dman=true -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source %meson_build +%if %{with mingw} +%mingw_meson -Dgtk_doc=false -Dman=false -Dnls=false -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source +%mingw_ninja +%endif + %install %meson_install mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules @@ -95,6 +151,12 @@ mkdir -p $RPM_BUILD_ROOT%{_userunitdir} install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir} %find_lang %{name} +%if %{with mingw} +%mingw_ninja_install + +%{?mingw_debug_install_post} +%endif + %check %meson_test @@ -150,6 +212,44 @@ fi %{_userunitdir}/p11-kit-server.service %{_userunitdir}/p11-kit-server.socket +%if %{with mingw} +%files -n mingw32-%{name} +%{!?_licensedir:%global license %%doc} +%license COPYING +%{mingw32_bindir}/libp11-kit-0.dll +%{mingw32_bindir}/p11-kit.exe +%{mingw32_bindir}/trust.exe +%{mingw32_libdir}/libp11-kit.dll.a +%dir %{mingw32_libdir}/pkcs11/ +%{mingw32_libdir}/pkcs11/p11-kit-trust.dll +%{mingw32_libdir}/pkcs11/p11-kit-trust.dll.a +%{mingw32_libdir}/pkgconfig/p11-kit-1.pc +%dir %{mingw32_libexecdir}/p11-kit/ +%{mingw32_libexecdir}/p11-kit/*.exe +%{mingw32_libexecdir}/p11-kit/trust-extract-compat +%{mingw32_includedir}/p11-kit-1/ +%{mingw32_datadir}/p11-kit/ +%{mingw32_sysconfdir}/pkcs11/ + +%files -n mingw64-%{name} +%{!?_licensedir:%global license %%doc} +%license COPYING +%{mingw64_bindir}/libp11-kit-0.dll +%{mingw64_bindir}/p11-kit.exe +%{mingw64_bindir}/trust.exe +%{mingw64_libdir}/libp11-kit.dll.a +%dir %{mingw64_libdir}/pkcs11/ +%{mingw64_libdir}/pkcs11/p11-kit-trust.dll +%{mingw64_libdir}/pkcs11/p11-kit-trust.dll.a +%{mingw64_libdir}/pkgconfig/p11-kit-1.pc +%dir %{mingw64_libexecdir}/p11-kit/ +%{mingw64_libexecdir}/p11-kit/*.exe +%{mingw64_libexecdir}/p11-kit/trust-extract-compat +%{mingw64_includedir}/p11-kit-1/ +%{mingw64_datadir}/p11-kit/ +%{mingw64_sysconfdir}/pkcs11/ +%endif + %changelog %autochangelog From b4943bcb3d5f3eadfbc9d36a268e1fe69f925487 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 22:08:21 +0000 Subject: [PATCH 72/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a8fa1a940d8b2b5a3c8ce4e3cdd22b5d265de383 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 5 May 2025 18:00:32 +0200 Subject: [PATCH 73/79] Fix the MingGW build with GCC 15.1.1 Otherwise, it leads to: [22/338] Compiling C object common/libp11-library.a.p/library.c.obj FAILED: common/libp11-library.a.p/library.c.obj i686-w64-mingw32-gcc -Icommon/libp11-library.a.p -Icommon -I../common -I. -I.. -fvisibility=hidden -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -O0 -g -D_GNU_SOURCE -DP11_KIT_FUTURE_UNSTABLE_API -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -MD -MQ common/libp11-library.a.p/library.c.obj -MF common/libp11-library.a.p/library.c.obj.d -o common/libp11-library.a.p/library.c.obj -c ../common/library.c ../common/library.c:208:27: error: expected identifier or '(' before '=' token 208 | static DWORD thread_local = TLS_OUT_OF_INDEXES; | ^ ../common/library.c: In function '_p11_library_get_thread_local': ../common/library.c:217:26: error: expected identifier or '(' before '==' token 217 | if (thread_local == TLS_OUT_OF_INDEXES) | ^~ ../common/library.c:217:13: error: declaration in the controlling expression must have an initializer 217 | if (thread_local == TLS_OUT_OF_INDEXES) | ^~~~~~~~~~~~ ../common/library.c:220:29: error: expected expression before 'thread_local' 220 | data = TlsGetValue (thread_local); | ^~~~~~~~~~~~ ../common/library.c:223:30: error: expected expression before 'thread_local' 223 | TlsSetValue (thread_local, data); | ^~~~~~~~~~~~ ../common/library.c:223:17: error: too few arguments to function 'TlsSetValue'; expected 2, have 1 223 | TlsSetValue (thread_local, data); | ^~~~~~~~~~~ https://src.fedoraproject.org/rpms/p11-kit/pull-request/54 --- p11-kit-0.25.6-thread-local-var.patch | 134 ++++++++++++++++++++++++++ p11-kit.spec | 3 + 2 files changed, 137 insertions(+) create mode 100644 p11-kit-0.25.6-thread-local-var.patch diff --git a/p11-kit-0.25.6-thread-local-var.patch b/p11-kit-0.25.6-thread-local-var.patch new file mode 100644 index 0000000..77acdbc --- /dev/null +++ b/p11-kit-0.25.6-thread-local-var.patch @@ -0,0 +1,134 @@ +From fd7ad3969f68ea24e54d242a08b089039555f7bb Mon Sep 17 00:00:00 2001 +From: Brecht Sanders +Date: Tue, 31 Dec 2024 16:28:31 +0100 +Subject: [PATCH] avoid using already defined thread_local as variable name + +Building p11-kit 0.25.5 with GCC15 on MinGW-w64 failed because `thread_local` is already defined for this platform. + +Resolved by changing the variable name from `thread_local` to `threadlocal`. +--- + common/library.c | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/common/library.c b/common/library.c +index 1581702b62db..723b05f33699 100644 +--- a/common/library.c ++++ b/common/library.c +@@ -124,7 +124,7 @@ _p11_library_get_thread_local (void) + return &local; + } + #else +-static pthread_key_t thread_local = 0; ++static pthread_key_t threadlocal = 0; + + static p11_local * + _p11_library_get_thread_local (void) +@@ -133,10 +133,10 @@ _p11_library_get_thread_local (void) + + p11_library_init_once (); + +- local = pthread_getspecific (thread_local); ++ local = pthread_getspecific (threadlocal); + if (local == NULL) { + local = calloc (1, sizeof (p11_local)); +- pthread_setspecific (thread_local, local); ++ pthread_setspecific (threadlocal, local); + } + + return local; +@@ -158,7 +158,7 @@ p11_library_init_impl (void) + P11_RECURSIVE_MUTEX_INIT (p11_library_mutex); + P11_RECURSIVE_MUTEX_INIT (p11_virtual_mutex); + #ifndef P11_TLS_KEYWORD +- pthread_key_create (&thread_local, free); ++ pthread_key_create (&threadlocal, free); + #endif + p11_message_storage = thread_local_message; + #ifdef HAVE_STRERROR_L +@@ -181,8 +181,8 @@ p11_library_uninit (void) + + #ifndef P11_TLS_KEYWORD + /* Some cleanup to pacify valgrind */ +- free (pthread_getspecific (thread_local)); +- pthread_setspecific (thread_local, NULL); ++ free (pthread_getspecific (threadlocal)); ++ pthread_setspecific (threadlocal, NULL); + #endif + + #ifdef HAVE_STRERROR_L +@@ -191,7 +191,7 @@ p11_library_uninit (void) + #endif + p11_message_storage = dont_store_message; + #ifndef P11_TLS_KEYWORD +- pthread_key_delete (thread_local); ++ pthread_key_delete (threadlocal); + #endif + p11_mutex_uninit (&p11_virtual_mutex); + p11_mutex_uninit (&p11_library_mutex); +@@ -205,7 +205,7 @@ p11_library_uninit (void) + + #ifdef OS_WIN32 + +-static DWORD thread_local = TLS_OUT_OF_INDEXES; ++static DWORD threadlocal = TLS_OUT_OF_INDEXES; + + BOOL WINAPI DllMain (HINSTANCE, DWORD, LPVOID); + +@@ -214,13 +214,13 @@ _p11_library_get_thread_local (void) + { + LPVOID data; + +- if (thread_local == TLS_OUT_OF_INDEXES) ++ if (threadlocal == TLS_OUT_OF_INDEXES) + return NULL; + +- data = TlsGetValue (thread_local); ++ data = TlsGetValue (threadlocal); + if (data == NULL) { + data = LocalAlloc (LPTR, sizeof (p11_local)); +- TlsSetValue (thread_local, data); ++ TlsSetValue (threadlocal, data); + } + + return (p11_local *)data; +@@ -233,8 +233,8 @@ p11_library_init (void) + p11_debug ("initializing library"); + P11_RECURSIVE_MUTEX_INIT (p11_library_mutex); + P11_RECURSIVE_MUTEX_INIT (p11_virtual_mutex); +- thread_local = TlsAlloc (); +- if (thread_local == TLS_OUT_OF_INDEXES) ++ threadlocal = TlsAlloc (); ++ if (threadlocal == TLS_OUT_OF_INDEXES) + p11_debug ("couldn't setup tls"); + else + p11_message_storage = thread_local_message; +@@ -244,9 +244,9 @@ void + p11_library_thread_cleanup (void) + { + p11_local *local; +- if (thread_local != TLS_OUT_OF_INDEXES) { ++ if (threadlocal != TLS_OUT_OF_INDEXES) { + p11_debug ("thread stopped, freeing tls"); +- local = TlsGetValue (thread_local); ++ local = TlsGetValue (threadlocal); + LocalFree (local); + } + } +@@ -258,11 +258,11 @@ p11_library_uninit (void) + + uninit_common (); + +- if (thread_local != TLS_OUT_OF_INDEXES) { ++ if (threadlocal != TLS_OUT_OF_INDEXES) { + p11_message_storage = dont_store_message; +- data = TlsGetValue (thread_local); ++ data = TlsGetValue (threadlocal); + LocalFree (data); +- TlsFree (thread_local); ++ TlsFree (threadlocal); + } + p11_mutex_uninit (&p11_virtual_mutex); + p11_mutex_uninit (&p11_library_mutex); +-- +2.49.0 + diff --git a/p11-kit.spec b/p11-kit.spec index 79996ed..414078d 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -19,6 +19,9 @@ Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyr Source3: trust-extract-compat Source4: p11-kit-client.service +# https://github.com/p11-glue/p11-kit/pull/667 +Patch0: p11-kit-0.25.6-thread-local-var.patch + BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel From 509127e98c97aaecc3cdffca3bf426fe4bf7a7cb Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 5 May 2025 16:00:04 +0200 Subject: [PATCH 74/79] Move ownership of %{_libdir}/pkcs11 to the main package Commit 35e6a9531992aea8 made the 'trust' sub-package own the %{_libdir}/pkcs11 directory at a time when p11-kit-trust.so was the only PKCS#11 module being shipped by p11-kit. Since then, commit 7c8cb4503293e46e or p11-kit-0.23.4 introduced the p11-kit-client.so module. It was initially part of the main package, until was split into its own sub-package in commit adb7cbe63f623521. Even though it doesn't depend directly on the 'trust' module, it depended on it to own the %{_libdir}/pkcs11 directory. It will be better if the main package owns the %{_libdir}/pkcs11 directory, just like it already owns %{_sysconfdir}/pkcs11, so that the directory doesn't have to be separately owned by multiple sub-packages. https://src.fedoraproject.org/rpms/p11-kit/pull-request/53 --- p11-kit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 414078d..79e6d5a 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -183,6 +183,7 @@ fi %dir %{_sysconfdir}/pkcs11/modules %dir %{_datadir}/p11-kit %dir %{_datadir}/p11-kit/modules +%dir %{_libdir}/pkcs11 %dir %{_libexecdir}/p11-kit %{_bindir}/p11-kit %{_libdir}/libp11-kit.so.* @@ -201,7 +202,6 @@ fi %files trust %{_bindir}/trust -%dir %{_libdir}/pkcs11 %ghost %{_libdir}/libnssckbi.so %{_libdir}/pkcs11/p11-kit-trust.so %{_datadir}/p11-kit/modules/p11-kit-trust.module From 27179e46de3720b075db0305ed9c8c8f50a9eab2 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 5 May 2025 16:01:08 +0200 Subject: [PATCH 75/79] Split p11-kit-client.so into a separate sub-package Strictly speaking, the same container or machine doesn't need to have both the p11-kit-client.so module and the p11-kit-server executable. eg., Flatpak and Toolbx need only the p11-kit-server executable to be present on the host machine, and need only the p11-kit-client.so module inside the container. Therefore, splitting the 'server' sub-package [1] will avoid having unexpected content in containers and machines. A Release number of 8 was chosen for the Version-Release tuple in 'Obsoletes', because that will be the Release number of this commit according to %{autorelease}: $ rpmautospec calculate-release Calculated release number: 8 [1] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_one_to_many_replacement https://src.fedoraproject.org/rpms/p11-kit/pull-request/53 --- p11-kit.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 79e6d5a..f8e566a 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -60,6 +60,17 @@ as a standard configuration setup for installing PKCS#11 modules in such a way that they're discoverable. +%package client +Summary: Client module from %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-server < 0.25.5-8 + +%description client +The %{name}-client package contains a PKCS#11 module that enables +accessing other PKCS#11 modules over a Unix domain socket. Note that +this feature is still experimental. + + %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -82,8 +93,9 @@ contains certificate anchors and blocklists. %package server -Summary: Server and client commands for %{name} +Summary: Server command for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-server < 0.25.5-8 %description server The %{name}-server package contains command line tools that enable to @@ -194,6 +206,10 @@ fi %{_mandir}/man5/pkcs11.conf.5.gz %{_datadir}/bash-completion/completions/p11-kit +%files client +%{_libdir}/pkcs11/p11-kit-client.so +%{_userunitdir}/p11-kit-client.service + %files devel %{_includedir}/p11-kit-1/ %{_libdir}/libp11-kit.so @@ -209,8 +225,6 @@ fi %{_datadir}/bash-completion/completions/trust %files server -%{_libdir}/pkcs11/p11-kit-client.so -%{_userunitdir}/p11-kit-client.service %{_libexecdir}/p11-kit/p11-kit-server %{_userunitdir}/p11-kit-server.service %{_userunitdir}/p11-kit-server.socket From 44c46c2705f867b61091d0e7df1cab7e3380d2e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:50:34 +0000 Subject: [PATCH 76/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 8a33186b2fc7f20dbfb2d452b9724071619bb786 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 3 Sep 2025 18:33:50 +0900 Subject: [PATCH 77/79] rpc: Fix empty array attribute handling Signed-off-by: Daiki Ueno --- p11-kit-0.25.5-rpc-empty.patch | 62 ++++++++++++++++++++++++++++++++++ p11-kit.spec | 2 ++ 2 files changed, 64 insertions(+) create mode 100644 p11-kit-0.25.5-rpc-empty.patch diff --git a/p11-kit-0.25.5-rpc-empty.patch b/p11-kit-0.25.5-rpc-empty.patch new file mode 100644 index 0000000..63709dc --- /dev/null +++ b/p11-kit-0.25.5-rpc-empty.patch @@ -0,0 +1,62 @@ +From e94c1fb907546faafb3509615943776d1ea37eb8 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 3 Sep 2025 17:10:21 +0900 +Subject: [PATCH] rpc: Fix empty array attribute handling + +When an empty array attribute is exchanged at the RPC level, the +client previously sent the number of elements (= 0) even if it's +empty, while the server doesn't expect it. This fixes the client to +not send it. + +Signed-off-by: Daiki Ueno +--- + p11-kit/rpc-message.c | 2 +- + p11-kit/test-mock.c | 12 ++++++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/p11-kit/rpc-message.c b/p11-kit/rpc-message.c +index 049417f..5eaea61 100644 +--- a/p11-kit/rpc-message.c ++++ b/p11-kit/rpc-message.c +@@ -266,7 +266,7 @@ p11_rpc_message_write_attribute_buffer_array (p11_rpc_message *msg, + /* And the attribute buffer length */ + p11_rpc_buffer_add_uint32 (msg->output, attr->pValue ? attr->ulValueLen : 0); + +- if (IS_ATTRIBUTE_ARRAY (attr)) ++ if (attr->pValue && IS_ATTRIBUTE_ARRAY (attr)) + p11_rpc_message_write_attribute_buffer_array ( + msg, attr->pValue, + attr->ulValueLen / sizeof (CK_ATTRIBUTE)); +diff --git a/p11-kit/test-mock.c b/p11-kit/test-mock.c +index b117b92..f174015 100644 +--- a/p11-kit/test-mock.c ++++ b/p11-kit/test-mock.c +@@ -624,6 +624,12 @@ test_get_wrap_template (void) + { CKA_WRAP_TEMPLATE, temp, sizeof (temp) }, + }; + CK_ULONG n_attrs = sizeof (attrs) / sizeof (attrs[0]); ++ CK_OBJECT_CLASS klass = -1ul; ++ CK_ATTRIBUTE attrs_empty_template[] = { ++ { CKA_WRAP_TEMPLATE, NULL, 0 }, ++ { CKA_UNWRAP_TEMPLATE, NULL, 0 }, ++ }; ++ CK_ULONG n_attrs_empty_template = sizeof(attrs_empty_template) / sizeof(attrs_empty_template[0]); + + module = setup_mock_module (&session); + +@@ -664,6 +670,12 @@ test_get_wrap_template (void) + assert (verify == CK_TRUE); + assert (encrypt == CK_TRUE); + ++ rv = (module->C_GetAttributeValue) (session, MOCK_PUBLIC_KEY_CAPITALIZE, attrs_empty_template, n_attrs_empty_template); ++ assert (rv == CKR_ATTRIBUTE_TYPE_INVALID); ++ assert_num_eq (attrs_empty_template[0].type, CKA_WRAP_TEMPLATE); ++ assert_ptr_eq (attrs_empty_template[0].pValue, NULL); ++ assert_num_eq (attrs_empty_template[0].ulValueLen, (CK_ULONG)-1); ++ + teardown_mock_module (module); + } + +-- +2.50.1 + diff --git a/p11-kit.spec b/p11-kit.spec index f8e566a..e6ddd55 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -21,6 +21,8 @@ Source4: p11-kit-client.service # https://github.com/p11-glue/p11-kit/pull/667 Patch0: p11-kit-0.25.6-thread-local-var.patch +# https://github.com/p11-glue/p11-kit/pull/704 +Patch1: p11-kit-0.25.5-rpc-empty.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 From 6d11b1e9cb18f535cd43880752de3f0b6ab78699 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 9 Sep 2025 12:57:59 +0000 Subject: [PATCH 78/79] Update to 0.25.6 upstream release - Resolves: rhbz#2394061 Upstream tag: 0.25.6 Upstream commit: 4f821372 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 2 +- p11-kit-0.25.6-packaging.patch | 18 ++++++++++++++++++ p11-kit.spec | 7 ++----- sources | 4 ++-- 5 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 p11-kit-0.25.6-packaging.patch diff --git a/.gitignore b/.gitignore index 6db1df5..78c0a93 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ /p11-kit-0.25.3.tar.xz.sig /p11-kit-0.25.5.tar.xz /p11-kit-0.25.5.tar.xz.sig +/p11-kit-0.25.6.tar.xz +/p11-kit-0.25.6.tar.xz.sig diff --git a/README.packit b/README.packit index f2be23e..fb341a1 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.3.post1.dev7+g1954e49a. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/p11-kit-0.25.6-packaging.patch b/p11-kit-0.25.6-packaging.patch new file mode 100644 index 0000000..aee2dd8 --- /dev/null +++ b/p11-kit-0.25.6-packaging.patch @@ -0,0 +1,18 @@ +diff --git a/meson.build b/meson.build +index ab28396..b5829ca 100644 +--- a/meson.build ++++ b/meson.build +@@ -459,6 +459,7 @@ with_systemd = false + systemd = dependency('systemd', required: get_option('systemd')) + if systemd.found() + systemduserunitdir = systemd.get_variable(pkgconfig : 'systemduserunitdir') ++ with_systemd = true + endif + + configure_file(output: 'config.h', configuration: conf) +@@ -488,4 +489,4 @@ if get_option('nls') + subdir('po') + endif + subdir('bash-completion') +-subdir('zsh-completion') ++# subdir('zsh-completion') diff --git a/p11-kit.spec b/p11-kit.spec index e6ddd55..1ffa8c4 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -6,7 +6,7 @@ %endif -Version: 0.25.5 +Version: 0.25.6 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -19,10 +19,7 @@ Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyr Source3: trust-extract-compat Source4: p11-kit-client.service -# https://github.com/p11-glue/p11-kit/pull/667 -Patch0: p11-kit-0.25.6-thread-local-var.patch -# https://github.com/p11-glue/p11-kit/pull/704 -Patch1: p11-kit-0.25.5-rpc-empty.patch +Patch: p11-kit-0.25.6-packaging.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 diff --git a/sources b/sources index bed7eca..c7c1c77 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.5.tar.xz) = 177ec6ff5eb891901078306dce2bf3f5c1a0e5c2a8c493bdf5a08ae1ff1240fdf6952961e973c373f80ac3d1d5a9927e07f4da49e4ff92269d992e744889fc94 -SHA512 (p11-kit-0.25.5.tar.xz.sig) = 2be5aa4ccbb889e32aed88fc1f7926c3ccaadc90cc6b15a187358c812eee4ce1712068d1f271766ac51366112c0619aad46cff345ed2edd009fb2fe7fb804493 +SHA512 (p11-kit-0.25.6.tar.xz) = 71b5b83f0f241a28db66dcb940690ee6d23bbeebdd7d3f6772f1f444e2410c3b6e00f6a2530baef639816e4e05fe2189d340dae7c688f0d751c423c51d20ef16 +SHA512 (p11-kit-0.25.6.tar.xz.sig) = 99d06ee64de815bcb4e6bd861f2e11940103896f87b206b9ae221b91f706dc810fef7e7f5341570b8c447093e34defa8918693b1e14c8659aab1cd1d65768fb7 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From a33bf8feb91135889310ccdcd5633611501600bc Mon Sep 17 00:00:00 2001 From: Packit Date: Sat, 13 Sep 2025 00:47:23 +0000 Subject: [PATCH 79/79] Update to 0.25.8 upstream release Upstream tag: 0.25.8 Upstream commit: 2ee61264 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ p11-kit.spec | 8 ++++---- sources | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 78c0a93..dfb8ab3 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ /p11-kit-0.25.5.tar.xz.sig /p11-kit-0.25.6.tar.xz /p11-kit-0.25.6.tar.xz.sig +/p11-kit-0.25.8.tar.xz +/p11-kit-0.25.8.tar.xz.sig diff --git a/p11-kit.spec b/p11-kit.spec index 1ffa8c4..3dc3568 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -6,7 +6,7 @@ %endif -Version: 0.25.6 +Version: 0.25.8 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -19,8 +19,6 @@ Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyr Source3: trust-extract-compat Source4: p11-kit-client.service -Patch: p11-kit-0.25.6-packaging.patch - BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel @@ -150,7 +148,7 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %meson_build %if %{with mingw} -%mingw_meson -Dgtk_doc=false -Dman=false -Dnls=false -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source +%mingw_meson -Dgtk_doc=false -Dman=false -Dnls=false -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source -Dzsh_completion=disabled %mingw_ninja %endif @@ -204,6 +202,7 @@ fi %{_mandir}/man8/p11-kit.8.gz %{_mandir}/man5/pkcs11.conf.5.gz %{_datadir}/bash-completion/completions/p11-kit +%{_datadir}/zsh/site-functions/_p11-kit %files client %{_libdir}/pkcs11/p11-kit-client.so @@ -222,6 +221,7 @@ fi %{_datadir}/p11-kit/modules/p11-kit-trust.module %{_libexecdir}/p11-kit/trust-extract-compat %{_datadir}/bash-completion/completions/trust +%{_datadir}/zsh/site-functions/_trust %files server %{_libexecdir}/p11-kit/p11-kit-server diff --git a/sources b/sources index c7c1c77..418f67a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.6.tar.xz) = 71b5b83f0f241a28db66dcb940690ee6d23bbeebdd7d3f6772f1f444e2410c3b6e00f6a2530baef639816e4e05fe2189d340dae7c688f0d751c423c51d20ef16 -SHA512 (p11-kit-0.25.6.tar.xz.sig) = 99d06ee64de815bcb4e6bd861f2e11940103896f87b206b9ae221b91f706dc810fef7e7f5341570b8c447093e34defa8918693b1e14c8659aab1cd1d65768fb7 +SHA512 (p11-kit-0.25.8.tar.xz) = 4a3852459a4a5e4ea71eea5d23ef74deeb51c66b28d095be30a263f10d1f47853341f8628eb0c43c88247503059a4c1f67017965a70cd3c7df31d86e458a8162 +SHA512 (p11-kit-0.25.8.tar.xz.sig) = 97f47324cd7578833b751ab1fee55a9a538ba94b52ec4729249a9e5494c60cceef6c60999b495299f2b9ae0d0cda60d5db713d82e0b7991112b7b4b46ad46d1d SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881