Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / p11-kit
Commits: 8668677b by Jan Alexander Steffens (heftig) at 2024-07-04T21:14:07+02:00 0.25.5-1 - - - - - 3 changed files: - .SRCINFO - − 0001-iter-Fix-recursive-attribute-loading.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,6 +1,6 @@ pkgbase = p11-kit pkgdesc = Loads and enumerates PKCS#11 modules - pkgver = 0.25.4 + pkgver = 0.25.5 pkgrel = 1 url = https://p11-glue.freedesktop.org arch = x86_64 @@ -15,15 +15,13 @@ pkgbase = p11-kit depends = glibc depends = libtasn1 depends = systemd-libs - source = https://github.com/p11-glue/p11-kit/releases/download/0.25.4/p11-kit-0.25.4.tar.xz - source = https://github.com/p11-glue/p11-kit/releases/download/0.25.4/p11-kit-0.25.4.tar.xz.sig - source = 0001-iter-Fix-recursive-attribute-loading.patch + source = https://github.com/p11-glue/p11-kit/releases/download/0.25.5/p11-kit-0.25.5.tar.xz + source = https://github.com/p11-glue/p11-kit/releases/download/0.25.5/p11-kit-0.25.5.tar.xz.sig validpgpkeys = C0F67099B808FB063E2C81117BFB1108D92765AF validpgpkeys = 462225C3B46F34879FC8496CD605848ED7E69871 validpgpkeys = 5D46CB0F763405A7053556F47A75A648B3F9220C - b2sums = 51bfaf02de0cf251542d86dfcabcfd15817b90b11e7c6d2f534d99598a7e7e08109ec665835a5fee63da77fc183baccdeb8a7d526fbdacaf90d6fb9bf593e7d6 + b2sums = 96d6a9c2807586abafae4da4df89f566672733963997d6a83e00aaf83a7a0c0e2995638f505e98fb87a90c60bde28814f1e8b7d5071bf0af96bb0467105a1ddc b2sums = SKIP - b2sums = 0395e962c245fc8d16190fe4bc88f7d8a3e6f892ba59cf982d7b172ca0c2dda40fa4db9348760d181d3e136d6b8b12476bffb17554bc44e67f618061f1d2c1c5 pkgname = p11-kit install = p11-kit.install @@ -31,7 +29,7 @@ pkgname = p11-kit depends = glibc depends = libtasn1 depends = systemd-libs - depends = libp11-kit=0.25.4-1 + depends = libp11-kit=0.25.5-1 depends = libp11-kit.so depends = libsystemd.so ===================================== 0001-iter-Fix-recursive-attribute-loading.patch deleted ===================================== @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org> -Date: Tue, 2 Jul 2024 22:34:26 +0200 -Subject: [PATCH] iter: Fix recursive attribute loading - -Fixes: https://github.com/p11-glue/p11-kit/issues/641 -Signed-off-by: Jan Alexander Steffens (heftig) <hef...@archlinux.org> ---- - p11-kit/iter.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/p11-kit/iter.c b/p11-kit/iter.c -index d423b06e18b2..955d098393d7 100644 ---- a/p11-kit/iter.c -+++ b/p11-kit/iter.c -@@ -1048,7 +1048,7 @@ prepare_recursive_attribute (P11KitIter *iter, - templ[i].pValue = malloc (templ[i].ulValueLen); - return_val_if_fail (templ[i].pValue != NULL, CKR_HOST_MEMORY); - -- if (IS_ATTRIBUTE_ARRAY (attr)) { -+ if (IS_ATTRIBUTE_ARRAY (templ + i)) { - rv = prepare_recursive_attribute (iter, attr, templ[i].pValue, - templ[i].ulValueLen); - return_val_if_fail (rv == CKR_OK, rv); ===================================== PKGBUILD ===================================== @@ -7,7 +7,7 @@ pkgname=( libp11-kit p11-kit-docs ) -pkgver=0.25.4 +pkgver=0.25.5 pkgrel=1 pkgdesc="Loads and enumerates PKCS#11 modules" url="https://p11-glue.freedesktop.org" @@ -31,11 +31,9 @@ checkdepends=( ) source=( https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz{,.sig} - 0001-iter-Fix-recursive-attribute-loading.patch ) -b2sums=('51bfaf02de0cf251542d86dfcabcfd15817b90b11e7c6d2f534d99598a7e7e08109ec665835a5fee63da77fc183baccdeb8a7d526fbdacaf90d6fb9bf593e7d6' - 'SKIP' - '0395e962c245fc8d16190fe4bc88f7d8a3e6f892ba59cf982d7b172ca0c2dda40fa4db9348760d181d3e136d6b8b12476bffb17554bc44e67f618061f1d2c1c5') +b2sums=('96d6a9c2807586abafae4da4df89f566672733963997d6a83e00aaf83a7a0c0e2995638f505e98fb87a90c60bde28814f1e8b7d5071bf0af96bb0467105a1ddc' + 'SKIP') validpgpkeys=( C0F67099B808FB063E2C81117BFB1108D92765AF # Stef Walter <s...@thewalter.net> 462225C3B46F34879FC8496CD605848ED7E69871 # Daiki Ueno <u...@unixuser.org> @@ -44,9 +42,6 @@ validpgpkeys=( prepare() { cd p11-kit-$pkgver - - # https://github.com/p11-glue/p11-kit/issues/641 - patch -Np1 -i ../0001-iter-Fix-recursive-attribute-loading.patch } build() { View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/p11-kit/-/commit/8668677be10482b0fe751221a1b68ac4b6ed243b -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/p11-kit/-/commit/8668677be10482b0fe751221a1b68ac4b6ed243b You're receiving this email because of your account on gitlab.archlinux.org.