summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Chee Yang <chee.yang.lee@intel.com>2021-01-18 17:37:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-18 16:48:28 +0000
commit406d8ec1ef94d81927e1c60d44234dab99c453eb (patch)
tree56aabe846ea3588aaba41c92b2ac3858b3f082d3
parent712e5cce4788cc52ae6c0b516f30a3b99eafd781 (diff)
downloadpoky-406d8ec1ef94d81927e1c60d44234dab99c453eb.tar.gz
poky-406d8ec1ef94d81927e1c60d44234dab99c453eb.tar.bz2
poky-406d8ec1ef94d81927e1c60d44234dab99c453eb.zip
p11-kit: upgrade 0.23.21 -> 0.23.22
https://github.com/p11-glue/p11-kit/releases/tag/0.23.22 Release notes: Fix memory-safety issues that affect the RPC protocol (CVE-2020-29361, CVE-2020-29362, and CVE-2020-29363), discovered and fixed by David Cook anchor: Prefer persistent format when storing anchor [#329] common: Fix infloop in p11_path_build [#326, #327] proxy: C_CloseAllSessions: Make sure that calloc args are non-zero [#325] common: Check for a NULL locale before freeing it [#321] Build and test fixes [#313, #315, #317, #318, #319, #323, #330, #333, #334, #335, #338, #339] https://github.com/p11-glue/p11-kit/commit/c4e75e10021ce86ab42682ea4936dce94ced2f77 patch to fix trailing newline using custom_target() caused error with DISTRO_FEATURES api-documentation due to meson bugs, enable manpages PACKAGECONFIG should prevent this error. | warning: failed to load external entity "../version.xml" | ../p11-kit-docs.xml:11: parser error : Failure to process entity version | <releaseinfo>for p11-kit &version;</releaseinfo> | ^ | ../p11-kit-docs.xml:11: parser error : Entity 'version' not defined | <releaseinfo>for p11-kit &version;</releaseinfo> | ^ | unable to parse ../p11-kit-docs.xml (From OE-Core rev: 641c9f6a20672e26e66191e6363b534d5b87abf5) Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit b112ba291835061640123c13784e2b33cc73f17d) [0.23.x is an lts release, bug fix only update] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/p11-kit/p11-kit_0.23.22.bb (renamed from meta/recipes-support/p11-kit/p11-kit_0.23.21.bb)7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.21.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb
index b1fd2334b2..c539ecdbc6 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.23.21.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb
@@ -2,17 +2,18 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50"
-inherit meson gettext pkgconfig gtk-doc bash-completion
+inherit meson gettext pkgconfig gtk-doc bash-completion manpages
DEPENDS = "libtasn1 libtasn1-native libffi"
DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
-SRC_URI = "git://github.com/p11-glue/p11-kit"
-SRCREV = "fd8b56f3ee971f94dc6fc95411fc01e1c12153ab"
+SRC_URI = "git://github.com/p11-glue/p11-kit;branch=0.23"
+SRCREV = "bd97afbfe28d5fbbde95ce36ff7a8834fc0291ee"
S = "${WORKDIR}/git"
PACKAGECONFIG ??= ""
+PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native"
PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates"
GTKDOC_MESON_OPTION = 'gtk_doc'