[arch-commits] Commit in libfido2/trunk (2 files)

[Felix Yan]

    Date: Friday, July 23, 2021 @ 19:35:57
  Author: felixonmars
Revision: 420365

upgpkg: libfido2 1.8.0-1

Modified:
  libfido2/trunk/PKGBUILD
Deleted:
  libfido2/trunk/0001-log-explicit-truncation-to-placate-gcc-gh-318.patch

----------------------------------------------------------+
 0001-log-explicit-truncation-to-placate-gcc-gh-318.patch |   31 -------------
 PKGBUILD                                                 |   25 ++--------
 2 files changed, 7 insertions(+), 49 deletions(-)

Deleted: 0001-log-explicit-truncation-to-placate-gcc-gh-318.patch
===================================================================
--- 0001-log-explicit-truncation-to-placate-gcc-gh-318.patch	2021-07-23 19:33:03 UTC (rev 420364)
+++ 0001-log-explicit-truncation-to-placate-gcc-gh-318.patch	2021-07-23 19:35:57 UTC (rev 420365)
@@ -1,31 +0,0 @@
-From 487924cda8c6c1a5360e15d4858432d676069f1b Mon Sep 17 00:00:00 2001
-From: pedro martelletto <pedro at yubico.com>
-Date: Sun, 4 Apr 2021 10:41:24 +0200
-Subject: [PATCH] log: explicit truncation to placate gcc; gh#318
-
----
- src/log.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/log.c b/src/log.c
-index 3d603c2a..ab18ae12 100644
---- a/src/log.c
-+++ b/src/log.c
-@@ -33,14 +33,14 @@ log_on_stderr(const char *str)
- static void
- do_log(const char *suffix, const char *fmt, va_list args)
- {
--	char line[LINELEN], body[LINELEN - 3];
-+	char line[LINELEN], body[LINELEN];
- 
- 	vsnprintf(body, sizeof(body), fmt, args);
- 
- 	if (suffix != NULL)
--		snprintf(line, sizeof(line), "%s: %s\n", body, suffix);
-+		snprintf(line, sizeof(line), "%.180s: %.70s\n", body, suffix);
- 	else
--		snprintf(line, sizeof(line), "%s\n", body);
-+		snprintf(line, sizeof(line), "%.180s\n", body);
- 
- 	log_handler(line);
- }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-23 19:33:03 UTC (rev 420364)
+++ PKGBUILD	2021-07-23 19:35:57 UTC (rev 420365)
@@ -2,8 +2,8 @@
 # Contributor: Karol Babioch <karol at babioch.de>
 
 pkgname=libfido2
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 pkgdesc='Library functionality for FIDO 2.0, including communication with a device over USB'
 url='https://developers.yubico.com/libfido2/'
 arch=('x86_64')
@@ -11,14 +11,11 @@
 depends=('glibc' 'openssl' 'libcbor' 'libcbor.so' 'hidapi' 'systemd-libs'  'libudev.so' 'zlib')
 makedepends=('cmake' 'systemd')
 provides=('libfido2.so')
-source=("https://developers.yubico.com/libfido2/Releases/libfido2-${pkgver}.tar.gz"{,.sig}
-        '0001-log-explicit-truncation-to-placate-gcc-gh-318.patch')
-sha512sums=('f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe'
-            'SKIP'
-            'b571a686e0024dc9d42501edc1bf236cf3c2cc92925424524c4017a7ed834215c901c8c1a0868e1d72224040766290c08fc02ea76c743929435112d8c00bfe4e')
-b2sums=('c7ad55d1402808ad12dc999b0ec67161a5fe82dfeaeed362c35f4183144af9bd2771c1e3318a731db46fd8fc21ccd0737024b72c8dd3c754e34625118817742f'
-        'SKIP'
-        'f328b3a5205177f37219a576eebe426ce4322513468aec82fb1ac7d0c7d5712eafcf72550db1203e6b7f5a05d7510167626960e6faf3f2f26b3a5cb35e87b1e4')
+source=("https://developers.yubico.com/libfido2/Releases/libfido2-${pkgver}.tar.gz"{,.sig})
+sha512sums=('dbea52a80068323e9945ef7a6e93ab1438bc4347390fc91694a94669900d4ce4abe95e1b6df90fe8b6b2dde6b5d28d9dc0c6b022c24ccb661f28c30c33417999'
+            'SKIP')
+b2sums=('48ca29fc1b582b4c915ce3dac2b3c24b1c71b144681f77f13059a599eb5e38b263442abecacad495e28a6fea63fc98c142a32939bb49a521b6a6a8d4ad0f1ff0'
+        'SKIP')
 validpgpkeys=(
   'EE90AE0D19774C8386628FAAB428949EF7914718' # pedro martelletto <pedro at yubico.com>
   '1D7308B0055F5AEF36944A8F27A9C24D9588EA0F' # Aveen Ismail <aveen.ismail at yubico.com>
@@ -25,14 +22,6 @@
   '7FBB6186957496D58C751AC20E777DD85755AA4A' # Konstantinos Georgantas <kostas at yubico.com>
 )
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  # log: explicit truncation to placate gcc; gh#318
-  # https://github.com/Yubico/libfido2/pull/319
-  patch -Np1 < ../0001-log-explicit-truncation-to-placate-gcc-gh-318.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   # do not use bundled udev rules superseded by systemd