From a69464b0b6dac88b360a13d3faf19dd7f2a0e02b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 5 Aug 2017 14:39:32 +0200 Subject: [PATCH] gpg: Install gpg by default under the name gpg. * configure.ac: Remove option --enable-gpg2-is-gpg. Add option --enable-gpg-is-gpg2. * build-aux/speedo.mk (speedo_pkg_gnupg_configure): Remove --enable-gpg2-is-gpg. -- Signed-off-by: Werner Koch --- README | 17 ++++++++--------- build-aux/speedo.mk | 2 +- configure.ac | 18 ++++++++---------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/README b/README index aaf347c68..9ade9fde7 100644 --- a/README +++ b/README @@ -177,16 +177,15 @@ is at [[https://gnupg.org/documentation/manuals/gnupg-devel/]] . -* GnuPG 1.4 and GnuPG 2.0 +* Installing GnuPG 2.2. and GnuPG 1.4 - GnuPG 2.0 is a newer version of GnuPG with additional support for - S/MIME. It has a different design philosophy that splits - functionality up into several modules. Both versions may be - installed simultaneously without any conflict (gpg is called gpg2 in - GnuPG 2). In fact, the gpg version from GnuPG 1.4 is able to make - use of the gpg-agent as included in GnuPG 2 and allows for seamless - passphrase caching. The advantage of GnuPG 1.4 is its smaller size - and no dependency on other modules at run and build time. + GnuPG 2.2 is a current version of GnuPG with state of the art + security design and many more features. To install both versions + alongside, it is suggested to rename the 1.4 version of "gpg" to + "gpg1" as well as the corresponding man page. Newer releases of the + 1.4 branch will likely do this by default. In case this is not + possible, the 2.2 version can be installed under the name "gpg2" + using the configure option --enable-gpg-is-gpg2. * HOW TO GET MORE INFORMATION diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index 76f712fec..f1ec6530b 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -476,7 +476,7 @@ speedo_pkg_ntbtls_configure = --enable-static --disable-shared ifeq ($(TARGETOS),w32) speedo_pkg_gnupg_configure = \ - --enable-gpg2-is-gpg --disable-g13 --enable-ntbtls \ + --disable-g13 --enable-ntbtls \ --enable-build-timestamp else speedo_pkg_gnupg_configure = --disable-g13 diff --git a/configure.ac b/configure.ac index 7d502746d..18e6c09bb 100644 --- a/configure.ac +++ b/configure.ac @@ -208,20 +208,18 @@ show_gnupg_dirmngr_ldap_pgm="(default)" test -n "$GNUPG_DIRMNGR_LDAP_PGM" \ && show_gnupg_dirmngr_ldap_pgm="$GNUPG_DIRMNGR_LDAP_PGM" + # -# On some platforms gpg2 is usually installed as gpg without using a -# symlink. For correct operation of gpgconf it needs to know the -# installed name of gpg. This option sets "gpg2"'s installed name to -# just "gpg". Note that it might be required to rename gpg2 to gpg -# manually after the build process. +# For a long time gpg 2.x was installed as gpg2. This changed with +# 2.2. This option can be used to install gpg under the name gpg2. # -AC_ARG_ENABLE(gpg2-is-gpg, - AC_HELP_STRING([--enable-gpg2-is-gpg],[Set installed name of gpg2 to gpg]), - gpg2_is_gpg=$enableval) -if test "$gpg2_is_gpg" != "yes"; then +AC_ARG_ENABLE(gpg-is-gpg2, + AC_HELP_STRING([--enable-gpg-is-gpg2],[Set installed name of gpg to gpg2]), + gpg_is_gpg2=$enableval) +if test "$gpg_is_gpg2" = "yes"; then AC_DEFINE(USE_GPG2_HACK, 1, [Define to install gpg as gpg2]) fi -AM_CONDITIONAL(USE_GPG2_HACK, test "$gpg2_is_gpg" != "yes") +AM_CONDITIONAL(USE_GPG2_HACK, test "$gpg_is_gpg2" = "yes") # SELinux support includes tracking of sensitive files to avoid