[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta442-25-gc0d1e7f
by Werner Koch
cvs at cvs.gnupg.org
Thu Jun 26 17:37:51 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via c0d1e7fca95629e1cddd7d129fa51b9a6556cb70 (commit)
via 9a034acf8ab6f85c65ccc75a4fd7b8dd47b73e3a (commit)
via 572502bd2c0637429bca547ba882629640477495 (commit)
via c029a184d6a1a96c6de234835fff97d4e946b19c (commit)
via 2480b0253166712a2f20b92f34c8e4c2db0fc26f (commit)
from b5f95c1b566f9530127f3f34e10d120a951cf428 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c0d1e7fca95629e1cddd7d129fa51b9a6556cb70
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 20:25:28 2014 +0200
Enable DNS SRV records again.
* configure.ac (GPGKEYS_HKP, GPGKEYS_FINGER): Remove ac_subst.
(use_dns_srv): Make test work.
diff --git a/configure.ac b/configure.ac
index 309b2bc..8b23179 100644
--- a/configure.ac
+++ b/configure.ac
@@ -735,15 +735,6 @@ fi
# (These need to go after AC_PROG_CC so that $EXEEXT is defined)
AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any])
-if test x"$try_hkp" = xyes ; then
- AC_SUBST(GPGKEYS_HKP,"gpg2keys_hkp$EXEEXT")
-fi
-
-if test x"$try_finger" = xyes ; then
- AC_SUBST(GPGKEYS_FINGER,"gpg2keys_finger$EXEEXT")
-fi
-
-
#
# Checks for libraries.
@@ -925,12 +916,10 @@ AC_CHECK_FUNCS(adns_free)
#
# Now try for the resolver functions so we can use DNS for SRV, PA and CERT.
#
-if test x"$try_hkp" = xyes || test x"$try_http" = xyes ; then
- AC_ARG_ENABLE(dns-srv,
- AC_HELP_STRING([--disable-dns-srv],
- [disable the use of DNS SRV in HKP and HTTP]),
- use_dns_srv=$enableval,use_dns_srv=yes)
-fi
+AC_ARG_ENABLE(dns-srv,
+ AC_HELP_STRING([--disable-dns-srv],
+ [disable the use of DNS SRV in HKP and HTTP]),
+ use_dns_srv=$enableval,use_dns_srv=yes)
AC_ARG_ENABLE(dns-pka,
AC_HELP_STRING([--disable-dns-pka],
commit 9a034acf8ab6f85c65ccc75a4fd7b8dd47b73e3a
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 20:25:28 2014 +0200
agent: Fix export of RSA keys to OpenPGP.
* agent/cvt-openpgp.c (convert_transfer_key): Fix sexp build format
string.
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 1b4c9d5..58327c6 100644
--- a/agent/cvt-openpgp.c
+++ b/agent/cvt-openpgp.c
@@ -192,7 +192,7 @@ convert_transfer_key (gcry_sexp_t *r_key, int pubkey_algo, gcry_mpi_t *skey,
case GCRY_PK_RSA:
err = gcry_sexp_build
(&s_skey, NULL,
- "(protected-private-key(rsa(n%m)(e%m)",
+ "(protected-private-key(rsa(n%m)(e%m)"
"(protected openpgp-native%S)))",
skey[0], skey[1], transfer_key );
break;
commit 572502bd2c0637429bca547ba882629640477495
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 20:25:28 2014 +0200
gpg,gpgsm: Simplify wrong_args function.
diff --git a/g10/gpg.c b/g10/gpg.c
index 47cc851..3614201 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1018,10 +1018,8 @@ build_list (const char *text, char letter,
static void
wrong_args( const char *text)
{
- fputs(_("usage: gpg [options] "),stderr);
- fputs(text,stderr);
- putc('\n',stderr);
- g10_exit(2);
+ fprintf (stderr, _("usage: %s [options] %s\n"), GPG_NAME, text);
+ g10_exit(2);
}
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 92bb806..ded3198 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -636,9 +636,7 @@ set_binary (FILE *fp)
static void
wrong_args (const char *text)
{
- fputs (_("usage: gpgsm [options] "), stderr);
- fputs (text, stderr);
- putc ('\n', stderr);
+ fprintf (stderr, _("usage: %s [options] %s\n"), GPGSM_NAME, text);
gpgsm_exit (2);
}
commit c029a184d6a1a96c6de234835fff97d4e946b19c
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 19:44:28 2014 +0200
speedo: "make clean-gnupg" may not remove the source.
* build-aux/speedo.mk (clean-$(1)): Take care of gnupg.
--
I learned it the hard way and lost a bunch of stashed changes.
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 1ef1600..4f0751f 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -731,11 +731,15 @@ $(stampdir)/stamp-w64-final-$(1): $(stampdir)/stamp-w64-$(1)-03-install
.PHONY : clean-$(1)
clean-$(1):
@echo "speedo: uninstalling $(1)"
- @($(call SETVARS,$(1)); \
- (cd "$$$${pkgbdir}" 2>/dev/null && \
- $(MAKE) --no-print-directory \
- $$$${pkgmkargs_inst} uninstall V=0 ) || true;\
- rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}" || true)
+ @($(call SETVARS,$(1)); \
+ (cd "$$$${pkgbdir}" 2>/dev/null && \
+ $(MAKE) --no-print-directory \
+ $$$${pkgmkargs_inst} uninstall V=0 ) || true ;\
+ if [ "$(1)" = "gnupg" ]; then \
+ rm -fR "$$$${pkgbdir}" || true ;\
+ else \
+ rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}" || true;\
+ fi)
-rm -f $(stampdir)/stamp-final-$(1) $(stampdir)/stamp-$(1)-*
commit 2480b0253166712a2f20b92f34c8e4c2db0fc26f
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 19:26:33 2014 +0200
gpgsm: Fix default config name.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index c813336..92bb806 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1435,7 +1435,8 @@ main ( int argc, char **argv)
configname = NULL;
if (!opt.config_filename)
- opt.config_filename = make_filename (opt.homedir, GPG_NAME EXTSEP_S "conf",
+ opt.config_filename = make_filename (opt.homedir,
+ GPGSM_NAME EXTSEP_S "conf",
NULL);
if (log_get_errorcount(0))
-----------------------------------------------------------------------
Summary of changes:
agent/cvt-openpgp.c | 2 +-
build-aux/speedo.mk | 14 +++++++++-----
configure.ac | 19 ++++---------------
g10/gpg.c | 6 ++----
sm/gpgsm.c | 7 +++----
5 files changed, 19 insertions(+), 29 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list