* [Buildroot] [PATCH 1/3] gnupg2: switch optional dependency to libusb
@ 2017-09-01 8:34 Baruch Siach
2017-09-01 8:34 ` [Buildroot] [PATCH 2/3] gnupg2: drop non-wchar toolchain workaround Baruch Siach
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Baruch Siach @ 2017-09-01 8:34 UTC (permalink / raw)
To: buildroot
gnupg2 migrated to libusb-1.0 in version 2.1.12.
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/gnupg2/gnupg2.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk
index e5451639fd54..4bf9cfcea5dc 100644
--- a/package/gnupg2/gnupg2.mk
+++ b/package/gnupg2/gnupg2.mk
@@ -42,10 +42,10 @@ else
GNUPG2_CONF_OPTS += --disable-gnutls
endif
-ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
+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
--
2.14.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/3] gnupg2: drop non-wchar toolchain workaround
2017-09-01 8:34 [Buildroot] [PATCH 1/3] gnupg2: switch optional dependency to libusb Baruch Siach
@ 2017-09-01 8:34 ` Baruch Siach
2017-09-01 8:34 ` [Buildroot] [PATCH 3/3] gnupg2: bump to version 2.2.0 Baruch Siach
2017-10-16 21:45 ` [Buildroot] [PATCH 1/3] gnupg2: switch optional dependency to libusb Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Baruch Siach @ 2017-09-01 8:34 UTC (permalink / raw)
To: buildroot
gnupg2 removed gnulib in version 2.1.1. The workaround for non-wchar
toolchains introduced in commit 8a878870958 (gnupg2: fix build on
non-wchar toolchains), is no longer needed.
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Romain Naour <romain.naour@openwide.fr>
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/gnupg2/gnupg2.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk
index 4bf9cfcea5dc..9145f2351dc6 100644
--- a/package/gnupg2/gnupg2.mk
+++ b/package/gnupg2/gnupg2.mk
@@ -19,7 +19,6 @@ GNUPG2_CONF_OPTS = \
--with-libassuan-prefix=$(STAGING_DIR)/usr \
--with-ksba-prefix=$(STAGING_DIR)/usr \
--with-npth-prefix=$(STAGING_DIR)/usr
-GNUPG2_CONF_ENV = gl_cv_header_working_stdint_h=yes
ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y)
define GNUPG2_REMOVE_GPGV2
--
2.14.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] gnupg2: bump to version 2.2.0
2017-09-01 8:34 [Buildroot] [PATCH 1/3] gnupg2: switch optional dependency to libusb Baruch Siach
2017-09-01 8:34 ` [Buildroot] [PATCH 2/3] gnupg2: drop non-wchar toolchain workaround Baruch Siach
@ 2017-09-01 8:34 ` Baruch Siach
2017-10-16 21:45 ` [Buildroot] [PATCH 1/3] gnupg2: switch optional dependency to libusb Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Baruch Siach @ 2017-09-01 8:34 UTC (permalink / raw)
To: buildroot
Switch to https download for firewall compatibility and security.
As upstream now defaults to 'gpg' for the main binary name, keep the
'gpg2' name as in previous releases, to avoid conflict with the gnupg
package.
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/gnupg2/gnupg2.hash | 9 +++++----
package/gnupg2/gnupg2.mk | 6 ++++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash
index 36fa575c7cb0..84152ee4f2c6 100644
--- a/package/gnupg2/gnupg2.hash
+++ b/package/gnupg2/gnupg2.hash
@@ -1,4 +1,5 @@
-# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q2/000405.html
-sha1 1852c066bc21893bc52026ead78edf50fdf15e13 gnupg-2.1.21.tar.bz2
-# Calculated based on the hash above
-sha256 7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd gnupg-2.1.21.tar.bz2
+# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000413.html
+sha1 36ee693d0b2ec529ecf53dd6d397cc38ba71c0a7 gnupg-2.2.0.tar.bz2
+# Calculated based on the hash above and signature
+# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.0.tar.bz2.sig
+sha256 d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6 gnupg-2.2.0.tar.bz2
diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk
index 9145f2351dc6..0466ed633f25 100644
--- a/package/gnupg2/gnupg2.mk
+++ b/package/gnupg2/gnupg2.mk
@@ -4,15 +4,17 @@
#
################################################################################
-GNUPG2_VERSION = 2.1.21
+GNUPG2_VERSION = 2.2.0
GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
-GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
+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 libnpth \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
+# Keep the gpg2 binary name to avoid conflict with gnupg
GNUPG2_CONF_OPTS = \
+ --enable-gpg-is-gpg2 \
--disable-rpath --disable-regex --disable-doc \
--with-libgpg-error-prefix=$(STAGING_DIR)/usr \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
--
2.14.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/3] gnupg2: switch optional dependency to libusb
2017-09-01 8:34 [Buildroot] [PATCH 1/3] gnupg2: switch optional dependency to libusb Baruch Siach
2017-09-01 8:34 ` [Buildroot] [PATCH 2/3] gnupg2: drop non-wchar toolchain workaround Baruch Siach
2017-09-01 8:34 ` [Buildroot] [PATCH 3/3] gnupg2: bump to version 2.2.0 Baruch Siach
@ 2017-10-16 21:45 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2017-10-16 21:45 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> gnupg2 migrated to libusb-1.0 in version 2.1.12.
> Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed to 2017.08.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-16 21:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-01 8:34 [Buildroot] [PATCH 1/3] gnupg2: switch optional dependency to libusb Baruch Siach
2017-09-01 8:34 ` [Buildroot] [PATCH 2/3] gnupg2: drop non-wchar toolchain workaround Baruch Siach
2017-09-01 8:34 ` [Buildroot] [PATCH 3/3] gnupg2: bump to version 2.2.0 Baruch Siach
2017-10-16 21:45 ` [Buildroot] [PATCH 1/3] gnupg2: switch optional dependency to libusb Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.