David Runge pushed to branch main at Arch Linux / Packaging / Packages / nethsm-pkcs11
Commits: 8094c7ef by David Runge at 2024-04-23T09:21:36+02:00 Add prefix for nvchecker integration Signed-off-by: David Runge <dv...@archlinux.org> - - - - - ad37987b by David Runge at 2024-04-23T10:06:19+02:00 upgpkg: 1.3.1-1 Remove now unneeded patch for disabling tests. - - - - - 4 changed files: - .SRCINFO - .nvchecker.toml - PKGBUILD - − nethsm-pkcs11-1.3.0-disable_network_tests.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,6 +1,6 @@ pkgbase = nethsm-pkcs11 pkgdesc = PKCS#11 driver for NetHSM - pkgver = 1.3.0 + pkgver = 1.3.1 pkgrel = 1 url = https://github.com/Nitrokey/nethsm-pkcs11 arch = x86_64 @@ -8,11 +8,8 @@ pkgbase = nethsm-pkcs11 makedepends = rust depends = glibc options = !lto - source = nethsm-pkcs11-1.3.0.tar.gz::https://github.com/Nitrokey/nethsm-pkcs11/archive/refs/tags/1.3.0.tar.gz - source = nethsm-pkcs11-1.3.0-disable_network_tests.patch - sha512sums = 07b16f83b0f0965554ad9b134bc88f39a44832345b06053f501d6adf90cc4ffd47f28f94c08f4548a35c840e8545980fc37003fb08859c61ae5c392b65ca12e3 - sha512sums = b8100588d107b68a50a507b23d078d41ed50250e3c86d9b88b87cdd17a5950a7590ac35c749383745ac573033050cdc303fc9092909c6a9b5ab6d9d42a835598 - b2sums = 2f076203fa423cba51cf100d68907e7b2b1edbdfe8772b9f92925749c2cc80a7d15a5c3a8354828591098598db1343b611fb3d66ddb4675775a0db6b6073d99c - b2sums = 0d5dbca97d2179610a5bc4d18f04e4f4460ef2062bf200f9dc58353384b97c9070da373f3309bfe669058c306a5169fabd928eb6baf30ba613d4499721132ef7 + source = nethsm-pkcs11-1.3.1.tar.gz::https://github.com/Nitrokey/nethsm-pkcs11/archive/refs/tags/v1.3.1.tar.gz + sha512sums = 69b20cbfa57e87cbf1c84c2093bbd98095dcd8478a95762528e440f38b9280f8c33d1207f958f36f21578e40b3eed3210ad3032e5ac6448a91328ef99de47c39 + b2sums = 42d8c48eeddc068f343569a99aa96795b3f7b42bc2e712934c0b781e067385675e7ed843e9c8a103ee6f5293a576303963e7efff57776660bad499f915c99426 pkgname = nethsm-pkcs11 ===================================== .nvchecker.toml ===================================== @@ -1,3 +1,4 @@ [nethsm-pkcs11] source = "git" git = "https://github.com/Nitrokey/nethsm-pkcs11" +prefix = "v" ===================================== PKGBUILD ===================================== @@ -1,7 +1,7 @@ # Maintainer: David Runge <dv...@archlinux.org> pkgname=nethsm-pkcs11 -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="PKCS#11 driver for NetHSM" arch=(x86_64) @@ -11,18 +11,12 @@ depends=(glibc) makedepends=(rust) options=(!lto) # NOTE: as ring is used we can not use LTO source=( - $pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz - $pkgname-1.3.0-disable_network_tests.patch + $pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz ) -sha512sums=('07b16f83b0f0965554ad9b134bc88f39a44832345b06053f501d6adf90cc4ffd47f28f94c08f4548a35c840e8545980fc37003fb08859c61ae5c392b65ca12e3' - 'b8100588d107b68a50a507b23d078d41ed50250e3c86d9b88b87cdd17a5950a7590ac35c749383745ac573033050cdc303fc9092909c6a9b5ab6d9d42a835598') -b2sums=('2f076203fa423cba51cf100d68907e7b2b1edbdfe8772b9f92925749c2cc80a7d15a5c3a8354828591098598db1343b611fb3d66ddb4675775a0db6b6073d99c' - '0d5dbca97d2179610a5bc4d18f04e4f4460ef2062bf200f9dc58353384b97c9070da373f3309bfe669058c306a5169fabd928eb6baf30ba613d4499721132ef7') +sha512sums=('69b20cbfa57e87cbf1c84c2093bbd98095dcd8478a95762528e440f38b9280f8c33d1207f958f36f21578e40b3eed3210ad3032e5ac6448a91328ef99de47c39') +b2sums=('42d8c48eeddc068f343569a99aa96795b3f7b42bc2e712934c0b781e067385675e7ed843e9c8a103ee6f5293a576303963e7efff57776660bad499f915c99426') prepare() { - # disable tests requiring network: https://github.com/Nitrokey/nethsm-pkcs11/pull/191 - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.3.0-disable_network_tests.patch - cd $pkgname-$pkgver export RUSTUP_TOOLCHAIN=stable cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" ===================================== nethsm-pkcs11-1.3.0-disable_network_tests.patch deleted ===================================== @@ -1,29 +0,0 @@ -From 5df2899a72b09c4ae341befbe5b7857022db64fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sosth=C3=A8ne=20Gu=C3=A9don?= <sosth...@nitrokey.com> -Date: Mon, 19 Feb 2024 09:35:32 +0100 -Subject: [PATCH] Add `#[ignore]` for tests requiring network access - ---- - pkcs11/src/backend/session.rs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/pkcs11/src/backend/session.rs b/pkcs11/src/backend/session.rs -index c03cc0f..fcf8d7d 100644 ---- a/pkcs11/src/backend/session.rs -+++ b/pkcs11/src/backend/session.rs -@@ -701,6 +701,7 @@ mod test { - use super::*; - - #[test] -+ #[ignore] - fn parrallel_fetch_all_keys() { - init_for_tests(); - let slot = get_slot(0).unwrap(); -@@ -741,6 +742,7 @@ mod test { - } - - #[test] -+ #[ignore] - fn parrallel_fetch_all_keys_fail() { - THREADS_ALLOWED.store(false, Ordering::Relaxed); - init_for_tests(); View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/nethsm-pkcs11/-/compare/d370c1de4aa2e52f0b44277f08200895a3d03efa...ad37987bf98dfbfd59c803544144538b4652f170 -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/nethsm-pkcs11/-/compare/d370c1de4aa2e52f0b44277f08200895a3d03efa...ad37987bf98dfbfd59c803544144538b4652f170 You're receiving this email because of your account on gitlab.archlinux.org.