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

[Christian Hesse]

    Date: Monday, April 5, 2021 @ 21:51:01
  Author: eworm
Revision: 411533

upgpkg: libfido2 1.7.0-1: new upstream release

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

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

Added: 0001-log-explicit-truncation-to-placate-gcc-gh-318.patch
===================================================================
--- 0001-log-explicit-truncation-to-placate-gcc-gh-318.patch	                        (rev 0)
+++ 0001-log-explicit-truncation-to-placate-gcc-gh-318.patch	2021-04-05 21:51:01 UTC (rev 411533)
@@ -0,0 +1,31 @@
+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-04-05 20:12:54 UTC (rev 411532)
+++ PKGBUILD	2021-04-05 21:51:01 UTC (rev 411533)
@@ -2,7 +2,7 @@
 # Contributor: Karol Babioch <karol at babioch.de>
 
 pkgname=libfido2
-pkgver=1.6.0
+pkgver=1.7.0
 pkgrel=1
 pkgdesc='Library functionality for FIDO 2.0, including communication with a device over USB'
 url='https://developers.yubico.com/libfido2/'
@@ -11,11 +11,14 @@
 depends=('glibc' 'openssl' 'libcbor' 'libcbor.so' 'hidapi' 'systemd-libs'  'libudev.so')
 makedepends=('cmake' 'systemd')
 provides=('libfido2.so')
-source=(https://developers.yubico.com/libfido2/Releases/libfido2-${pkgver}.tar.gz{,.sig})
-sha512sums=('c473732a2f7ef54156097d315e44457d89056446ab3112a7c7a6fd99d5c2c8ae0ca2451ff9cd45be6c32de1ab335d6dfdb2b0c56b40cae9eb41391d18d83be4a'
-            'SKIP')
-b2sums=('59444cc9e32b5d9f2a0f9138fe4f3ad644865e1f7f24f50bbace262308aa7c10b58aa0e890a3493e8fd102468e26947f7fc0864b5d7a1e185e40ad730064db8e'
-        'SKIP')
+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')
 validpgpkeys=(
   'EE90AE0D19774C8386628FAAB428949EF7914718' # pedro martelletto <pedro at yubico.com>
   '1D7308B0055F5AEF36944A8F27A9C24D9588EA0F' # Aveen Ismail <aveen.ismail at yubico.com>
@@ -22,6 +25,14 @@
   '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