[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.1-13-gf375856

[by Andre Heinecke]

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 for Windows".

The branch, master has been updated
       via  f37585619c1ead6db4438dbfdf9f78dd224257c3 (commit)
      from  c66c23641aa605e26c133ae8acb7d35789d03c8c (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 f37585619c1ead6db4438dbfdf9f78dd224257c3
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jul 30 12:03:52 2014 +0200

    Change gpgme to version 1.4.4
    
        * packages/packages.current (gpgme): Switch version to 1.4.4
        * patches/gpgme-1.4.3: Remove obsolete patch
    
    --
        Switch to version 1.4.4 was suggested by wk.

diff --git a/packages/packages.current b/packages/packages.current
index d14d973..230cdc7 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -432,9 +432,9 @@ chk  de4ba5ef9a1ced4e4f8543feac553d4cf68dea00
 file scute/scute-1.4.0.tar.bz2
 chk  e28141d2b03612c09512651795976c58ed3f8035
 
-# checked: 2014-07-16 ah - updated
-file gpgme/gpgme-1.5.0.tar.bz2
-chk  690df6d692be36923b9b28530afb2b4854f2435d
+# checked: 2014-07-30 ah - updated
+file gpgme/gpgme-1.4.4.tar.bz2
+chk  858026ba73b761b5f1393632e81dbf7bc49ddd1d
 
 # checked: 2014-07-16 ah
 file gpa/gpa-0.9.4.tar.bz2
diff --git a/patches/gpgme-1.4.3/01-card-edit.patch b/patches/gpgme-1.4.3/01-card-edit.patch
deleted file mode 100755
index b0ab3fc..0000000
--- a/patches/gpgme-1.4.3/01-card-edit.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 372bd439834c69d502668007c8c683233d676bd5 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk at gnupg.org>
-Date: Mon, 19 Aug 2013 20:40:10 +0200
-Subject: Fix possible segv in the gpgme_op_card_edit.
-
-* src/edit.c (gpgme_op_edit_start, gpgme_op_card_edit_start): Do not
-deref a NULL KEY in TRACE_BEG.
----
- src/edit.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/edit.c b/src/edit.c
-index 1f73078..72fa458 100644
---- a/src/edit.c
-+++ b/src/edit.c
-@@ -143,7 +143,7 @@ gpgme_op_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
-
-   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit_start", ctx,
-	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
--	      (key->subkeys && key->subkeys->fpr) ?
-+	      (key && key->subkeys && key->subkeys->fpr) ?
-	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
-
-   if (!ctx)
-@@ -164,7 +164,7 @@ gpgme_op_edit (gpgme_ctx_t ctx, gpgme_key_t key,
-
-   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit", ctx,
-	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
--	      (key->subkeys && key->subkeys->fpr) ?
-+	      (key && key->subkeys && key->subkeys->fpr) ?
-	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
-
-   if (!ctx)
-@@ -187,7 +187,7 @@ gpgme_op_card_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
-
-   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit_start", ctx,
-	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
--	      (key->subkeys && key->subkeys->fpr) ?
-+	      (key && key->subkeys && key->subkeys->fpr) ?
-	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
-
-   if (!ctx)
-@@ -208,7 +208,7 @@ gpgme_op_card_edit (gpgme_ctx_t ctx, gpgme_key_t key,
-
-   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit", ctx,
-	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
--	      (key->subkeys && key->subkeys->fpr) ?
-+	      (key && key->subkeys && key->subkeys->fpr) ?
-	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
-
-   if (!ctx)
---
-1.7.7.1

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

Summary of changes:
 packages/packages.current              |    6 ++--
 patches/gpgme-1.4.3/01-card-edit.patch |   57 --------------------------------
 2 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100755 patches/gpgme-1.4.3/01-card-edit.patch


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org