[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-16-g76adf19

[by Werner Koch]

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  76adf19d3880a29e7d45be5e6ff59688d11bc361 (commit)
       via  29710a8f11b0bec01930fc0b0882d59f4e40da0d (commit)
      from  66fb36df1b3807c08453fd297f683763023627dc (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 76adf19d3880a29e7d45be5e6ff59688d11bc361
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 3 15:47:29 2013 +0200

    Update GnuPG to 2.0.21-beta20.

diff --git a/NEWS b/NEWS
index 504b258..2afcf99 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,22 @@
 Noteworthy changes in version 2.1.2 (unreleased)
 ------------------------------------------------
 
+(en) GpgEx does now work on 64 bit Windows.
+
+(en) Gpg-agent may now be used as Pageant replacement with additional
+     smartcard support.
+
+~~~~~~~~~~~~~~~
+GnuPG:          2.0.21-beta20
+Kleopatra:      2.1.1
+GPA:            0.9.4
+GpgOL:          1.1.3
+GpgEX:          1.0.0-beta24
+Claws-Mail:     3.9.1
+Kompendium DE:  3.0.0
+Kompendium EN:  3.0.0-beta1
+~~~~~~~~~~~~~~~
+
 
 Noteworthy changes in version 2.1.1 (2013-05-28)
 ------------------------------------------------
diff --git a/packages/packages.current b/packages/packages.current
index 056b695..0e9a796 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -400,10 +400,10 @@ chk  241afcb2dfbf3f3fc27891a53a33f12d9084d772
 file libassuan/libassuan-2.1.1.tar.bz2
 chk  8bd3826de30651eb8f9b8673e2edff77cd70aca1
 
-# checked: 2013-05-10 wk
-name gnupg2-2.0.20.tar.bz2
-file gnupg/gnupg-2.0.20.tar.bz2
-chk  7ddfefa37ee9da89a8aaa8f9059d251b4cd02562
+# checked:
+name gnupg2-2.0.21-beta20.tar.bz2
+file alpha/gnupg/gnupg-2.0.21-beta20.tar.bz2
+chk  88fc1d82400018bfb1b5ab2b842acbc1e1259be3
 
 # checked: 2013-04-26 wk
 file dirmngr/dirmngr-1.1.1.tar.bz2

commit 29710a8f11b0bec01930fc0b0882d59f4e40da0d
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 3 15:33:53 2013 +0200

    Adjust patches for GnuPG 2.0.21.
    
    * patches/gnupg2/02-allow-mark-trusted.patch: Move to ...
    * patches/gnupg2-2.0.20/: new directory.
    * Makefile.am (EXTRA_DIST): Adjust for this.
    --
    
    We only allow current versions of GnuPG to be build with the
    installer, thus we explicitly support 2.0.20 but prepare for future
    version by removing a patch which meanwhile has be integrated into
    GnuPG 2.0 proper.

diff --git a/Makefile.am b/Makefile.am
index d422902..698b57d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/libxml2-2.7.8/01-cve-2012-5134 \
 	patches/gpgme/01-gpg2.patch \
 	patches/gnupg2/01-version.patch.in \
-	patches/gnupg2/02-allow-mark-trusted.patch \
+	patches/gnupg2-2.0.20/02-allow-mark-trusted.patch \
 	patches/dirmngr-1.1.0/01-mmap.patch \
         patches/gpgol-1.1.3/01-w64-ming64.patch  \
         patches/gpgol-1.1.3/02-off_t.postcfg-build \
diff --git a/patches/gnupg2/02-allow-mark-trusted.patch b/patches/gnupg2-2.0.20/02-allow-mark-trusted.patch
similarity index 99%
rename from patches/gnupg2/02-allow-mark-trusted.patch
rename to patches/gnupg2-2.0.20/02-allow-mark-trusted.patch
index d4abaab..e51028b 100755
--- a/patches/gnupg2/02-allow-mark-trusted.patch
+++ b/patches/gnupg2-2.0.20/02-allow-mark-trusted.patch
@@ -100,5 +100,3 @@ diff --git a/po/de.po b/po/de.po
 
  #: agent/gpg-agent.c:178
  msgid "allow presetting passphrase"
-
-

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

Summary of changes:
 Makefile.am                                        |    2 +-
 NEWS                                               |   16 ++++++++++++++++
 packages/packages.current                          |    8 ++++----
 .../02-allow-mark-trusted.patch                    |    2 --
 4 files changed, 21 insertions(+), 7 deletions(-)
 rename patches/{gnupg2 => gnupg2-2.0.20}/02-allow-mark-trusted.patch (99%)


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