Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / lib32-p11-kit


Commits:
ebb6e18a by Jan Alexander Steffens (heftig) at 2024-07-04T21:14:11+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 = lib32-p11-kit
        pkgdesc = Loads and enumerates PKCS#11 modules (32-bit library)
-       pkgver = 0.25.4
+       pkgver = 0.25.5
        pkgrel = 1
        url = https://p11-glue.freedesktop.org
        arch = x86_64
@@ -13,15 +13,13 @@ pkgbase = lib32-p11-kit
        depends = lib32-libffi
        depends = lib32-libtasn1
        depends = libp11-kit
-       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 = lib32-p11-kit
        provides = libp11-kit.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
=====================================
@@ -6,7 +6,7 @@ pkgbase=lib32-p11-kit
 pkgname=(
   lib32-p11-kit
 )
-pkgver=0.25.4
+pkgver=0.25.5
 pkgrel=1
 pkgdesc="Loads and enumerates PKCS#11 modules (32-bit library)"
 url="https://p11-glue.freedesktop.org";
@@ -28,11 +28,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>
@@ -41,9 +39,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/lib32-p11-kit/-/commit/ebb6e18a77b0c115508d9d3fb78b0f8fc4d1b6e7

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-p11-kit/-/commit/ebb6e18a77b0c115508d9d3fb78b0f8fc4d1b6e7
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to