security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-08-05 14:39:32 +02:00
parent 69e97d909d
commit a69464b0b6
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README
View File

@ -177,16 +177,15 @@
is at [[https://gnupg.org/documentation/manuals/gnupg-devel/]] . 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 GnuPG 2.2 is a current version of GnuPG with state of the art
S/MIME. It has a different design philosophy that splits security design and many more features. To install both versions
functionality up into several modules. Both versions may be alongside, it is suggested to rename the 1.4 version of "gpg" to
installed simultaneously without any conflict (gpg is called gpg2 in "gpg1" as well as the corresponding man page. Newer releases of the
GnuPG 2). In fact, the gpg version from GnuPG 1.4 is able to make 1.4 branch will likely do this by default. In case this is not
use of the gpg-agent as included in GnuPG 2 and allows for seamless possible, the 2.2 version can be installed under the name "gpg2"
passphrase caching. The advantage of GnuPG 1.4 is its smaller size using the configure option --enable-gpg-is-gpg2.
and no dependency on other modules at run and build time.
* HOW TO GET MORE INFORMATION * HOW TO GET MORE INFORMATION

2
build-aux/speedo.mk
View File

@ -476,7 +476,7 @@ speedo_pkg_ntbtls_configure = --enable-static --disable-shared
ifeq ($(TARGETOS),w32) ifeq ($(TARGETOS),w32)
speedo_pkg_gnupg_configure = \ speedo_pkg_gnupg_configure = \
--enable-gpg2-is-gpg --disable-g13 --enable-ntbtls \ --disable-g13 --enable-ntbtls \
--enable-build-timestamp --enable-build-timestamp
else else
speedo_pkg_gnupg_configure = --disable-g13 speedo_pkg_gnupg_configure = --disable-g13

18
configure.ac
View File

@ -208,20 +208,18 @@ show_gnupg_dirmngr_ldap_pgm="(default)"
test -n "$GNUPG_DIRMNGR_LDAP_PGM" \ test -n "$GNUPG_DIRMNGR_LDAP_PGM" \
&& show_gnupg_dirmngr_ldap_pgm="$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 # For a long time gpg 2.x was installed as gpg2. This changed with
# symlink. For correct operation of gpgconf it needs to know the # 2.2. This option can be used to install gpg under the name gpg2.
# 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.
# #
AC_ARG_ENABLE(gpg2-is-gpg, AC_ARG_ENABLE(gpg-is-gpg2,
AC_HELP_STRING([--enable-gpg2-is-gpg],[Set installed name of gpg2 to gpg]), AC_HELP_STRING([--enable-gpg-is-gpg2],[Set installed name of gpg to gpg2]),
gpg2_is_gpg=$enableval) gpg_is_gpg2=$enableval)
if test "$gpg2_is_gpg" != "yes"; then if test "$gpg_is_gpg2" = "yes"; then
AC_DEFINE(USE_GPG2_HACK, 1, [Define to install gpg as gpg2]) AC_DEFINE(USE_GPG2_HACK, 1, [Define to install gpg as gpg2])
fi 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 # SELinux support includes tracking of sensitive files to avoid