Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,24 @@
|
||||
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)
|
||||
@@ -0,0 +1,15 @@
|
||||
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"
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
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])
|
||||
42
deprecated/firmware/buildroot/package/gnupg2/Config.in
Normal file
42
deprecated/firmware/buildroot/package/gnupg2/Config.in
Normal file
@@ -0,0 +1,42 @@
|
||||
comment "gnupg2 needs a toolchain w/ dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_GNUPG2
|
||||
bool "gnupg2"
|
||||
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_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
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
|
||||
to encrypt and sign your data and communication, features a
|
||||
versatile key management system as well as access modules
|
||||
for all kinds of public key directories. GnuPG, also known
|
||||
as GPG, is a command line tool with features for easy
|
||||
integration with other applications.
|
||||
|
||||
http://gnupg.org/
|
||||
|
||||
if BR2_PACKAGE_GNUPG2
|
||||
|
||||
config BR2_PACKAGE_GNUPG2_GPGV2
|
||||
bool "gpgv2"
|
||||
help
|
||||
gpgv2 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
|
||||
smaller than the fully-blown gpg and uses a different (and
|
||||
simpler) way to check that the public keys used to make the
|
||||
signature are valid. There are no configuration files and
|
||||
only a few options are implemented.
|
||||
|
||||
endif
|
||||
2
deprecated/firmware/buildroot/package/gnupg2/gnupg2.hash
Normal file
2
deprecated/firmware/buildroot/package/gnupg2/gnupg2.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# From https://lists.gnu.org/archive/html/info-gnu/2015-09/msg00001.html
|
||||
sha1 87eb0df18f9953675f979405a1af10ab6c5322b3 gnupg-2.0.29.tar.bz2
|
||||
55
deprecated/firmware/buildroot/package/gnupg2/gnupg2.mk
Normal file
55
deprecated/firmware/buildroot/package/gnupg2/gnupg2.mk
Normal file
@@ -0,0 +1,55 @@
|
||||
################################################################################
|
||||
#
|
||||
# gnupg2
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNUPG2_VERSION = 2.0.29
|
||||
GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
|
||||
GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
|
||||
GNUPG2_LICENSE = GPLv3+
|
||||
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_CONF_OPTS = \
|
||||
--disable-rpath --disable-regex --disable-doc \
|
||||
--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
|
||||
|
||||
ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y)
|
||||
define GNUPG2_REMOVE_GPGV2
|
||||
rm -f $(TARGET_DIR)/usr/bin/gpgv2
|
||||
endef
|
||||
GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
GNUPG2_CONF_OPTS += --enable-bzip2 --with-bzip2=$(STAGING_DIR)
|
||||
GNUPG2_DEPENDENCIES += bzip2
|
||||
else
|
||||
GNUPG2_CONF_OPTS += --disable-bzip2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
|
||||
GNUPG2_CONF_OPTS += --enable-ccid-driver
|
||||
GNUPG2_DEPENDENCIES += libusb-compat
|
||||
else
|
||||
GNUPG2_CONF_OPTS += --disable-ccid-driver
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
GNUPG2_CONF_OPTS += --with-readline=$(STAGING_DIR)
|
||||
GNUPG2_DEPENDENCIES += readline
|
||||
else
|
||||
GNUPG2_CONF_OPTS += --without-readline
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user