rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
bsp/buildroot/package/libgpgme/0001-core-Tweak-STATUS_FAILURE-handling.patch Normal file
View File

@@ -0,0 +1,51 @@
From b99502274ae5efdf6df0d967900ec3d1e64373d7 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 12 Apr 2018 20:36:30 +0200
Subject: [PATCH] core: Tweak STATUS_FAILURE handling.
* src/op-support.c (_gpgme_parse_failure): Ignore failures with
location "gpg-exit".
* tests/gpg/t-verify.c (main): Adjust for the now working checking of
the second key.
Signed-off-by: Werner Koch <wk@gnupg.org>
[baruch: drop test]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: commit b99502274ae
src/op-support.c | 10 +++++++++-
tests/gpg/t-verify.c | 8 +++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/op-support.c b/src/op-support.c
index 43cb1c760e0d..e55875f904d0 100644
--- a/src/op-support.c
+++ b/src/op-support.c
@@ -400,7 +400,13 @@ _gpgme_parse_plaintext (char *args, char **filenamep)
/* Parse a FAILURE status line and return the error code. ARGS is
- modified to contain the location part. */
+ * modified to contain the location part. Note that for now we ignore
+ * failure codes with a location of gpg-exit; they are too trouble
+ * some. Instead we should eventually record that error in the
+ * context and provide a function to return a fuller error
+ * description; this could then also show the location of the error
+ * (e.g. "option- parser") to make it easier for the user to detect
+ * the actual error. */
gpgme_error_t
_gpgme_parse_failure (char *args)
{
@@ -418,6 +424,8 @@ _gpgme_parse_failure (char *args)
*where = '\0';
where = args;
+ if (!strcmp (where, "gpg-exit"))
+ return 0;
return atoi (which);
}
--
2.17.0

7
bsp/buildroot/package/libgpgme/libgpgme.hash
View File

@@ -1,2 +1,7 @@
# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q4/000418.html
sha1 77d3390887da25ed70b7ac04392360efbdca501f gpgme-1.10.0.tar.bz2
# Locally calculated after checking pgp signature
sha256 d0abe1449395315eac37e4e45076bbb82732cedf94210937b37776e10cdc2bb6 gpgme-1.7.1.tar.bz2
# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.10.0.tar.bz2.sig
sha256 1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693 gpgme-1.10.0.tar.bz2
# Locally calculated
sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER

14
bsp/buildroot/package/libgpgme/libgpgme.mk
View File

@@ -4,17 +4,16 @@
#
################################################################################
LIBGPGME_VERSION = 1.7.1
LIBGPGME_SITE = ftp://ftp.gnupg.org/gcrypt/gpgme
LIBGPGME_VERSION = 1.10.0
LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme
LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2
LIBGPGME_LICENSE = LGPLv2.1+
LIBGPGME_LICENSE = LGPL-2.1+
LIBGPGME_LICENSE_FILES = COPYING.LESSER
LIBGPGME_INSTALL_STAGING = YES
LIBGPGME_DEPENDENCIES = libassuan libgpg-error
LIBGPGME_LANGUAGE_BINDINGS = cl
# libgpgme, needs to know the gpg binary path on the target.
LIBGPGME_CONF_OPTS = --with-gpg=/usr/bin/gpg \
LIBGPGME_CONF_OPTS = \
--with-gpg-error-prefix=$(STAGING_DIR)/usr \
--with-libassuan-prefix=$(STAGING_DIR)/usr \
--disable-gpgsm-test \
@@ -36,4 +35,9 @@ LIBGPGME_CONF_ENV += LIBS="-largp" ac_cv_type_error_t=yes
LIBGPGME_DEPENDENCIES += argp-standalone
endif
# MIPS N64 (re)introduced getdents64 in kernel version 3.10
ifeq ($(BR2_MIPS_NABI64)x$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10),yx)
LIBGPGME_CONF_OPTS += --disable-linux-getdents
endif
$(eval $(autotools-package))