From patchwork Thu Sep 28 19:43:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 819725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y34r85WYCz9sRm for ; Fri, 29 Sep 2017 05:43:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7B29F89E1D; Thu, 28 Sep 2017 19:43:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xKxvHr2ycVPO; Thu, 28 Sep 2017 19:43:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6F0CC89E17; Thu, 28 Sep 2017 19:43:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 34D1F1C0306 for ; Thu, 28 Sep 2017 19:43:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 22F7A88D2D for ; Thu, 28 Sep 2017 19:43:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SiCiwBeFcxmE for ; Thu, 28 Sep 2017 19:43:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3EEF888A6E for ; Thu, 28 Sep 2017 19:43:44 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 151924400D6; Thu, 28 Sep 2017 22:43:24 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Thu, 28 Sep 2017 22:43:33 +0300 Message-Id: <1c0d8419ba2320d55a8522f022ec76db9d813529.1506627814.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.14.2 Cc: Vicente Olivert Riera Subject: [Buildroot] [PATCH 1/2] gnupg2: don't preserve the old gpg2 executable name X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit e82fadab236a (gnupg2: bump to version 2.2.0) added a configure option to keep the old 'gpg2' executable name to avoid conflict with the gnupg package. It turns out that gnupg depends on !BR2_PACKAGE_GNUPG2 since commit 2cadb26e6d4 (gnupg: make gnupg and gnupg2 mutually exclusive). Drop this configure option. Rename the config option that controls the removal of gpgv2, now gpgv, to match the new name. Add legacy config symbol handling. Cc: Vicente Olivert Riera Signed-off-by: Baruch Siach --- Config.in.legacy | 8 ++++++++ package/gnupg2/Config.in | 6 +++--- package/gnupg2/gnupg2.mk | 10 ++++------ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 748876880c36..69cbd04ad53a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2017.11" +config BR2_PACKAGE_GNUPG2_GPGV2 + bool "gnupg2 gpgv2 option removed" + select BR2_LEGACY + select BR2_PACKAGE_GNUPG2_GPGV + help + The gpgv2 executable is now named gpgv. The config option + has been renamed accordingly. + config BR2_PACKAGE_OPENOBEX_BLUEZ bool "openobex bluez option removed" select BR2_LEGACY diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in index c28708965780..ef1817ef02dc 100644 --- a/package/gnupg2/Config.in +++ b/package/gnupg2/Config.in @@ -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 diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 0466ed633f25..f5fcb15e369b 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -12,9 +12,7 @@ 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 \ @@ -22,11 +20,11 @@ GNUPG2_CONF_OPTS = \ --with-ksba-prefix=$(STAGING_DIR)/usr \ --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) From patchwork Thu Sep 28 19:43:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 819726 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y34rF2KWfz9sRm for ; Fri, 29 Sep 2017 05:43:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C20C689E33; Thu, 28 Sep 2017 19:43:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hKJ3FvEnuav2; Thu, 28 Sep 2017 19:43:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BD2D989E25; Thu, 28 Sep 2017 19:43:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 668E91CEC6F for ; Thu, 28 Sep 2017 19:43:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5F3BB88A6E for ; Thu, 28 Sep 2017 19:43:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xoRF-7IKVcKA for ; Thu, 28 Sep 2017 19:43:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4D00788CDE for ; Thu, 28 Sep 2017 19:43:44 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 708084402B3; Thu, 28 Sep 2017 22:43:24 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Thu, 28 Sep 2017 22:43:34 +0300 Message-Id: X-Mailer: git-send-email 2.14.2 In-Reply-To: <1c0d8419ba2320d55a8522f022ec76db9d813529.1506627814.git.baruch@tkos.co.il> References: <1c0d8419ba2320d55a8522f022ec76db9d813529.1506627814.git.baruch@tkos.co.il> Cc: Vicente Olivert Riera Subject: [Buildroot] [PATCH 2/2] gnupg2: bump to version 2.2.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Cc: Vicente Olivert Riera Signed-off-by: Baruch Siach --- package/gnupg2/gnupg2.hash | 8 ++++---- package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index 84152ee4f2c6..77058f63ed14 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000413.html -sha1 36ee693d0b2ec529ecf53dd6d397cc38ba71c0a7 gnupg-2.2.0.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000415.html +sha1 5455373fd7208b787f319027de2464721cdd4413 gnupg-2.2.1.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 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.1.tar.bz2.sig +sha256 34d70cd65b9c95f3f2f90a9f5c1e0b6a0fe039a8d685e2d66d69c33d1cbf62fb gnupg-2.2.1.tar.bz2 diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index f5fcb15e369b..39bdee035e90 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.2.0 +GNUPG2_VERSION = 2.2.1 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+