upg btrfs-progs p11-kit
This commit is contained in:
parent
758c282671
commit
48ac7a9b0d
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=btrfs-progs
|
||||
pkgver=6.5.3
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='Btrfs filesystem utilities w/o systemd'
|
||||
makedepends=('asciidoc' 'xmlto' 'python' 'python-setuptools' 'e2fsprogs' 'reiserfsprogs' 'python-sphinx')
|
||||
depends=('glibc' 'util-linux-libs' 'lzo' 'zlib' 'zstd' 'libgcrypt')
|
||||
|
|
@ -22,8 +22,7 @@ provides=('btrfs-progs-unstable')
|
|||
#options=(!staticlibs debug) ## uncomment this to have the debug pkg produced
|
||||
options=(!staticlibs)
|
||||
source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar."{xz,sign}
|
||||
# "https://github.com/kdave/btrfs-progs/commit/839b2d587da9d691c2f2e7cdb5301eed23781d1d.patch"
|
||||
# "https://github.com/kdave/btrfs-progs/commit/03f41ac508d2c47fdfef08f0fd27ab154f7dcfd8.patch"
|
||||
"https://github.com/kdave/btrfs-progs/commit/eaaa576f16735905f30523cdabd0d2ead419b5da.patch"
|
||||
'initcpio-install-btrfs'
|
||||
'initcpio-hook-btrfs')
|
||||
install=btrfs-progs.install
|
||||
|
|
@ -75,7 +74,9 @@ validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
|
|||
|
||||
sha256sums=(fce7cb3f920e615e63faf265a4cd9f2bf39d4adcaa66211c987697da85a2eedd # btrfs-progs-v6.5.3.tar.xz
|
||||
d4604f0d8e9cbc67afe36dddec948e8c52ba87915da477b40c18fc6ccbd177e8 # btrfs-progs-v6.5.3.tar.sign
|
||||
55961505a5b1324d890ee55c4f67500421c1179dbc042e6b68d1a7962d06cc6a # 03f41ac508d2c47fdfef08f0fd27ab154f7dcfd8.patch
|
||||
bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4 # initcpio-install-btrfs
|
||||
35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5) # initcpio-hook-btrfs
|
||||
|
||||
## fd044c26aa3c967e87e5410513659574fc15b854fed1d588d7e8d03f0d570ce4 btrfs-progs-6.5.3-01-x86_64.pkg.tar.lz
|
||||
## d5ff678d7927ba52e926021c773028ca4f4505808b044e60dea1982586ca4362 btrfs-progs-6.5.3-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
pkgname=btrfs-progs
|
||||
pkgver=6.5.3
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Btrfs filesystem utilities'
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools' 'e2fsprogs' 'reiserfsprogs' 'python-sphinx')
|
||||
|
|
@ -19,6 +19,7 @@ provides=('btrfs-progs-unstable')
|
|||
license=('GPL-2.0-only')
|
||||
validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
|
||||
source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar."{sign,xz}
|
||||
"https://github.com/kdave/btrfs-progs/commit/eaaa576f16735905f30523cdabd0d2ead419b5da.patch"
|
||||
'initcpio-install-btrfs'
|
||||
'initcpio-hook-btrfs'
|
||||
'btrfs-scrub@.service'
|
||||
|
|
@ -28,6 +29,7 @@ install=btrfs-progs.install
|
|||
options=(!staticlibs)
|
||||
sha256sums=('SKIP'
|
||||
'fce7cb3f920e615e63faf265a4cd9f2bf39d4adcaa66211c987697da85a2eedd'
|
||||
'55961505a5b1324d890ee55c4f67500421c1179dbc042e6b68d1a7962d06cc6a'
|
||||
'bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4'
|
||||
'35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5'
|
||||
'eaa7af92d28bfa8940bb551560fd7be777f9f175292eaa72b5f6ef00fb240252'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
From eaaa576f16735905f30523cdabd0d2ead419b5da Mon Sep 17 00:00:00 2001
|
||||
From: David Sterba <dsterba@suse.com>
|
||||
Date: Mon, 23 Oct 2023 20:38:17 +0200
|
||||
Subject: [PATCH] btrfs-progs: device usage: fix error reporting number of
|
||||
devices 0 != 1
|
||||
|
||||
Due to refactoring in 88c25674c7c0d0 ("btrfs-progs: convert device info
|
||||
to struct array") the variable tracking number of devices was not
|
||||
updated and led to an error.
|
||||
|
||||
$ btrfs device usage /path
|
||||
ERROR: unexpected number of devices: 0 != 1
|
||||
...
|
||||
|
||||
Issue: #697
|
||||
Signed-off-by: David Sterba <dsterba@suse.com>
|
||||
---
|
||||
cmds/filesystem-usage.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c
|
||||
index 33358bf9d..0db91e9c5 100644
|
||||
--- a/cmds/filesystem-usage.c
|
||||
+++ b/cmds/filesystem-usage.c
|
||||
@@ -807,6 +807,7 @@ static int load_device_info(int fd, struct array *devinfos)
|
||||
device_get_partition_size((const char *)dev_info.path);
|
||||
}
|
||||
info->size = dev_info.total_bytes;
|
||||
+ ndevs++;
|
||||
}
|
||||
|
||||
if (ndevs != fi_args.num_devices) {
|
||||
|
|
@ -7,21 +7,18 @@
|
|||
|
||||
pkgbase=p11-kit
|
||||
pkgname=(p11-kit libp11-kit) # p11-kit-docs)
|
||||
pkgver=0.25.0
|
||||
pkgrel=02
|
||||
pkgver=0.25.1
|
||||
pkgrel=01
|
||||
pkgdesc="Loads and enumerates PKCS#11 modules - w/o systemd"
|
||||
url="https://p11-glue.freedesktop.org"
|
||||
depends=(glibc libffi libtasn1)
|
||||
makedepends=(bash-completion gtk-doc meson)
|
||||
source=(https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz{,.sig}
|
||||
0001-Fix-probing-of-C_GetInterface.patch)
|
||||
checkdepends=(gnutls)
|
||||
source=(https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz{,.sig})
|
||||
|
||||
prepare() {
|
||||
cd p11-kit-$pkgver
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/libsoup/-/issues/352
|
||||
# https://github.com/p11-glue/p11-kit/pull/535
|
||||
patch -Np1 -i ../0001-Fix-probing-of-C_GetInterface.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -96,10 +93,9 @@ validpgpkeys=(C0F67099B808FB063E2C81117BFB1108D92765AF # Stef Walter <stef@the
|
|||
462225C3B46F34879FC8496CD605848ED7E69871 # Daiki Ueno <ueno@unixuser.org>
|
||||
5D46CB0F763405A7053556F47A75A648B3F9220C) # Zoltan Fridrich <zfridric@redhat.com>
|
||||
|
||||
sha256sums=(d55583bcdde83d86579cabe3a8f7f2638675fef01d23cace733ff748fc354706 # p11-kit-0.25.0.tar.xz
|
||||
c4778a5b5009b8c31cb7342b728ba696ca97a03219fb965cbb48e6aea85db31c # p11-kit-0.25.0.tar.xz.sig
|
||||
1297c121817c84fca27e3697c925f80abbc429c857015976693ff38f253fbac4) # 0001-Fix-probing-of-C_GetInterface.patch
|
||||
sha256sums=(b6f326925725c8c45484e6daf78cdc73428a86296b6b99078255017f1bacdafc # p11-kit-0.25.1.tar.xz
|
||||
f0d92b1ed35c260c8f0c14259c9a731d6c819a9b22d73aa776126390a3cec910) # p11-kit-0.25.1.tar.xz.sig
|
||||
|
||||
## 48e3f68e1c76ba60be9c4e7609ea4ceddd0a107b5b9ec9eef128a36321332b7a libp11-kit-0.25.0-02-x86_64.pkg.tar.lz
|
||||
## 668a5826376ef727541a596849d20d4c431f2d969d0a9486d8a537b198491042 p11-kit-0.25.0-02-x86_64.pkg.tar.lz
|
||||
## 3b980c7a51ea3c8ef916f2970323da237a467cdb5f52981559cac843e2abdd7f libp11-kit-0.25.1-01-x86_64.pkg.tar.lz
|
||||
## 1765682de5af5f46c2c01846367a1949c79c506f48ac99bad6c02eed71e3edad p11-kit-0.25.1-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ pkgname=(
|
|||
libp11-kit
|
||||
p11-kit-docs
|
||||
)
|
||||
pkgver=0.25.0
|
||||
pkgrel=2
|
||||
pkgver=0.25.1
|
||||
pkgrel=1
|
||||
pkgdesc="Loads and enumerates PKCS#11 modules"
|
||||
url="https://p11-glue.freedesktop.org"
|
||||
arch=(x86_64)
|
||||
|
|
@ -24,13 +24,14 @@ makedepends=(
|
|||
meson
|
||||
systemd
|
||||
)
|
||||
checkdepends=(
|
||||
gnutls
|
||||
)
|
||||
source=(
|
||||
https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz{,.sig}
|
||||
0001-Fix-probing-of-C_GetInterface.patch
|
||||
)
|
||||
b2sums=('6ffce977f86c516a327afe50f4cc5a36e86ba7f43c6cb555db419d9e4ba7543a9f1847ba83da348cd6d7bbebe55dfa26cfe3a3aaa3e1d5420a4b8dc6cbbff088'
|
||||
'SKIP'
|
||||
'7d93f7bf86840e256480d6fa3efb5c933f8081fe7f64d803d44670724bc8171515474fe43f089e772a1207ba675149a040a8c07a3ba4dfe79bb9effd8e524648')
|
||||
b2sums=('6704ef2ada20765bfbbbfc6f92ec2e934be34b482e1b6a94a7a15ab4718efcaecf943ce06b6c352b8c638fe2b1f0bc7c953c6b0dcf0590e5695c1d6724272ebb'
|
||||
'SKIP')
|
||||
validpgpkeys=(
|
||||
C0F67099B808FB063E2C81117BFB1108D92765AF # Stef Walter <stef@thewalter.net>
|
||||
462225C3B46F34879FC8496CD605848ED7E69871 # Daiki Ueno <ueno@unixuser.org>
|
||||
|
|
@ -39,10 +40,6 @@ validpgpkeys=(
|
|||
|
||||
prepare() {
|
||||
cd p11-kit-$pkgver
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/libsoup/-/issues/352
|
||||
# https://github.com/p11-glue/p11-kit/pull/535
|
||||
patch -Np1 -i ../0001-Fix-probing-of-C_GetInterface.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue