[Pkg-gnupg-commit] [gnupg2] 05/07: more upstream bugfix and cleanup patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri May 19 00:49:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit dbe07723409ca81e8e4ad86bf95777aa2584fa7a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu May 18 16:38:44 2017 -0400
more upstream bugfix and cleanup patches
---
...ests-Fix-agent-teardown-in-release-builds.patch | 41 +++++++++++
...-gpgscm-Fix-checking-for-opcode-arguments.patch | 30 ++++++++
.../0018-docs-Point-to-https-dev.gnupg.org.patch | 83 ++++++++++++++++++++++
debian/patches/0019-doc-Fix-spellings.patch | 32 +++++++++
debian/patches/series | 4 ++
5 files changed, 190 insertions(+)
diff --git a/debian/patches/0016-tests-Fix-agent-teardown-in-release-builds.patch b/debian/patches/0016-tests-Fix-agent-teardown-in-release-builds.patch
new file mode 100644
index 0000000..2d87f0a
--- /dev/null
+++ b/debian/patches/0016-tests-Fix-agent-teardown-in-release-builds.patch
@@ -0,0 +1,41 @@
+From: Justus Winter <justus at g10code.com>
+Date: Wed, 17 May 2017 12:14:55 +0200
+Subject: tests: Fix agent teardown in release builds.
+
+* tests/openpgp/defs.scm (start-agent,stop-agent): Use gpg-conf which
+will properly use the '--build-prefix' argument to make gpgconf use
+tools from the build directory.
+
+GnuPG-bug-id: 3165
+Fixes-commit: 2c9d9ac55ea455a5ec26428989dced0311ed46cc
+Signed-off-by: Justus Winter <justus at g10code.com>
+(cherry picked from commit 0e1729bb993648deca84a2664ae78edc848d7003)
+---
+ tests/openpgp/defs.scm | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
+index 0cd45ad..a61e6c3 100644
+--- a/tests/openpgp/defs.scm
++++ b/tests/openpgp/defs.scm
+@@ -448,7 +448,7 @@
+ (with-home-directory gnupghome
+ (stop-agent)))))
+ (catch (log "Warning: Creating socket directory failed:" (car *error*))
+- (call-popen `(,(tool 'gpgconf) --create-socketdir) ""))
++ (gpg-conf '--create-socketdir))
+ (call-check `(,(tool 'gpg-connect-agent) --verbose
+ ,(string-append "--agent-program=" (tool 'gpg-agent)
+ "|--debug-quick-random")
+@@ -457,9 +457,9 @@
+ ;; Stop the agent and other daemons and remove the socket dir.
+ (define (stop-agent)
+ (log "Stopping gpg-agent...")
+- (call-check `(,(tool 'gpgconf) --kill all))
++ (gpg-conf '--kill 'all)
+ (catch (log "Warning: Removing socket directory failed.")
+- (call-popen `(,(tool 'gpgconf) --remove-socketdir) "")))
++ (gpg-conf '--remove-socketdir)))
+
+
+ ;; end
diff --git a/debian/patches/0017-gpgscm-Fix-checking-for-opcode-arguments.patch b/debian/patches/0017-gpgscm-Fix-checking-for-opcode-arguments.patch
new file mode 100644
index 0000000..65fa2bc
--- /dev/null
+++ b/debian/patches/0017-gpgscm-Fix-checking-for-opcode-arguments.patch
@@ -0,0 +1,30 @@
+From: Justus Winter <justus at g10code.com>
+Date: Wed, 17 May 2017 16:10:37 +0200
+Subject: gpgscm: Fix checking for opcode arguments.
+
+* tests/gpgscm/scheme.c (Eval_Cycle): Update 'pcd' after dispatching
+an instruction.
+
+Fixes-commit: 9c6407d17e0cb9f4a370b1b83e7816577ec7d29d
+Signed-off-by: Justus Winter <justus at g10code.com>
+(cherry picked from commit aae50e0b6a61549e226e0c7785260ad517f0ffff)
+---
+ tests/gpgscm/scheme.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
+index 26bb5a5..593bc74 100644
+--- a/tests/gpgscm/scheme.c
++++ b/tests/gpgscm/scheme.c
+@@ -3451,9 +3451,10 @@ Eval_Cycle(scheme *sc, enum scheme_opcodes op) {
+ double dd;
+ #endif
+ int (*comp_func)(num, num) = NULL;
+- const struct op_code_info *pcd = &dispatch_table[op];
++ const struct op_code_info *pcd;
+
+ dispatch:
++ pcd = &dispatch_table[op];
+ if (pcd->name[0] != 0) { /* if built-in function, check arguments */
+ char msg[STRBUFFSIZE];
+ if (! check_arguments (sc, pcd, msg, sizeof msg)) {
diff --git a/debian/patches/0018-docs-Point-to-https-dev.gnupg.org.patch b/debian/patches/0018-docs-Point-to-https-dev.gnupg.org.patch
new file mode 100644
index 0000000..b55d26b
--- /dev/null
+++ b/debian/patches/0018-docs-Point-to-https-dev.gnupg.org.patch
@@ -0,0 +1,83 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Thu, 18 May 2017 15:05:57 -0400
+Subject: docs: Point to https://dev.gnupg.org/ .
+
+Replace mentions of bugs.gnupg.org with https://dev.gnupg.org/. Since
+the project has transitioned to a better workflow for supporting
+contributions, we should ensure that our documentation points to the
+right place.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+(cherry picked from commit 705da1eb23aef92c42d6d657b20a0984b104f72f)
+---
+ AUTHORS | 4 ++--
+ README | 2 +-
+ configure.ac | 2 +-
+ doc/gpg.texi | 2 +-
+ tests/fake-pinentries/README.txt | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index ec4b742..fc2ee9b 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -1,8 +1,8 @@
+ Program: GnuPG
+ Homepage: https://www.gnupg.org
+-Download: ftp://ftp.gnupg.org/gcrypt/gnupg/
++Download: https://gnupg.org/ftp/gcrypt/gnupg/
+ Repository: git://git.gnupg.org/gnupg.git
+-Bug reports: https://bugs.gnupg.org
++Bug reports: https://dev.gnupg.org
+ Security related bug reports: <security at gnupg.org>
+ Maintainer: Werner Koch <wk at gnupg.org>
+ License: GPLv3+
+diff --git a/README b/README
+index 8be43d7..e0c5d71 100644
+--- a/README
++++ b/README
+@@ -227,7 +227,7 @@
+ https://www.gnupg.org/documentation/mailing-lists.html for archives
+ of the mailing lists.
+
+- Please direct bug reports to http://bugs.gnupg.org or post them
++ Please direct bug reports to http://dev.gnupg.org or post them
+ direct to the mailing list <gnupg-devel at gnupg.org>.
+
+ Please direct questions about GnuPG to the users mailing list or one
+diff --git a/configure.ac b/configure.ac
+index 4e4272e..cdf3405 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@ m4_define([mym4_version], m4_argn(4, mym4_verslist))
+ m4_define([mym4_revision], m4_argn(7, mym4_verslist))
+ m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
+ m4_esyscmd([echo ]mym4_version[>VERSION])
+-AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
++AC_INIT([mym4_package],[mym4_version], [https://dev.gnupg.org])
+
+ NEED_GPG_ERROR_VERSION=1.24
+
+diff --git a/doc/gpg.texi b/doc/gpg.texi
+index 1a0ea55..fbe6367 100644
+--- a/doc/gpg.texi
++++ b/doc/gpg.texi
+@@ -3777,7 +3777,7 @@ may be recoverable from it later.
+
+ Before you report a bug you should first search the mailing list
+ archives for similar problems and second check whether such a bug has
+-already been reported to our bug tracker at http://bugs.gnupg.org .
++already been reported to our bug tracker at https://dev.gnupg.org .
+
+ @c *******************************************
+ @c *************** **************
+diff --git a/tests/fake-pinentries/README.txt b/tests/fake-pinentries/README.txt
+index 9272ae5..0654f56 100644
+--- a/tests/fake-pinentries/README.txt
++++ b/tests/fake-pinentries/README.txt
+@@ -35,4 +35,4 @@ Troubleshooting
+
+ If you have any trouble with this technique, please drop a line to the
+ GnuPG development mailing list <gnupg-devel at gnupg.org> or open a
+-report on the GnuPG bug tracker at https://bugs.gnupg.org/gnupg
++report on the GnuPG bug tracker at https://dev.gnupg.org/gnupg
diff --git a/debian/patches/0019-doc-Fix-spellings.patch b/debian/patches/0019-doc-Fix-spellings.patch
new file mode 100644
index 0000000..ec98a8f
--- /dev/null
+++ b/debian/patches/0019-doc-Fix-spellings.patch
@@ -0,0 +1,32 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Thu, 18 May 2017 16:34:37 -0400
+Subject: doc: Fix spellings.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+(cherry picked from commit 3713f67026467f63f80649c92ac4cc7973589855)
+---
+ doc/gpg.texi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/gpg.texi b/doc/gpg.texi
+index fbe6367..c128254 100644
+--- a/doc/gpg.texi
++++ b/doc/gpg.texi
+@@ -301,7 +301,7 @@ and other programs.
+ @itemx -K
+ @opindex list-secret-keys
+ List the specified secret keys. If no keys are specified, then all
+-known secret keys are listed. A @code{#} after the intial tags
++known secret keys are listed. A @code{#} after the initial tags
+ @code{sec} or @code{ssb} means that the secret key or subkey is
+ currently not usable. We also say that this key has been taken
+ offline (for example, a primary key can be taken offline by exported
+@@ -1691,7 +1691,7 @@ Set what trust model GnuPG should follow. The models are:
+ @item direct
+ @opindex trust-model:direct
+ Key validity is set directly by the user and not calculated via the
+- Web of Trust. This model is soley based on the key and does
++ Web of Trust. This model is solely based on the key and does
+ not distinguish user IDs. Note that when changing to another trust
+ model the trust values assigned to a key are transformed into
+ ownertrust values, which also indicate how you trust the owner of
diff --git a/debian/patches/series b/debian/patches/series
index 45fcf59..ff2555e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,7 @@ skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-avai
0013-tests-Configure-the-environments-to-use-scdaemon-fro.patch
0014-g10-Suppress-error-for-card-availability-check.patch
0015-g10-Fix-gpgcompose.c.patch
+0016-tests-Fix-agent-teardown-in-release-builds.patch
+0017-gpgscm-Fix-checking-for-opcode-arguments.patch
+0018-docs-Point-to-https-dev.gnupg.org.patch
+0019-doc-Fix-spellings.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list