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

24
bsp/buildroot/package/gnupg2/0001-fix-pth-config-usage.patch
View File

@@ -1,24 +0,0 @@
Fix usage of PTH_CONFIG to work with pthsem
The pthsem re-implement of pth provides a compatibility layer for pth,
but its pth-config script behaves slightly differently than the
original one when reporting the version number. This patch to gnupg2's
configure script adjusts the version checking to support this
difference, since Buildroot uses pth-config from pthsem.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[yann.morin.1998@free.fr: adapt to patch m4 macro for autoreconfiguring]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN gnupg2-2.0.29.orig/m4/gnupg-pth.m4 gnupg2-2.0.29/m4/gnupg-pth.m4
--- gnupg2-2.0.29.orig/m4/gnupg-pth.m4 2015-09-08 14:39:24.000000000 +0200
+++ gnupg2-2.0.29/m4/gnupg-pth.m4 2015-12-16 18:30:54.336513493 +0100
@@ -17,7 +17,7 @@
# Taken and modified from the m4 macros which come with Pth.
AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
[
- _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'`
+ _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]2}'`
_req_version="ifelse([$1],,1.2.0,$1)"
AC_MSG_CHECKING(for PTH - version >= $_req_version)

15
bsp/buildroot/package/gnupg2/0002-missing-include.patch
View File

@@ -1,15 +0,0 @@
tools/watchgnupg: select() is from sys/select.h
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN gnupg2-2.0.29.orig/tools/watchgnupg.c gnupg2-2.0.29/tools/watchgnupg.c
--- gnupg2-2.0.29.orig/tools/watchgnupg.c 2015-09-08 14:39:24.000000000 +0200
+++ gnupg2-2.0.29/tools/watchgnupg.c 2015-12-16 18:17:17.758057787 +0100
@@ -32,6 +32,7 @@
#include <sys/un.h>
#include <fcntl.h>
#include <time.h>
+#include <sys/select.h>
#define PGM "watchgnupg"

39
bsp/buildroot/package/gnupg2/0003-dont-run-tests.patch
View File

@@ -1,39 +0,0 @@
tests: really don't run tests in cross-compilation
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN gnupg2-2.0.29.orig/tests/Makefile.am gnupg2-2.0.29/tests/Makefile.am
--- gnupg2-2.0.29.orig/tests/Makefile.am 2015-09-08 14:39:24.000000000 +0200
+++ gnupg2-2.0.29/tests/Makefile.am 2015-12-16 18:27:55.778227183 +0100
@@ -64,6 +64,7 @@
asschk_SOURCES = asschk.c
+if RUN_GPG_TESTS
all-local: inittests.stamp
clean-local:
@@ -72,4 +73,5 @@
inittests.stamp: inittests
srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests
echo timestamp >./inittests.stamp
+endif # RUN_GPG_TESTS
diff -durN gnupg2-2.0.29.orig/tests/pkits/Makefile.am gnupg2-2.0.29/tests/pkits/Makefile.am
--- gnupg2-2.0.29.orig/tests/pkits/Makefile.am 2015-09-01 08:52:21.000000000 +0200
+++ gnupg2-2.0.29/tests/pkits/Makefile.am 2015-12-16 18:44:06.422655594 +0100
@@ -52,6 +52,7 @@
DISTCLEANFILES = pubring.kbx~ random_seed
+if RUN_GPG_TESTS
all-local: inittests.stamp
clean-local:
@@ -71,5 +72,5 @@
elif test $$? -eq 77; then echo "- SKIP $$tst"; \
fi; \
done
-
+endif # RUN_GPG_TESTS

26
bsp/buildroot/package/gnupg2/0004-silence-git-when-not-in-git-tree.patch
View File

@@ -1,26 +0,0 @@
configure: silence autoreconf when not in a git tree
When autoreconfiguring ourside of a git tree, the output is verbose
with git errors.
Silence that by consigning stderr to oblivion.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN gnupg2-2.0.29.orig/configure.ac gnupg2-2.0.29/configure.ac
--- gnupg2-2.0.29.orig/configure.ac 2015-09-08 14:39:24.000000000 +0200
+++ gnupg2-2.0.29/configure.ac 2015-12-16 18:34:47.099493863 +0100
@@ -33,11 +33,11 @@
# flag indicating a development version (mym4_isgit). Note that the
# m4 processing is done by autoconf and not during the configure run.
m4_define([mym4_revision],
- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
+ m4_esyscmd([git rev-parse --short HEAD 2>/dev/null | tr -d '\n\r']))
m4_define([mym4_revision_dec],
m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
m4_define([mym4_betastring],
- m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long|\
+ m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long 2>/dev/null |\
awk -F- '$3!=0{print"-beta"$3}']))
m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
m4_define([mym4_full_version],[mym4_version[]mym4_betastring])

20
bsp/buildroot/package/gnupg2/Config.in
View File

@@ -1,20 +1,20 @@
comment "gnupg2 needs a toolchain w/ dynamic library"
comment "gnupg2 needs a toolchain w/ threads and dynamic library support"
depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_GNUPG2
bool "gnupg2"
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error
depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth
depends on BR2_USE_MMU # libassuan, libnpth
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LIBGPG_ERROR
select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBASSUAN
select BR2_PACKAGE_LIBKSBA
select BR2_PACKAGE_LIBPTHSEM
select BR2_PACKAGE_LIBPTHSEM_COMPAT
select BR2_PACKAGE_LIBNPTH
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error
depends on BR2_USE_MMU # libassuan
depends on !BR2_STATIC_LIBS
help
GnuPG is the GNU project's complete and free implementation
of the OpenPGP standard as defined by RFC4880. GnuPG allows
@@ -28,10 +28,10 @@ config BR2_PACKAGE_GNUPG2
if BR2_PACKAGE_GNUPG2
config BR2_PACKAGE_GNUPG2_GPGV2
bool "gpgv2"
config BR2_PACKAGE_GNUPG2_GPGV
bool "gpgv"
help
gpgv2 is an OpenPGP signature verification tool.
gpgv is an OpenPGP signature verification tool.
This program is actually a stripped-down version of gpg
which is only able to check signatures. It is somewhat

10
bsp/buildroot/package/gnupg2/gnupg2.hash
View File

@@ -1,4 +1,6 @@
# From https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000385.html
sha1 a9f024588c356a55e2fd413574bfb55b2e18794a gnupg-2.0.30.tar.bz2
# Calculated based on the hash above
sha256 e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71 gnupg-2.0.30.tar.bz2
# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000425.html
sha1 d87553a125832ea90e8aeb3ceeecf24f88de56fb gnupg-2.2.8.tar.bz2
# Calculated based on the hash above and signature
# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.8.tar.bz2.sig
sha256 777b4cb8ced21965a5053d4fa20fe11484f0a478f3d011cef508a1a49db50dcd gnupg-2.2.8.tar.bz2
sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING

45
bsp/buildroot/package/gnupg2/gnupg2.mk
View File

@@ -4,31 +4,27 @@
#
################################################################################
GNUPG2_VERSION = 2.0.30
GNUPG2_VERSION = 2.2.8
GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
GNUPG2_LICENSE = GPLv3+
GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
GNUPG2_LICENSE = GPL-3.0+
GNUPG2_LICENSE_FILES = COPYING
GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libpthsem \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
# Patching configure.ac and m4 macros, as well as Makefile.am
GNUPG2_AUTORECONF = YES
GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
GNUPG2_CONF_OPTS = \
--disable-rpath --disable-regex --disable-doc \
--disable-rpath --disable-regex \
--with-libgpg-error-prefix=$(STAGING_DIR)/usr \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
--with-libassuan-prefix=$(STAGING_DIR)/usr \
--with-ksba-prefix=$(STAGING_DIR)/usr \
--with-pth-prefix=$(STAGING_DIR)/usr
GNUPG2_CONF_ENV = gl_cv_header_working_stdint_h=yes
--with-npth-prefix=$(STAGING_DIR)/usr
ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y)
define GNUPG2_REMOVE_GPGV2
rm -f $(TARGET_DIR)/usr/bin/gpgv2
ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y)
define GNUPG2_REMOVE_GPGV
rm -f $(TARGET_DIR)/usr/bin/gpgv
endef
GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV2
GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)
@@ -38,9 +34,17 @@ else
GNUPG2_CONF_OPTS += --disable-bzip2
endif
ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
ifeq ($(BR2_PACKAGE_GNUTLS),y)
GNUPG2_CONF_OPTS += --enable-gnutls
GNUPG2_DEPENDENCIES += gnutls
else
GNUPG2_CONF_OPTS += --disable-gnutls
endif
ifeq ($(BR2_PACKAGE_LIBUSB),y)
GNUPG2_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/libusb-1.0"
GNUPG2_CONF_OPTS += --enable-ccid-driver
GNUPG2_DEPENDENCIES += libusb-compat
GNUPG2_DEPENDENCIES += libusb
else
GNUPG2_CONF_OPTS += --disable-ccid-driver
endif
@@ -52,4 +56,11 @@ else
GNUPG2_CONF_OPTS += --without-readline
endif
ifeq ($(BR2_PACKAGE_SQLITE),y)
GNUPG2_CONF_OPTS += --enable-sqlite
GNUPG2_DEPENDENCIES += sqlite
else
GNUPG2_CONF_OPTS += --disable-sqlite
endif
$(eval $(autotools-package))