Skip to contentSkip to conversation

gnupg2: don't preserve the old gpg2 executable name

PATCH New Baruch Siach 2 participants 3 messages Nov 14, 2017 – Nov 27, 2017

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH v2 1/2 gnupg2: don't preserve the old gpg2 executable name

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 <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---
v2: move legacy entry to 2018.02

---
 Config.in.legacy         | 11 +++++++++++
 package/gnupg2/Config.in |  6 +++---
 package/gnupg2/gnupg2.mk | 10 ++++------
 3 files changed, 18 insertions(+), 9 deletions(-)
Config.in.legacy +11 -0
index 35a6d6e1fe74..c8db9fac42e9 100644
@@ -142,6 +142,17 @@ comment "build, or run, in unpredictable ways.               "
 comment "----------------------------------------------------"
 endif
 
+###############################################################################
+comment "Legacy options removed in 2018.02"
+
+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.
+
 ###############################################################################
 comment "Legacy options removed in 2017.11"
package/gnupg2/Config.in +3 -3
index c28708965780..ef1817ef02dc 100644
@@ -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
package/gnupg2/gnupg2.mk +4 -6
index 0466ed633f25..f5fcb15e369b 100644
@@ -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)
Signature · 1 line
2.15.0
author
#1 lore raw

PATCH v2 2/2 gnupg2: bump to version 2.2.2

Cc Vicente Olivert Riera <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---
v2: bump to 2.2.2

---
 package/gnupg2/gnupg2.hash | 8 ++++----
 package/gnupg2/gnupg2.mk   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
package/gnupg2/gnupg2.hash +4 -4
index 84152ee4f2c6..43ce3c632876 100644
@@ -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/2017q4/000416.html
+sha1 efa00fc20295b1cafe467359107ea170258870e2  gnupg-2.2.2.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.2.tar.bz2.sig
+sha256 bfb62c7412ceb3b9422c6c7134a34ff01a560f98eb981c2d96829c1517c08197  gnupg-2.2.2.tar.bz2
package/gnupg2/gnupg2.mk +1 -1
index f5fcb15e369b..baf85e716370 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUPG2_VERSION = 2.2.0
+GNUPG2_VERSION = 2.2.2
 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
 GNUPG2_LICENSE = GPL-3.0+
Signature · 1 line
2.15.0
#2 lore raw

PATCH v2 1/2 gnupg2: don't preserve the old gpg2 executable name

In reply to Baruch Siach

Hello,

Quoted 11 lines · Baruch Siach

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 <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
Quoted 7 lines

---
v2: move legacy entry to 2018.02

---
 Config.in.legacy         | 11 +++++++++++
 package/gnupg2/Config.in |  6 +++---
 package/gnupg2/gnupg2.mk | 10 ++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

Both applied to next. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com