Support GnuPG

"the way that + I most often communicate with people who are in need + around the + world." · back

-  git clone https://git.gnupg.org/foo.git
+  git clone https://dev.gnupg.org/source/foo.git
 

-----------------------------------------------------------------------

Summary of changes:
 misc/git.gnupg.org/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Mon May  8 15:59:14 2017
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Mon, 08 May 2017 15:59:14 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. e85064eb86522a0a5a635f1c4e48b62bcabd8a6b
Message-ID: 

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 GnuPG website and other docs".

The branch, master has been updated
       via  e85064eb86522a0a5a635f1c4e48b62bcabd8a6b (commit)
      from  c253cb3fca4d37df3002184367183fa8c010d63f (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 e85064eb86522a0a5a635f1c4e48b62bcabd8a6b
Author: Justus Winter 
Date:   Mon May 8 15:59:08 2017 +0200

    jenkins: include local bin directory in PATH

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index eb17834..17e561a 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -30,6 +30,11 @@ if ccache --version >/dev/null; then
     export CXX="ccache ${CXX:-g++}"
 fi
 
+# Include local bin directory in PATH.
+if [ -e "$HOME/bin" ]; then
+    export PATH="$HOME/bin:$PATH"
+fi
+
 # Setup important envars
 PREFIX=$HOME/prefix/$XTARGET
 ORIGINAL_PREFIX=$HOME/prefix/$XTARGET

-----------------------------------------------------------------------

Summary of changes:
 misc/jenkins/bin/build.bash | 5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Mon May  8 16:47:41 2017
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Mon, 08 May 2017 16:47:41 +0200
Subject: [git] gnupg-doc - branch, master,
 updated. 0a6069b00f02aa63adf284bfa9dd1148cd12fc5e
Message-ID: 

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 GnuPG website and other docs".

The branch, master has been updated
       via  0a6069b00f02aa63adf284bfa9dd1148cd12fc5e (commit)
      from  e85064eb86522a0a5a635f1c4e48b62bcabd8a6b (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 0a6069b00f02aa63adf284bfa9dd1148cd12fc5e
Author: Justus Winter 
Date:   Mon May 8 16:47:36 2017 +0200

    jenkins: add PREFIX/bin to the test environment

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index 17e561a..2390fb6 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -193,6 +193,9 @@ esac
 #
 # KCAHKCAHKCAH
 
+# And add $PREFIX/bin to PATH for the tests.
+test_environment="$test_environment PATH=$ORIGINAL_PREFIX/bin:$PATH"
+
 # We build on the "obj" subdir.
 abs_configure="$(pwd)/configure"
 mkdir -p obj

-----------------------------------------------------------------------

Summary of changes:
 misc/jenkins/bin/build.bash | 3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed May 10 04:14:32 2017
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Wed, 10 May 2017 04:14:32 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.20-114-g0ce94a9
Message-ID: 

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  0ce94a9698104d9bfc73d5a37478189564c96eb4 (commit)
       via  98b759119c81c5b39f34f8a9a7b6a57e91ad6470 (commit)
      from  22739433e98be80e46fe7d01d52a9627c1aebaae (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 0ce94a9698104d9bfc73d5a37478189564c96eb4
Author: NIIBE Yutaka 
Date:   Wed May 10 11:01:15 2017 +0900

    g10, sm, dirmngr, common: Add comment for fall through.
    
    * common/b64dec.c (b64dec_proc): Comment to clarify.
    * dirmngr/cdblib.c (cdb_make_put): Use same pattern to clarify.
    * dirmngr/dirmngr-client.c (read_pem_certificate): Likewise.
    * dirmngr/ks-engine-hkp.c (ks_hkp_get): Likewise.
    * g10/armor.c (unarmor_pump): Likewise.
    * g10/gpg.c (main): Likewise.
    * g10/import.c (read_block): Likewise.
    * g10/keygen.c (make_backsig): Likewise.
    * g10/pkclist.c (check_signatures_trust):  Likewise.
    * sm/gpgsm.c (main): Likewise.
    
    Signed-off-by: NIIBE Yutaka 

diff --git a/common/b64dec.c b/common/b64dec.c
index 74cf933..6af494b 100644
--- a/common/b64dec.c
+++ b/common/b64dec.c
@@ -118,6 +118,7 @@ b64dec_proc (struct b64state *state, void *buffer, size_t length,
           break;
         case s_init:
           ds = s_lfseen;
+          /* fall through */
         case s_lfseen:
           if (*s != "-----BEGIN "[pos])
             {
diff --git a/dirmngr/cdblib.c b/dirmngr/cdblib.c
index c04690f..827399f 100644
--- a/dirmngr/cdblib.c
+++ b/dirmngr/cdblib.c
@@ -617,7 +617,7 @@ cdb_make_put(struct cdb_make *cdbmp,
 	else
 	  r = 1;
       }
-      /* fall */
+      /* fall through */
 
     case CDB_PUT_ADD:
       rl = cdbmp->cdb_rec[hval&255];
diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c
index c1ff635..4dc64bf 100644
--- a/dirmngr/dirmngr-client.c
+++ b/dirmngr/dirmngr-client.c
@@ -517,7 +517,7 @@ read_pem_certificate (const char *fname, unsigned char **rbuf, size_t *rbuflen)
             }
           break;
         case s_init:
-          state = s_lfseen;
+          state = s_lfseen; /* fall through */
         case s_lfseen:
           if (c != "-----BEGIN "[pos])
             state = s_idle;
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index 1592fab..ddb8549 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -1515,6 +1515,7 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp)
 
     case KEYDB_SEARCH_MODE_FPR16:
       log_error ("HKP keyservers do not support v3 fingerprints\n");
+      /* fall through */
     default:
       return gpg_error (GPG_ERR_INV_USER_ID);
     }
diff --git a/g10/armor.c b/g10/armor.c
index 7fb9a89..cc80968 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -1440,7 +1440,7 @@ unarmor_pump (UnarmorPump x, int c)
         break;
       case STA_first_dash: /* just need for initialization */
         x->pos = 0;
-        x->state = STA_compare_header;
+        x->state = STA_compare_header; /* fall through */
       case STA_compare_header:
         if ( "-----BEGIN PGP SIGNATURE-----"[++x->pos] == c ) {
             if ( x->pos == 28 )
@@ -1521,7 +1521,7 @@ unarmor_pump (UnarmorPump x, int c)
         /* assume that we are at the next line */
         x->state = STA_read_crc;
         x->pos = 0;
-        x->mycrc = 0;
+        x->mycrc = 0; /* fall through */
       case STA_read_crc:
         if( (c = asctobin[c]) == 255 ) {
             rval = -1; /* ready */
diff --git a/g10/gpg.c b/g10/gpg.c
index ecddb20..80e5197 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -4303,9 +4303,9 @@ main (int argc, char **argv)
 	break;
 
       case aCheckKeys:
-	opt.check_sigs = 1;
+	opt.check_sigs = 1; /* fall through */
       case aListSigs:
-	opt.list_sigs = 1;
+	opt.list_sigs = 1; /* fall through */
       case aListKeys:
 	sl = NULL;
 	for( ; argc; argc--, argv++ )
@@ -4468,7 +4468,7 @@ main (int argc, char **argv)
 	break;
 
       case aFastImport:
-        opt.import_options |= IMPORT_FAST;
+        opt.import_options |= IMPORT_FAST; /* fall through */
       case aImport:
 	import_keys (ctrl, argc? argv:NULL, argc, NULL, opt.import_options);
 	break;
@@ -4930,7 +4930,7 @@ main (int argc, char **argv)
         if (!opt.quiet)
           log_info (_("WARNING: no command supplied."
                       "  Trying to guess what you mean ...\n"));
-        /*FALLTHU*/
+        /*FALLTHRU*/
       case aListPackets:
 	if( argc > 1 )
 	    wrong_args("[filename]");
diff --git a/g10/import.c b/g10/import.c
index a942c2e..d9d658b 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -868,7 +868,7 @@ read_block( IOBUF a, int with_meta,
 		pkt = NULL;
 		goto ready;
               }
-	    in_cert = 1;
+	    in_cert = 1; /* fall through */
 	  default:
           x_default:
 	    if (in_cert && valid_keyblock_packet (pkt->pkttype))
diff --git a/g10/keygen.c b/g10/keygen.c
index 2db37bf..0dfed63 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -910,10 +910,10 @@ make_backsig (ctrl_t ctrl, PKT_signature *sig, PKT_public_key *pk,
 		case 2:
 		  pktlen  = (size_t)buf[mark++] << 24;
 		  pktlen |= buf[mark++] << 16;
-
+		  /* fall through */
 		case 1:
 		  pktlen |= buf[mark++] << 8;
-
+		  /* fall through */
 		case 0:
 		  pktlen |= buf[mark++];
 		}
diff --git a/g10/pkclist.c b/g10/pkclist.c
index e65da25..ab024d9 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -632,7 +632,7 @@ check_signatures_trust (ctrl_t ctrl, PKT_signature *sig)
               log_info (_("trustlevel adjusted to FULL"
                           " due to valid PKA info\n"));
             }
-          /* (fall through) */
+          /* fall through */
         case TRUST_FULLY:
           if (!okay)
             {
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index bcf479a..cb181e8 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1855,7 +1855,7 @@ main ( int argc, char **argv)
 
     case aListChain:
     case aDumpChain:
-       ctrl.with_chain = 1;
+       ctrl.with_chain = 1; /* fall through */
     case aListKeys:
     case aDumpKeys:
     case aListExternalKeys:

commit 98b759119c81c5b39f34f8a9a7b6a57e91ad6470
Author: NIIBE Yutaka 
Date:   Wed May 10 10:58:31 2017 +0900

    g10: Stop compiler warning for t-stutter.
    
    * g10/t-stutter.c (do_test): Refer current_test_group_failed.
    
    --
    
    Since this test does not follow the framework of TEST/TEST_P/ABORT,
    the variable is not used.
    
    Signed-off-by: NIIBE Yutaka 

diff --git a/g10/t-stutter.c b/g10/t-stutter.c
index 8fe242d..503a920 100644
--- a/g10/t-stutter.c
+++ b/g10/t-stutter.c
@@ -381,6 +381,7 @@ do_test (int argc, char *argv[])
   byte *raw_data;
   int raw_data_len;
 
+  (void)current_test_group_failed;
   for (i = 1; i < argc; i ++)
     {
       if (strcmp (argv[i], "--debug") == 0)

-----------------------------------------------------------------------

Summary of changes:
 common/b64dec.c          | 1 +
 dirmngr/cdblib.c         | 2 +-
 dirmngr/dirmngr-client.c | 2 +-
 dirmngr/ks-engine-hkp.c  | 1 +
 g10/armor.c              | 4 ++--
 g10/gpg.c                | 8 ++++----
 g10/import.c             | 2 +-
 g10/keygen.c             | 4 ++--
 g10/pkclist.c            | 2 +-
 g10/t-stutter.c          | 1 +
 sm/gpgsm.c               | 2 +-
 11 files changed, 16 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed May 10 05:18:00 2017
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Wed, 10 May 2017 05:18:00 +0200
Subject: [git] GnuPG - branch, master, updated. gnupg-2.1.20-115-g70ee7cd
Message-ID: 

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  70ee7cd11b70694edb800da738c3423b3f1ff295 (commit)
      from  0ce94a9698104d9bfc73d5a37478189564c96eb4 (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 70ee7cd11b70694edb800da738c3423b3f1ff295
Author: NIIBE Yutaka 
Date:   Wed May 10 12:15:23 2017 +0900

    Register DCO for Ineiev.
    
    --
    
    Real name is confirmed by private mail.
    
    Signed-off-by: NIIBE Yutaka 

diff --git a/AUTHORS b/AUTHORS
index 8f1e27b..ec4b742 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -180,6 +180,9 @@ Daniel Kahn Gillmor 
 Hans of Guardian 
 2013-06-26:D84473D7-F3F7-43D5-A9CE-16580B88D574 at guardianproject.info:
 
+Ineiev 
+2017-05-09:20170509121611.GH25850 at gnu.org:
+
 Jonas Borgstr?m 
 2013-08-29:521F1E7A.5080602 at borgstrom.se:
 

-----------------------------------------------------------------------

Summary of changes:
 AUTHORS | 3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed May 10 07:20:07 2017
From: cvs at cvs.gnupg.org (by Ineiev)
Date: Wed, 10 May 2017 07:20:07 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-1-4,
 updated. gnupg-1.4.21-6-g2c2121f
Message-ID: 

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, STABLE-BRANCH-1-4 has been updated
       via  2c2121ff3c2b90f21b75dd56c981b4d9e6d1c0e2 (commit)
      from  bb61191aad98c3dbb487c1f76dd1552d44a52fe3 (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 2c2121ff3c2b90f21b75dd56c981b4d9e6d1c0e2
Author: Ineiev 
Date:   Thu Apr 14 15:42:25 2016 +0000

    g10: Fix secmem leak.
    
    * g10/keygen.c (proc_parameter_file): Fix secmem leak.
    
    --
    
    proc_parameter_file adds certain parameters to the list in the PARA
    argument; however, these new entries are leaked because they
    are added to head, while the PARA list is released by the caller
    of proc_parameter_file.
    
    GnuPG-bug-id: 1371
    Signed-off-by: Ineiev 

diff --git a/g10/keygen.c b/g10/keygen.c
index 268fce5..dc6696a 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2329,8 +2329,8 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
       r = xmalloc_clear(sizeof(*r));
       r->key = pKEYUSAGE;
       r->u.usage = openpgp_pk_algo_usage(algo);
-      r->next = para;
-      para = r;
+      r->next = para->next;
+      para->next = r;
     }
   else if (err == -1)
     return -1;
@@ -2363,8 +2363,8 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
 	  r = xmalloc_clear (sizeof(*r));
 	  r->key = pSUBKEYUSAGE;
 	  r->u.usage = openpgp_pk_algo_usage (algo);
-	  r->next = para;
-	  para = r;
+	  r->next = para->next;
+	  para->next = r;
 	}
       else if (err == -1)
 	return -1;
@@ -2400,8 +2400,8 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
 	    p = stpcpy(stpcpy(stpcpy(p," ("), s2 ),")");
 	  if( s3 )
 	    p = stpcpy(stpcpy(stpcpy(p," <"), s3 ),">");
-	  r->next = para;
-	  para = r;
+	  r->next = para->next;
+	  para->next = r;
 	  have_user_id=1;
 	}
     }
@@ -2460,13 +2460,13 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
     r = xmalloc_clear( sizeof *r );
     r->key = pPASSPHRASE_S2K;
     r->u.s2k = s2k;
-    r->next = para;
-    para = r;
+    r->next = para->next;
+    para->next = r;
     r = xmalloc_clear( sizeof *r );
     r->key = pPASSPHRASE_DEK;
     r->u.dek = dek;
-    r->next = para;
-    para = r;
+    r->next = para->next;
+    para->next = r;
   }
 
   /* Make KEYCREATIONDATE from Creation-Date.  */
@@ -2504,8 +2504,8 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
       r = xmalloc_clear( sizeof *r + 20 );
       r->key = pSUBKEYEXPIRE;
       r->u.expire = seconds;
-      r->next = para;
-      para = r;
+      r->next = para->next;
+      para->next = r;
     }
 
   if( !!outctrl->pub.newfname ^ !!outctrl->sec.newfname ) {

-----------------------------------------------------------------------

Summary of changes:
 g10/keygen.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed May 10 10:26:38 2017
From: cvs at cvs.gnupg.org (by Andre Heinecke)
Date: Wed, 10 May 2017 10:26:38 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.9.0-34-g5e27bf9
Message-ID: 

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 "GnuPG Made Easy".

The branch, master has been updated
       via  5e27bf98b4c48cf6a239bcc94b7b67515ff339e7 (commit)
       via  cc2ef3d07c0d261bb9e8e8c0f2706e1a08e4ec53 (commit)
       via  b56f398eff4e3e70dea714c3174a5512dd9bcf33 (commit)
       via  df4eb611e33dcab7bebf07b13734c7db7ccf40da (commit)
      from  28734240e2a2ce67b64df55364f35e1648376311 (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 5e27bf98b4c48cf6a239bcc94b7b67515ff339e7
Author: Andre Heinecke 
Date:   Wed May 10 10:24:18 2017 +0200

    qt: Add a missing include 
    
    * lang/qt/src/qgpgmenewcryptoconfig.cpp: Include functional.
    
    --
    This is intended to fix compilation against the c++ stdlib from
    Gentoo / GCC 7.
    
    Patch provided by Martin V?th.
    GnuPG-Bug-Id: T3151

diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
index d413126..ba028a9 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
@@ -49,6 +49,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 

commit cc2ef3d07c0d261bb9e8e8c0f2706e1a08e4ec53
Author: Andre Heinecke 
Date:   Wed May 10 10:22:23 2017 +0200

    qt: Undeprecate API that I find useful
    
    * lang/qt/src/decryptjob.h,
    lang/qt/src/decryptverifyjob.h,
    lang/qt/src/signencryptjob.h,
    lang/qt/src/verifydetachedjob.h,
    lang/qt/src/verifyopaquejob.h: Undeprecate ByteArray based API.
    
    --
    While an IODevice may be more performant the ByteArray API is
    a very easy way to get started with QGpgME as it allows you
    basically to encrypt / decrypt any QString.
    
    This also fixes a ton of deprecation warnings in KDE where this
    API is used all over the place.

diff --git a/lang/qt/src/decryptjob.h b/lang/qt/src/decryptjob.h
index 11584db..7753e18 100644
--- a/lang/qt/src/decryptjob.h
+++ b/lang/qt/src/decryptjob.h
@@ -76,7 +76,7 @@ public:
        Starts the decryption operation. \a cipherText is the data to
        decrypt.
     */
-    virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const QByteArray &cipherText) = 0;
+    virtual GpgME::Error start(const QByteArray &cipherText) = 0;
 
     /*!
       \overload
diff --git a/lang/qt/src/decryptverifyjob.h b/lang/qt/src/decryptverifyjob.h
index c3fcf02..e5c4346 100644
--- a/lang/qt/src/decryptverifyjob.h
+++ b/lang/qt/src/decryptverifyjob.h
@@ -77,7 +77,7 @@ public:
        Starts the combined decryption and verification operation.
        \a cipherText is the data to decrypt and later verify.
     */
-    virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const QByteArray &cipherText) = 0;
+    virtual GpgME::Error start(const QByteArray &cipherText) = 0;
 
     /*!
       \overload
diff --git a/lang/qt/src/signencryptjob.h b/lang/qt/src/signencryptjob.h
index 86e0a9d..61ab5c6 100644
--- a/lang/qt/src/signencryptjob.h
+++ b/lang/qt/src/signencryptjob.h
@@ -95,7 +95,7 @@ public:
        \em recipient keys will not be performed, but full validity
        assumed for all \em recipient keys without further checks.
     */
-    virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const std::vector &signers,
+    virtual GpgME::Error start(const std::vector &signers,
             const std::vector &recipients,
             const QByteArray &plainText,
             bool alwaysTrust = false) = 0;
diff --git a/lang/qt/src/verifydetachedjob.h b/lang/qt/src/verifydetachedjob.h
index a9b7cf4..2293f3a 100644
--- a/lang/qt/src/verifydetachedjob.h
+++ b/lang/qt/src/verifydetachedjob.h
@@ -78,7 +78,7 @@ public:
        signature data, while \a signedData contains the data over
        which the signature was made.
     */
-    virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const QByteArray &signature,
+    virtual GpgME::Error start(const QByteArray &signature,
             const QByteArray &signedData) = 0;
 
     /*!
diff --git a/lang/qt/src/verifyopaquejob.h b/lang/qt/src/verifyopaquejob.h
index 0ff8582..bfa34e9 100644
--- a/lang/qt/src/verifyopaquejob.h
+++ b/lang/qt/src/verifyopaquejob.h
@@ -77,7 +77,7 @@ public:
        signature data, while \a signedData contains the data over
        which the signature was made.
     */
-    virtual QGPGME_DEPRECATED_EXPORT GpgME::Error start(const QByteArray &signedData) = 0;
+    virtual GpgME::Error start(const QByteArray &signedData) = 0;
 
     /*!
       \overload

commit b56f398eff4e3e70dea714c3174a5512dd9bcf33
Author: Andre Heinecke 
Date:   Wed May 10 10:18:41 2017 +0200

    qt, tests: Don't use internal API
    
    * lang/qt/tests/t-encrypt.cpp, lang/qt/tests/t-tofuinfo.cpp:
    Only use exported API.
    
    --
    With the Job::Context hack we no longer need to use internal API.

diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp
index 65fe735..5bd472a 100644
--- a/lang/qt/tests/t-encrypt.cpp
+++ b/lang/qt/tests/t-encrypt.cpp
@@ -42,10 +42,10 @@
 #include "encryptjob.h"
 #include "signencryptjob.h"
 #include "signingresult.h"
-#include "qgpgmeencryptjob.h"
+#include "encryptjob.h"
 #include "encryptionresult.h"
 #include "decryptionresult.h"
-#include "qgpgmedecryptjob.h"
+#include "decryptjob.h"
 #include "qgpgmebackend.h"
 #include "keylistresult.h"
 #include "engineinfo.h"
@@ -106,11 +106,11 @@ private Q_SLOTS:
         if (!decryptSupported()) {
             return;
         }
-        auto ctx = Context::createForProtocol(OpenPGP);
+        auto decJob = openpgp()->decryptJob();
+        auto ctx = Job::context(decJob);
         TestPassphraseProvider provider;
         ctx->setPassphraseProvider(&provider);
         ctx->setPinentryMode(Context::PinentryLoopback);
-        auto decJob = new QGpgMEDecryptJob(ctx);
         QByteArray plainText;
         auto decResult = decJob->exec(cipherText, plainText);
         QVERIFY(!decResult.error());
@@ -177,13 +177,13 @@ private Q_SLOTS:
         if (!decryptSupported()) {
             return;
         }
-        auto ctx = Context::createForProtocol(OpenPGP);
+        auto job = openpgp()->encryptJob();
+        auto ctx = Job::context(job);
         TestPassphraseProvider provider;
         ctx->setPassphraseProvider(&provider);
         ctx->setPinentryMode(Context::PinentryLoopback);
         ctx->setArmor(true);
         ctx->setTextMode(true);
-        auto job = new QGpgMEEncryptJob(ctx);
         QByteArray cipherText;
         auto result = job->exec(std::vector(), QStringLiteral("Hello symmetric World").toUtf8(), Context::AlwaysTrust, cipherText);
         delete job;
@@ -193,10 +193,10 @@ private Q_SLOTS:
 
         killAgent(mDir.path());
 
-        auto ctx2 = Context::createForProtocol(OpenPGP);
+        auto decJob = openpgp()->decryptJob();
+        auto ctx2 = Job::context(decJob);
         ctx2->setPassphraseProvider(&provider);
         ctx2->setPinentryMode(Context::PinentryLoopback);
-        auto decJob = new QGpgMEDecryptJob(ctx2);
         QByteArray plainText;
         auto decResult = decJob->exec(cipherText, plainText);
         QVERIFY(!result.error());
@@ -238,13 +238,14 @@ private Q_SLOTS:
         if (!decryptSupported()) {
             return;
         }
-        auto ctx = Context::createForProtocol(OpenPGP);
+
+        auto decJob = openpgp()->decryptJob();
+        auto ctx = Job::context(decJob);
         TestPassphraseProvider provider;
         ctx->setPassphraseProvider(&provider);
         ctx->setPinentryMode(Context::PinentryLoopback);
         ctx->setDecryptionFlags(Context::DecryptUnwrap);
 
-        auto decJob = new QGpgMEDecryptJob(ctx);
         QByteArray plainText;
         auto decResult = decJob->exec(cipherText, plainText);
 
@@ -282,12 +283,12 @@ private:
         QVERIFY(keys.size() == 1);
         delete listjob;
 
-        auto ctx = Context::createForProtocol(OpenPGP);
+        auto job = openpgp()->encryptJob();
+        auto ctx = Job::context(job);
         ctx->setPassphraseProvider(new TestPassphraseProvider);
         ctx->setPinentryMode(Context::PinentryLoopback);
         ctx->setArmor(true);
         ctx->setTextMode(true);
-        auto job = new QGpgMEEncryptJob(ctx);
         QByteArray cipherText;
         printf("Before exec, flags: %x\n", Context::Symmetric | Context::AlwaysTrust);
         auto result = job->exec(keys, QStringLiteral("Hello symmetric World").toUtf8(),
@@ -310,11 +311,11 @@ private:
         agentConf.write("allow-loopback-pinentry");
         agentConf.close();
 
-        auto ctx2 = Context::createForProtocol(OpenPGP);
+        auto decJob = openpgp()->decryptJob();
+        auto ctx2 = Job::context(decJob);
         ctx2->setPassphraseProvider(new TestPassphraseProvider);
         ctx2->setPinentryMode(Context::PinentryLoopback);
         ctx2->setTextMode(true);
-        auto decJob = new QGpgMEDecryptJob(ctx2);
         QByteArray plainText;
         auto decResult = decJob->exec(cipherText, plainText);
         QVERIFY(!decResult.error());
diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp
index 926728d..b716102 100644
--- a/lang/qt/tests/t-tofuinfo.cpp
+++ b/lang/qt/tests/t-tofuinfo.cpp
@@ -48,10 +48,11 @@
 #include "importresult.h"
 #include "keylistjob.h"
 #include "keylistresult.h"
-#include "qgpgmesignjob.h"
+#include "signjob.h"
 #include "key.h"
 #include "t-support.h"
 #include "engineinfo.h"
+#include "context.h"
 #include 
 
 using namespace QGpgME;
@@ -151,11 +152,11 @@ private:
 
     void signAndVerify(const QString &what, const GpgME::Key &key, int expected)
     {
-        Context *ctx = Context::createForProtocol(OpenPGP);
+        auto job = openpgp()->signJob();
+        auto ctx = Job::context(job);
         TestPassphraseProvider provider;
         ctx->setPassphraseProvider(&provider);
         ctx->setPinentryMode(Context::PinentryLoopback);
-        auto *job = new QGpgMESignJob(ctx);
 
         std::vector keys;
         keys.push_back(key);

commit df4eb611e33dcab7bebf07b13734c7db7ccf40da
Author: Andre Heinecke 
Date:   Wed Apr 5 18:23:48 2017 +0200

    core: Don't split gpgconf strings on comma
    
    * src/engine-gpgconf.c (gpgconf_parse_option): Don't split
    strings on comma.
    
    --
    This only affects values where the main type is string. Values
    with the alt_type string but another main type are still split
    to keep lists (e.g. groups) working.

diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index 6f7c8ac..af5f110 100644
--- a/src/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
@@ -399,7 +399,7 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
 		      gpgme_conf_arg_t *arg_p, char *line)
 {
   gpgme_error_t err;
-  char *mark;
+  char *mark = NULL;
 
   if (!line[0])
     return 0;
@@ -408,7 +408,8 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
     {
       gpgme_conf_arg_t arg;
 
-      mark = strchr (line, ',');
+      if (opt->type != GPGME_CONF_STRING)
+        mark = strchr (line, ',');
       if (mark)
 	*mark = '\0';
 

-----------------------------------------------------------------------

Summary of changes:
 lang/qt/src/decryptjob.h              |  2 +-
 lang/qt/src/decryptverifyjob.h        |  2 +-
 lang/qt/src/qgpgmenewcryptoconfig.cpp |  1 +
 lang/qt/src/signencryptjob.h          |  2 +-
 lang/qt/src/verifydetachedjob.h       |  2 +-
 lang/qt/src/verifyopaquejob.h         |  2 +-
 lang/qt/tests/t-encrypt.cpp           | 29 +++++++++++++++--------------
 lang/qt/tests/t-tofuinfo.cpp          |  7 ++++---
 src/engine-gpgconf.c                  |  5 +++--
 9 files changed, 28 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed May 10 14:45:04 2017
From: cvs at cvs.gnupg.org (by Kai Michaelis)
Date: Wed, 10 May 2017 14:45:04 +0200
Subject: [git] gnupg-doc - branch, preview,
 updated. c4d9b1a8841c80e7d9c4c23b52f46e95ba4f7f7e
Message-ID: 

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 GnuPG website and other docs".

The branch, preview has been updated
       via  c4d9b1a8841c80e7d9c4c23b52f46e95ba4f7f7e (commit)
      from  dc2082d1e6da874f3170a4b6e2176dd049185bf9 (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 c4d9b1a8841c80e7d9c4c23b52f46e95ba4f7f7e
Author: Kai Michaelis 
Date:   Wed May 10 14:46:49 2017 +0200

    new donate html

diff --git a/web/donate/donate.org b/web/donate/donate.org
index f645796..1222b08 100644
--- a/web/donate/donate.org
+++ b/web/donate/donate.org
@@ -10,146 +10,325 @@
   
 
 
-
-
-
-  
-
-  
-   
-   Keep this field clear:
-                 
-   
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-   
-    
-      
-      
-   
-   
-     
-     
-   
-   
-     
-     
-   
-   
-   
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-   How much do you want to donate?

-          (choosing ?other? allows
-          to donate in other currencies)
Amount: 
-          500 EUR
-          200 EUR
-          100 EUR
-          50 EUR
-          20 EUR
-          5 EUR
-      

-          other:
-          
-          
-          
-      
Recurring: 
-          
-      
 
Pay using: 
-        Credit Card
-        
-      

-       PayPal
-     

-       SEPA (European bank transfer)
-     
 

-          If you want to be listed on the
-          list of donors,
-          please enter your name as it shall appear there.
-      
Name: 
-           (optional)
-          
-      

-          In case of payment problems we may want to contact you, thus please
-          enter your e-mail address.
-      
E-mail: 
-           (optional)
-           
-      

-          If you want to leave a message for us, please enter it here:
-      

-          
-      

-        
-          
-         
-      
-  
+
+	
+	
+		
 
+			
+				
+				
+			
 
+			
+				
+					Back
+				
+			

+		
+	
+
+	
+		
+			
+				Support GnuPG
+				To process your donation we need to collect some information. This information is only used for the purpose of the donation and no data will ever be send to any entity not directly involved in the donation process. Not giving a name makes the donation ?anonymous? in that the name won?t be listed on the public thank you page.
+				You can also send us Bitcoin. Our address is 175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W.
+			
+		
+		
+			
+
+			
+			
+				Amount
+				
+					
+						 500?
+					
+
+					
+						 200?
+					
+
+					
+						 100?
+					
+
+					
+						 50?
+					
+
+					
+						 20?
+					
+
+					
+						 10?
+					
+
+					
+						 5?
+					
+				
+			
+
+			
+			
+				
+					
+						
+							
+								
+									
+									other
+								
+							
+						
+						
+							
+						
+						
+							
+						
+					
+					Choosing ?other? allows to donate in other currencies.
+				
+			
+
+			
+			
+				Recurring
+				
+					
+				
+			
+
+			
+			
+				Pay using
+				
+					
+						
+							
+							Credit Card
+						
+					
+					
+						
+							
+							PayPal
+						
+					
+					
+						
+							
+							SEPA (European bank transfer)
+						
+					
+				
+			
+
+			
+			
+				
+					Name
+					(optional)
+				
+				
+					
+					
+						If you want to be listed on the list of donors, please enter your name as it shall appear there.
+					
+				
+			
+
+			
+			
+				
+					Email
+					(optional)
+				
+				
+					
+					
+						In case of payment problems we may want to contact you, thus please enter your e-mail address.
+					
+				
+			
+
+			
+			
+				
+					Message
+					(optional)
+				
+				
+					
+					
+						If you want to leave a message for us, please enter it here.
+					
+				
+			
+			
+				
+					
+				
+			
+		
+	
 
-
 #+END_HTML
-
+#  
+#
+#  
+#   
+#   Keep this field clear:
+#                 
+#   
+#    
+#      
+#      
+#    
+#    
+#      
+#      
+#    
+#    
+#      
+#      
+#    
+#    
+#      
+#      
+#    
+#   
+#    
+#      
+#      
+#   
+#   
+#     
+#     
+#   
+#   
+#     
+#     
+#   
+#   
+#   
+#      
+#      
+#    
+#    
+#      
+#      
+#    
+#    
+#      
+#      
+#    
+#    
+#      
+#      
+#    
+#    
+#      
+#      
+#    
+#    
+#      
+#      
+#    
+#    
+#      
+#      
+#    
+#   How much do you want to donate?

+#          (choosing ?other? allows
+#          to donate in other currencies)
Amount: 
+#          500 EUR
+#          200 EUR
+#          100 EUR
+#          50 EUR
+#          20 EUR
+#          5 EUR
+#      

+#          other:
+#          
+#          
+#          
+#      
Recurring: 
+#          
+#      
 
Pay using: 
+#        Credit Card
+#        
+#      

+#       PayPal
+#     

+#       SEPA (European bank transfer)
+#     
 

+#          If you want to be listed on the
+#          list of donors,
+#          please enter your name as it shall appear there.
+#      
Name: 
+#           (optional)
+#          
+#      

+#          In case of payment problems we may want to contact you, thus please
+#          enter your e-mail address.
+#      
E-mail: 
+#           (optional)
+#           
+#      

+#          If you want to leave a message for us, please enter it here:
+#      

+#          
+#      

+#        
+#          
+#         
+#      
+#  
+#
+#
+#
+#
 # eof #

-----------------------------------------------------------------------

Summary of changes:
 web/donate/donate.org | 455 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 317 insertions(+), 138 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed May 10 15:55:45 2017
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Wed, 10 May 2017 15:55:45 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.9.0-37-ga226eca
Message-ID: 

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 "GnuPG Made Easy".

The branch, master has been updated
       via  a226eca84670ef4e171c3a54e7caefb3a89254a4 (commit)
       via  15adff073bb89dc032d8342cfbbdad2850943f52 (commit)
       via  093b5497b7231590ce91ccf73ba64ebc0757f9e9 (commit)
      from  5e27bf98b4c48cf6a239bcc94b7b67515ff339e7 (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 a226eca84670ef4e171c3a54e7caefb3a89254a4
Author: Justus Winter 
Date:   Wed May 10 15:52:12 2017 +0200

    tests: Make sure to kill all previously running daemons.
    
    * lang/python/tests/Makefile.am: Kill all previously running daemons
    before creating the private key store.
    * lang/qt/tests/Makefile.am: Likewise.
    * tests/gpg/Makefile.am: Likewise.
    * tests/gpgsm/Makefile.am: Likewise.
    --
    
    Now that the daemons sockets are no longer created in the GNUPGHOME,
    we cannot rely on cleaning the build directory to make sure they are
    shut down.  Therefore, we explicitly kill any running daemons when
    creating the test environment.
    
    Signed-off-by: Justus Winter 

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index b62b524..790d8f8 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -97,6 +97,7 @@ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
            private-keys-v1.d/gpg-sample.stamp
 
 ./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
+	-gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index c4665df..a662b4c 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -77,6 +77,7 @@ export GNUPGHOME := $(abs_builddir)
 
 pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
 	             $(top_srcdir)/tests/gpg/secdemo.asc
+	-gpgconf --kill all
 	echo "ignore-invalid-option allow-loopback-pinentry" > $(abs_builddir)/gpg-agent.conf
 	echo "allow-loopback-pinentry" >> gpg-agent.conf
 	echo "ignore-invalid-option pinentry-mode" > gpg.conf
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index ed1323b..b2e8837 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -89,6 +89,7 @@ export GNUPGHOME := $(abs_builddir)
 export GPG_AGENT_INFO :=
 
 ./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys)
+	-gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 76e4938..adae6a2 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -74,6 +74,7 @@ BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \
 	echo faked-system-time 1008241200 >> ./gpgsm.conf
 
 ./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(key_id)
+	-gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key
 	echo x > ./private-keys-v1.d/gpg-sample.stamp

commit 15adff073bb89dc032d8342cfbbdad2850943f52
Author: Justus Winter 
Date:   Wed May 10 15:49:54 2017 +0200

    tests: Harmonize test suites.
    
    * lang/python/tests/Makefile.am: Create test environment as part of
    'make all'.
    * tests/gpg/Makefile.am: Make sure the private keystore is created
    first.
    * tests/gpgsm/Makefile.am: Create test environment as part of
    'make all'.  Make sure the private keystore is created
    first.
    
    Signed-off-by: Justus Winter 

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 9c19a13..b62b524 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -71,7 +71,7 @@ check: xcheck
 
 .PHONY: xcheck
 
-xcheck: ./pubring-stamp
+xcheck:
 	$(TESTS_ENVIRONMENT) $(PYTHON) $(srcdir)/run-tests.py \
 	  --interpreters="$(PYTHONS)" --srcdir=$(srcdir) $(TESTFLAGS) \
 	  $(XTESTS)
@@ -93,6 +93,9 @@ clean-local:
 	-rm -fR -- private-keys-v1.d openpgp-revocs.d S.gpg-agent sshcontrol
 
 
+BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
+           private-keys-v1.d/gpg-sample.stamp
+
 ./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 1d9a6df..ed1323b 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -95,7 +95,7 @@ export GPG_AGENT_INFO :=
         done
 	echo x > ./private-keys-v1.d/gpg-sample.stamp
 
-./pubring-stamp: $(srcdir)/pubdemo.asc
+./pubring-stamp: $(srcdir)/pubdemo.asc ./private-keys-v1.d/gpg-sample.stamp
 	$(GPG) --batch --no-permission-warning \
                --import $(srcdir)/pubdemo.asc
 	-$(GPG) --batch --no-permission-warning \
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 46d6a9b..76e4938 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -44,7 +44,7 @@ noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
 
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 
-CLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
+CLEANFILES = pubring-stamp pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
 	random_seed S.gpg-agent
 
 clean-local:
@@ -62,16 +62,21 @@ export GNUPGHOME := $(abs_builddir)
 
 export GPG_AGENT_INFO :=
 
-./pubring.kbx: $(srcdir)/cert_g10code_test1.der
+BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \
+           private-keys-v1.d/gpg-sample.stamp
+
+./pubring-stamp: $(srcdir)/cert_g10code_test1.der ./private-keys-v1.d/gpg-sample.stamp
 	$(GPGSM) --import $(srcdir)/cert_g10code_test1.der
+	touch pubring-stamp
 
 ./gpgsm.conf:
 	echo disable-crl-checks > ./gpgsm.conf
 	echo faked-system-time 1008241200 >> ./gpgsm.conf
 
-./private-keys-v1.d/$(key_id).key: $(srcdir)/$(key_id)
+./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(key_id)
 	$(MKDIR_P) ./private-keys-v1.d
 	cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key
+	echo x > ./private-keys-v1.d/gpg-sample.stamp
 
 ./trustlist.txt:
 	echo $(key_id) > ./trustlist.txt

commit 093b5497b7231590ce91ccf73ba64ebc0757f9e9
Author: Justus Winter 
Date:   Wed May 10 15:23:56 2017 +0200

    qt: Stop agent on clean.
    
    * lang/qt/tests/Makefile.am (clean-local): Stop agent.
    
    Signed-off-by: Justus Winter 

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index ccad8c2..c4665df 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -70,6 +70,7 @@ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg.conf tofu.db
 
 clean-local:
+	-$(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR  private-keys-v1.d crls.d
 
 export GNUPGHOME := $(abs_builddir)

-----------------------------------------------------------------------

Summary of changes:
 lang/python/tests/Makefile.am |  6 +++++-
 lang/qt/tests/Makefile.am     |  2 ++
 tests/gpg/Makefile.am         |  3 ++-
 tests/gpgsm/Makefile.am       | 12 +++++++++---
 4 files changed, 18 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed May 10 15:59:23 2017
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 10 May 2017 15:59:23 +0200
Subject: [git] gnupg-doc - branch, preview,
 updated. 7212767b15d6ac27d0184e13471416ecf67310f0
Message-ID: 

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 GnuPG website and other docs".

The branch, preview has been updated
       via  7212767b15d6ac27d0184e13471416ecf67310f0 (commit)
      from  c4d9b1a8841c80e7d9c4c23b52f46e95ba4f7f7e (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 7212767b15d6ac27d0184e13471416ecf67310f0
Author: Werner Koch 
Date:   Wed May 10 15:56:13 2017 +0200

    cgi: Make the donation page work with the CGI.

diff --git a/cgi/procdonate.cgi b/cgi/procdonate.cgi
index c0894af..9a54627 100755
--- a/cgi/procdonate.cgi
+++ b/cgi/procdonate.cgi
@@ -64,7 +64,7 @@ sub complete_sepa ();
 #   
 # assuming that the value of FOO is foo. Note that this substitution
 # rules work for all tags and thus you better take care to add an
-# extra space if if do not want this to happen.
+# extra space if you do not want this to happen.
 sub write_template ($) {
     my $fname = shift;
 
@@ -82,9 +82,11 @@ sub write_template ($) {
     my $recur_month = '';
     my $recur_quarter = '';
     my $recur_year = '';
+    my $recur_text = '';
     my $message_fmt;
     my $publishname;
     my $check_paytype = 'none';
+    my $stripe_data_email = '';
 
     # Avoid broken HTML attributes.
     $amount =~ s/\x22/\x27/g;
@@ -123,16 +125,28 @@ sub write_template ($) {
         $sel_jpy = ' selected="selected"';
     }
 
+    # For non-recurring Stripe donations we do not want to send a
+    #     data-email="$mail"
+    # line to Stripe so to enable the user to use a a different mail
+    # address for use with them.  This is implemented using a
+    # STRIPE_DATA_EMAIL template variable.
+    $stripe_data_email = 'data-email="' . $mail . '"';
     if ( $recur =~ /0/ ) {
+        $stripe_data_email = '';
         $recur_none    = ' selected="selected"';
+        $recur_text    = '';
     } elsif ( $recur =~ /12/ ) {
         $recur_month   = ' selected="selected"';
+        $recur_text    = 'monthly';
     } elsif ( $recur =~ /4/ ) {
         $recur_quarter = ' selected="selected"';
+        $recur_text    = 'quarterly';
     } elsif ( $recur =~ /1/ ) {
         $recur_year    = ' selected="selected"';
+        $recur_text    = 'yearly';
     }
 
+
     if ( $paytype eq "cc" ) {
         $check_paytype = "CC";
     } elsif ( $paytype eq "pp" ) {
@@ -192,6 +206,8 @@ sub write_template ($) {
             || s/(/$recur_month>/
             || s/(/$recur_quarter>/
             || s/(/$recur_year>/
+            || s//$recur_text/
+            || s//$stripe_data_email/
             || s//$publishname/
             || s//$separef/
             || s//$errorstr/
@@ -430,6 +446,7 @@ sub check_donation ()
     # Now create a session.
     $data{"Stripeamount"} = $stripeamount;
     $data{"Euroamount"} = $euroamount;
+    $data{"Recur"} = $recur;
     $data{"Name"} = $name;
     $data{"Mail"} = $mail;
     $data{"Message"} = $message;
@@ -487,6 +504,7 @@ sub complete_stripe_checkout ()
         "GnuPG donation by " . $data{"Name"} . " <" . $data{"Mail"} . ">";
     $stripe{"Stmt-Desc"} = "GnuPG donation";
     $stripe{"Email"} = $q->param("stripeEmail");
+    $stripe{"Recur"} = $q->param("Recur");
     $stripe{"Meta[name]"} = $data{"Name"} unless $data{"Name"} eq 'Anonymous';
     if ($data{"Mail"} ne $q->param("stripeEmail")) {
         $stripe{"Meta[mail]"} = $data{"Mail"};
@@ -507,6 +525,7 @@ sub complete_stripe_checkout ()
 
     $message = <
 
 
-	
-	
-		
-
-			
-				
-				
-			
-
-			
-				
-					Back
-				
-			

-		
-	
-
-	
-		
-			
-				Support GnuPG
-				To process your donation we need to collect some information. This information is only used for the purpose of the donation and no data will ever be send to any entity not directly involved in the donation process. Not giving a name makes the donation ?anonymous? in that the name won?t be listed on the public thank you page.
-				You can also send us Bitcoin. Our address is 175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W.
-			
-		
-		
-			
-
-			
-			
-				Amount
-				
-					
-						 500?
-					
-
-					
-						 200?
-					
-
-					
-						 100?
-					
-
-					
-						 50?
-					
-
-					
-						 20?
-					
-
-					
-						 10?
-					
-
-					
-						 5?
-					
-				
-			
-
-			
-			
-				
-					
-						
-							
-								
-									
-									other
-								
-							
-						
-						
-							
-						
-						
-							
-						
-					
-					Choosing ?other? allows to donate in other currencies.
-				
-			
-
-			
-			
-				Recurring
-				
-					
-				
-			
-
-			
-			
-				Pay using
-				
-					
-						
-							
-							Credit Card
-						
-					
-					
-						
-							
-							PayPal
-						
-					
-					
-						
-							
-							SEPA (European bank transfer)
-						
-					
-				
-			
-
-			
-			
-				
-					Name
-					(optional)
-				
-				
-					
-					
-						If you want to be listed on the list of donors, please enter your name as it shall appear there.
-					
-				
-			
-
-			
-			
-				
-					Email
-					(optional)
-				
-				
-					
-					
-						In case of payment problems we may want to contact you, thus please enter your e-mail address.
-					
-				
-			
-
-			
-			
-				
-					Message
-					(optional)
-				
-				
-					
-					
-						If you want to leave a message for us, please enter it here.
-					
-				
-			
-			
-				
-					
-				
-			
-		
-	
+  
+  
+    
+
+      
+        
+        
+      
+
+      
+        
+          Back
+        
+      

+    
+  
+
+  
+    
+      
+        Support GnuPG
+        To process your donation we need to collect some information. This information is only used for the purpose of the donation and no data will ever be send to any entity not directly involved in the donation process. Not giving a name makes the donation ?anonymous? in that the name won?t be listed on the public thank you page.
+        You can also send us Bitcoin. Our address is 175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W.
+      
+    
+
+    
+
+    
+      
+
+      
+      
+        Amount
+        
+          
+             500?
+          
+
+          
+             200?
+          
+
+          
+             100?
+          
+
+          
+             50?
+          
+
+          
+             20?
+          
+
+          
+             10?
+          
+
+          
+             5?
+          
+        
+      
+
+      
+      
+        
+          
+            
+              
+                
+                  
+                  other
+                
+              
+            
+            
+              
+            
+            
+              
+              
+            
+          
+          Choosing ?other? allows to donate
+                in other currencies.
+        
+      
+
+      
+      
+        Recurring
+        
+          
+        
+      
+
+      
+      
+        Pay using
+        
+          
+            
+              
+              Credit Card
+            
+            
+          
+          
+            
+              
+              PayPal
+            
+          
+          
+            
+              
+              SEPA (European bank transfer)
+            
+          
+        
+      
+
+      
+      
+        
+          Name
+          (optional)
+        
+        
+          
+          
+          
+            If you want to be listed on the
+             list of donors, please enter your name as
+             it shall appear there.
+          
+        
+      
+
+      
+      
+        
+          Email
+          (optional)
+        
+        
+          
+           
+          
+            In case of payment problems we may want to contact you,
+            thus please enter your e-mail address.
+          
+        
+      
+
+      
+      
+        
+          Message
+          (optional)
+        
+        
+          
+          
+            If you want to leave a message for us, please enter it here.
+          
+        
+      
+      
+        
+          
+        
+      
+    
+  
 
 #+END_HTML
-#  
-#
-#  
-#   
-#   Keep this field clear:
-#                 
-#   
-#    
-#      
-#      
-#    
-#    
-#      
-#      
-#    
-#    
-#      
-#      
-#    
-#    
-#      
-#      
-#    
-#   
-#    
-#      
-#      
-#   
-#   
-#     
-#     
-#   
-#   
-#     
-#     
-#   
-#   
-#   
-#      
-#      
-#    
-#    
-#      
-#      
-#    
-#    
-#      
-#      
-#    
-#    
-#      
-#      
-#    
-#    
-#      
-#      
-#    
-#    
-#      
-#      
-#    
-#    
-#      
-#      
-#    
-#   How much do you want to donate?

-#          (choosing ?other? allows
-#          to donate in other currencies)
Amount: 
-#          500 EUR
-#          200 EUR
-#          100 EUR
-#          50 EUR
-#          20 EUR
-#          5 EUR
-#      

-#          other:
-#          
-#          
-#          
-#      
Recurring: 
-#          
-#      
 
Pay using: 
-#        Credit Card
-#        
-#      

-#       PayPal
-#     

-#       SEPA (European bank transfer)
-#     
 

-#          If you want to be listed on the
-#          list of donors,
-#          please enter your name as it shall appear there.
-#      
Name: 
-#           (optional)
-#          
-#      

-#          In case of payment problems we may want to contact you, thus please
-#          enter your e-mail address.
-#      
E-mail: 
-#           (optional)
-#           
-#      

-#          If you want to leave a message for us, please enter it here:
-#      

-#          
-#      

-#        
-#          
-#         
-#      
-#  
-#
-#
-#
-#
-# eof #

-----------------------------------------------------------------------

Summary of changes:
 cgi/procdonate.cgi    |  23 ++-
 web/donate/donate.org | 527 ++++++++++++++++++++------------------------------
 2 files changed, 230 insertions(+), 320 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed May 10 16:22:30 2017
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 10 May 2017 16:22:30 +0200
Subject: [git] gnupg-doc - branch, preview,
 updated. 5a9e5bfdff6d09805851d133635a5d856fbe3ae1
Message-ID: 

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 GnuPG website and other docs".

The branch, preview has been updated
       via  5a9e5bfdff6d09805851d133635a5d856fbe3ae1 (commit)
      from  7212767b15d6ac27d0184e13471416ecf67310f0 (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 5a9e5bfdff6d09805851d133635a5d856fbe3ae1
Author: Werner Koch 
Date:   Wed May 10 16:19:21 2017 +0200

    cgi: Adjust the checkout page

diff --git a/web/donate/checkout-cc.org b/web/donate/checkout-cc.org
index 8651eb0..69b2a87 100644
--- a/web/donate/checkout-cc.org
+++ b/web/donate/checkout-cc.org
@@ -2,37 +2,41 @@
 #+STARTUP: showall
 #+SETUPFILE: "../share/setup.inc"
 
-* Donate - Checkout with card
+#+BEGIN_HTML
+  
+
+
+
 
-  Information on your intended donation:
+
+Information on your intended donation:
+
 
-#+BEGIN_HTML
-  
-   
-     
-     
-   
-   
-     
-     
-   
-   
-     
-     
-   
-   
-     
-     
-   
-  Amount: 
-         
Name: 
Mail: 
Message: 
-#+END_HTML
+
+ 
+   
+   
+ 
+ 
+   
+   
+ 
+ 
+   
+   
+ 
+ 
+   
+   
+ 
+Amount: 
+        
Name: 
Mail: 
Message: 
 
+
   If something is wrong, please use the back button below to change
   it.  If the data is correct, you may now continue with the payment.
+
 
-
-#+BEGIN_HTML
   
+
+  
+  
+  
+    

+      
+      
+      
+    
+  
+  
+    
+    
+    
+    
+  
+  
+
+
+
+#+END_HTML

-----------------------------------------------------------------------

Summary of changes:
 web/donate/{checkout-cc.org => checkout-cc.de.org} | 31 +++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)
 copy web/donate/{checkout-cc.org => checkout-cc.de.org} (66%)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue May 16 14:36:13 2017
From: cvs at cvs.gnupg.org (by Justus Winter)
Date: Tue, 16 May 2017 14:36:13 +0200
Subject: [git] gnupg-doc - branch, preview,
 updated. 41b32e4ea9a0d3f23502fe71c201f260ba5a7cb2
Message-ID: 

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 GnuPG website and other docs".

The branch, preview has been updated
       via  41b32e4ea9a0d3f23502fe71c201f260ba5a7cb2 (commit)
      from  e35e714050cad15b2202a32fa1381cee3b7150f1 (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 41b32e4ea9a0d3f23502fe71c201f260ba5a7cb2
Author: Justus Winter 
Date:   Tue May 16 14:36:09 2017 +0200

    campaign,de: tune some strings

diff --git a/web/donate/checkout-cc.de.org b/web/donate/checkout-cc.de.org
index d02c34d..04735d0 100644
--- a/web/donate/checkout-cc.de.org
+++ b/web/donate/checkout-cc.de.org
@@ -34,7 +34,7 @@ Informationen zu Ihrer gew?nschten Spende:
 
 
 
-  Falls etwas nicht korrekt ist, benutzen Sie bitte den zur?ck Knopf
+  Falls etwas nicht korrekt ist, benutzen Sie bitte den Zur?ck-Knopf
   weiter unten auf dieser Seite.  Wenn die Daten korrekt sind, k?nnen
   sie nun mit der Spende fortfahren.
 
@@ -81,7 +81,7 @@ Informationen zu Ihrer gew?nschten Spende:
     
     
     
-    
+    
   
   
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+  
+  
1EAw3RnaALKiES8Ap93SwwDx4fsoY12wzFls
1EAw3RnaALKiES8Ap93SwwDx4fsoY12wzF
1EAw3RnaALKiES8Ap93SwwDx4fsoY12wzFls
1EAw3RnaALKiES8Ap93SwwDx4fsoY12wzF
1EAw3RnaALKiES8Ap93SwwDx4fsoY12wzFls
1EAw3RnaALKiES8Ap93SwwDx4fsoY12wzF
1EAw3RnaALKiES8Ap93SwwDx4fsoY12wzFls
1EAw3RnaALKiES8Ap93SwwDx4fsoY12wzF

Betrag:	+
Name:
E-Mail:
Nachricht:

Kontoinhaber:	g10 Code GmbH
IBAN:	DE76 3015 0200 0002 1086 03
BIC:	WELADED1KSD
Verwendungszweck:
Betrag:	+ EUR

Owner:	g10 Code GmbH
IBAN:	DE76 3015 0200 0002 1086 03
BIC:	WELADED1KSD
Reference:
Amount:	- EUR

Kontoinhaber:	g10 Code GmbH
IBAN:	DE76 3015 0200 0002 1086 03
BIC:	WELADED1KSD
Verwendungszweck:
Betrag:	- EUR

Betrag:	-
Name:
E-Mail:
Nachricht:

	How much do you want to donate? - (choosing ?other? allows - to donate in other currencies)
Amount:	- 500 EUR - 200 EUR - 100 EUR - 50 EUR - 20 EUR - 5 EUR -
	- other: - - - -
Recurring:	- -

Pay using:	- Credit Card - -
	- PayPal -
	- SEPA (European bank transfer) -

	- If you want to be listed on the - list of donors, - please enter your name as it shall appear there. -
Name:	- (optional) - -
	- In case of payment problems we may want to contact you, thus please - enter your e-mail address. -
E-mail:	- (optional) - -
	- If you want to leave a message for us, please enter it here: -
	- -
	- - - -

	How much do you want to donate? +# (choosing ?other? allows +# to donate in other currencies)
Amount:	+# 500 EUR +# 200 EUR +# 100 EUR +# 50 EUR +# 20 EUR +# 5 EUR +#
	+# other: +# +# +# +#
Recurring:	+# +#

Pay using:	+# Credit Card +# +#
	+# PayPal +#
	+# SEPA (European bank transfer) +#

	+# If you want to be listed on the +# list of donors, +# please enter your name as it shall appear there. +#
Name:	+# (optional) +# +#
	+# In case of payment problems we may want to contact you, thus please +# enter your e-mail address. +#
E-mail:	+# (optional) +# +#
	+# If you want to leave a message for us, please enter it here: +#
	+# +#
	+# +# +# +#

	How much do you want to donate? -# (choosing ?other? allows -# to donate in other currencies)
Amount:	-# 500 EUR -# 200 EUR -# 100 EUR -# 50 EUR -# 20 EUR -# 5 EUR -#
	-# other: -# -# -# -#
Recurring:	-# -#

Pay using:	-# Credit Card -# -#
	-# PayPal -#
	-# SEPA (European bank transfer) -#

	-# If you want to be listed on the -# list of donors, -# please enter your name as it shall appear there. -#
Name:	-# (optional) -# -#
	-# In case of payment problems we may want to contact you, thus please -# enter your e-mail address. -#
E-mail:	-# (optional) -# -#
	-# If you want to leave a message for us, please enter it here: -#
	-# -#
	-# -# -# -#

Support GnuPG

Support GnuPG

Support GnuPG

GnuPG ?????????

GnuPG ?????????

??? ?????? + ?????????? +

+ + + ???????? +

+ ????? +

Video of the Day: Rick Astley GnuPG will never gonna give you up

GnuPG Needs Your Help!

What we will do

Maintenance

Gnuk

Book

Greater Ecosystem

What others say about GnuPG

Who we are

GnuPG Fundraising Rally

Video of the Day: Rick Astley GnuPG will never gonna give you up

Who we are

Video of the Day: Rick Astley GnuPG will never gonna give you up

Video of the Day: Rick Astley GnuPG will never gonna give you up

Video of the Day: Rick Astley + GnuPG will never gonna give you up +

Video of the Day: Rick Astley GnuPG will never gonna give you up

Video of the Day: Rick Astley + GnuPG will never gonna give you up +

Summary

Summary

Who we are

Wer wir sind

Summary

Summary

Summary

Unterst?tzen Sie GnuPG

Unterst?tzen Sie GnuPG

?bersicht

GnuPG Needs Your Help!

GnuPG ????????????????!

Video of the Day: Rick Astley GnuPG will never gonna give you up

Video of the Day: Rick Astley + GnuPG will never gonna give you up +

?bersicht

???

GnuPG?????

Video of the Day: Alex Abdo - American Civil Liberties Union (ACLU) +

?????: ????????? + ?????????? (ACLU)

What we intend to do

????????????????

Maintenance

??

Gnuk

Book

?

Greater Ecosystem

??????????

What others say about GnuPG

GnuPG???????????????????

Who we are

???????

Canceled

Canceled

Cancelled

?bersicht

R?glement