[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-155-g655a0f4

by Andre Heinecke cvs at cvs.gnupg.org
Fri Jun 17 17:54:53 CEST 2016 

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  655a0f491b51cd34a1e7f63799d44931771f205b (commit)
       via  a2ac5fc2778f3ef79d20e5330442580cd9764de2 (commit)
       via  a811ec14d99bc153135e0d82062244f0972b9205 (commit)
       via  4ab5e5a0daf5881883220cd31428553bb3ea465e (commit)
      from  0fbe0d383eb756f93fc2d78297ff6bf65489e8a0 (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 655a0f491b51cd34a1e7f63799d44931771f205b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 17 17:54:28 2016 +0200

    Update NEWS and READMES
    
    --

diff --git a/NEWS b/NEWS
index c3bb661..f3450b6 100644
--- a/NEWS
+++ b/NEWS
@@ -73,8 +73,21 @@ Noteworthy changes in version 3.0.0 (unreleased)
 (de) Kleopatra bietet nun in den Erweiterten Optionen bei der
      Schlüsselerstellung an ECC Schlüssel zu erstellen.
 
+(en) Kleopatras file menu now also offers to encrypt Folders.
+
+(de) Es ist nun auch möglich über Kleopatras Dateimenü Ordner zu verschlüsseln.
+
+(en) Kleopatra has a new option to print a secret key through the paperkey tool.
+
+(de) Kleopatra bietet nun die Option einen Privaten Schlüssel mit Paperkey zu drucken.
+
+(en) GPA and Kleopatra are now registred for OpenPGP and S/MIME related file extensions.
+
+(de) GPA und Kleopatra werden nun als Anwendungen für OpenPGP und S/MIME Dateiendungen in
+     Windows registriert.
+
 ~~~~~~~~~~~~~~~
-GnuPG:          2.1.11
+GnuPG:          2.1.13
 Kleopatra:      2.3.0
 GPA:            0.9.9
 GpgOL:          1.4.0
diff --git a/doc/README.de.txt b/doc/README.de.txt
index 2e3dff6..2a28b18 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -86,6 +86,13 @@ Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
 - Kleopatra bietet nun in den Erweiterten Optionen bei der
   Schlüsselerstellung an ECC Schlüssel zu erstellen.
 
+- Kleopatra bietet nun die Option einen Privaten Schlüssel mit Paperkey zu drucken.
+
+- Es ist nun auch möglich über Kleopatras Dateimenü Ordner zu verschlüsseln.
+
+- GPA und Kleopatra werden nun als Anwendungen für OpenPGP und S/MIME Dateiendungen in
+  Windows registriert.
+
 3. Bekannte Probleme (und Abhilfen)
 ===================================
 
diff --git a/doc/README.en.txt b/doc/README.en.txt
index 8c18753..02164ea 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -81,6 +81,12 @@ New in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
 - Kleopatra now allows you to create ECC keys in the Advanced Settings
   during Key generation.
 
+- Kleopatras file menu now also offers to encrypt Folders.
+
+- Kleopatra has a new option to print a secret key through the paperkey tool.
+
+- GPA and Kleopatra are now registred for OpenPGP and S/MIME related file extensions.
+
 3. Known Bugs (and Workarounds)
 ===============================
 

commit a2ac5fc2778f3ef79d20e5330442580cd9764de2
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 17 17:54:07 2016 +0200

    Update development packages
    
    --

diff --git a/packages/packages.current b/packages/packages.current
index 435b379..ef14af3 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -494,8 +494,8 @@ server http://files.intevation.de/projects/gpg4all
 # Pinentry master to show new pinentry features under devel.
 # by: ah
 # verified: tarball created by ah
-file pinentry/pinentry-0.9.8-beta5.tar.bz2
-chk b4e7713165008c0b21c065c4452a155cc353b7bb9abf519833873eb522b6a676
+file pinentry/pinentry-0.9.8-beta18.tar.bz2
+chk 67b017001928ad072f57435b72d473a961f64bfb17c792e42984dc31f72ae7d1
 
 # Gpgmepp
 # last changed: 2016-01-21
@@ -509,8 +509,8 @@ chk b4e7713165008c0b21c065c4452a155cc353b7bb9abf519833873eb522b6a676
 # by: ah
 # verified: Tarball created by ah.
 
-file gpgmepp/gpgmepp-201604191437.tar.xz
-chk e8c6d9947c2b9410f151379a1bcd6e562e05f0b71fdf5d889783b5914bfa51da
+file gpgmepp/gpgmepp-201606171716.tar.xz
+chk 9314db98884585c33ad1a9abb105cdf930f948837431a20bd5dbaa340f50b5d6
 
 # kmime
 # last changed: 2016-01-25
@@ -528,11 +528,11 @@ file kmime/kmime-201601251644.tar.xz
 chk fab98917a4cbde33040c97817c1e199d70e335c1a66b1329ff39be0b25287a48
 
 # Libkleo
-# last changed: 2016-04-19
+# last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file libkleo/libkleo-201604191436.tar.xz
-chk 2d04b133900454eb5f61bc016a43e6ee426c48fe5ca8ed54cd46542fef59b6bd
+file libkleo/libkleo-201605171746.tar.xz
+chk ad5c2c96c88c283df3066e77fd8714d7b77c2f33f0fe3bb116bb352edf2e38b2
 
 # KDE-L10n
 # last changed: 2016-02-19
@@ -547,6 +547,6 @@ chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
 # Kleopatra
 # last changed: see package date.
 # by: ah
-# verified: Tarball created by ah. (branch signencfiles-3)
-file kleopatra/kleopatra-201604291038.tar.gz
-chk 1c43f38756b063a27984c6e20b4ea4200fbee097d32bb12ae828b735fd005a86
+# verified: Tarball created by ah.
+file kleopatra/kleopatra-201606171712.tar.gz
+chk 27f89375b896d18e07b551c1443ff5d1acc0cb8896db5437b77aab9f799c93a5

commit a811ec14d99bc153135e0d82062244f0972b9205
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 17 17:53:36 2016 +0200

    Update GnuPG and libgpg-error
    
    --

diff --git a/packages/packages.current b/packages/packages.current
index 28089d9..435b379 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -277,23 +277,23 @@ server ftp://ftp.gnupg.org/gcrypt
 
 # last-changed: 2016-03-30
 # by: ah
-file libgpg-error/libgpg-error-1.21.tar.bz2
-chk  b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d
+file libgpg-error/libgpg-error-1.23.tar.bz2
+chk  7f0c7f65b98c4048f649bfeebfa4d4c1559707492962504592b985634c939eaa
 
 # last-changed: 2015-12-11
 # by: ah
 file libassuan/libassuan-2.4.2.tar.bz2
 chk  bb06dc81380b74bf1b64d5849be5c0409a336f3b4c45f20ac688e86d1b5bcb20
 
-# last changed: 2015-09-08
+# last changed: 2016-06-17
 # by: ah
-name gnupg-w32-2.1.11-20160209-bin.exe
-file binary/gnupg-w32-2.1.11_20160209.exe
-chk  1e92b39ef4f4cdf3b1849b6f824dd8f160276aa5c9718be35f8a7bd190bf6154
+name gnupg-w32-2.1.13-20160616-bin.exe
+file binary/gnupg-w32-2.1.13_20160616.exe
+chk  c868b7fadd5907bb598b11490e0214ce2f11340609bb5829e0d9b0875684d876
 
-name gnupg-w32-2.1.11-20160209-src.tar.xz
-file binary/gnupg-w32-2.1.11_20160209.tar.xz
-chk  c132c16a5ae57ddd8193f222e539a608930fe3556a5c7932cabb5675f0dc3305
+name gnupg-w32-2.1.13-20160616-src.tar.xz
+file binary/gnupg-w32-2.1.13_20160616.tar.xz
+chk  f928e680770f3754b22ee6bfb0532307a4fa1f871a726656e028e6e95095bf2d
 
 # last changed: 2015-12-11
 # by: ah

commit 4ab5e5a0daf5881883220cd31428553bb3ea465e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 17 17:31:58 2016 +0200

    Add application/pgp-keys mimetype handling
    
    * src/installer-finish.nsi: Register application/pgp-keys. Clean
    up version and naming.
    * src/uninst-gpa.nsi, src/uninst-kleopatra.nsi: Update accordingly.
    
    --
    Seems the Version suffix is not something thats usually done on
    Windows so we drop it as it complicates things.

diff --git a/src/installer-finish.nsi b/src/installer-finish.nsi
index a53cb2f..36bf116 100644
--- a/src/installer-finish.nsi
+++ b/src/installer-finish.nsi
@@ -56,6 +56,15 @@ Function SetupExtRegKeys
 
   WriteRegBin HKLM "Software\Classes\.sig\OpenWithProgIDs" "gpg4win.AssocFile.$0.PGPSIG" 0
 
+  # OpenPGP Key to be used in mime registry
+  WriteRegExpandStr HKLM "Software\Classes\gpg4win.AssocFile.$0.PGPKEY\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
+  WriteRegStr HKLM "Software\Classes\gpg4win.AssocFile.$0.PGPKEY" "FriendlyTypeName" "$(T_File_Type_pgp_key_Name)"
+  WriteRegStr HKLM "Software\Classes\gpg4win.AssocFile.$0.PGPKEY" "PercievedType" "Document"
+  WriteRegStr HKLM "Software\Classes\gpg4win.AssocFile.$0.PGPKEY" "InfoTip" "$(T_File_Type_pgp_key_info_tip)"
+  WriteRegStr HKLM "Software\Classes\gpg4win.AssocFile.$0.PGPKEY\CurVer" "" "${VERSION}"
+  WriteRegStr HKLM "Software\Classes\gpg4win.AssocFile.$0.PGPKEY\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
+  WriteRegStr HKLM "Software\Classes\gpg4win.AssocFile.$0.PGPKEY\DefaultIcon" "" "$INSTDIR\share\gpg4win\file-ext.ico"
+
   # CMS
   WriteRegExpandStr HKLM "Software\Classes\gpg4win.AssocFile.$0.CMS\shell\open\command" "" "$\"$INSTDIR\bin\$0.exe$\" $\"%1$\""
   WriteRegStr HKLM "Software\Classes\gpg4win.AssocFile.$0.CMS" "FriendlyTypeName" "$(T_File_Type_pem_Name)"
@@ -83,7 +92,8 @@ Function SetupExtRegKeys
   WriteRegBin HKLM "Software\Classes\gpg4win.AssocFile.$0.X509" "AllowSilentDefaultTakeOver" 0
 
   # Register capabilities
-  WriteRegStr HKLM "Software\RegisteredApplications" "Gpg4win.$0.${VERSION}" "SOFTWARE\Gpg4win\$0\Capabilities"
+  WriteRegStr HKLM "Software\RegisteredApplications" "Gpg4win.$0" "SOFTWARE\Gpg4win\$0\Capabilities"
+  WriteRegStr HKLM "Software\Gpg4win\$0" "" "$0"
 
   # File extensions
   WriteRegStr HKLM "Software\Gpg4win\$0\Capabilities\FileAssociations" ".pgp" "gpg4win.AssocFile.$0.GPG"
@@ -107,7 +117,7 @@ Function SetupExtRegKeys
 
   # Mime extensions For PGP this is probably pretty useless
   WriteRegStr HKLM "Software\Gpg4win\$0\Capabilities\MimeAssociations" "application/pgp" "gpg4win.AssocFile.$0.GPG"
-  WriteRegStr HKLM "Software\Gpg4win\$0\Capabilities\MimeAssociations" "application/pgp-keys" "gpg4win.AssocFile.$0.GPG"
+  WriteRegStr HKLM "Software\Gpg4win\$0\Capabilities\MimeAssociations" "application/pgp-keys" "gpg4win.AssocFile.$0.PGPKEY"
   WriteRegStr HKLM "Software\Gpg4win\$0\Capabilities\MimeAssociations" "application/pgp-encrypted" "gpg4win.AssocFile.$0.GPG"
   WriteRegStr HKLM "Software\Gpg4win\$0\Capabilities\MimeAssociations" "application/pgp-signature" "gpg4win.AssocFile.$0.GPG"
   WriteRegStr HKLM "Software\Gpg4win\$0\Capabilities\MimeAssociations" "application/pkcs7-mime" "gpg4win.AssocFile.$0.CMS"
@@ -137,13 +147,13 @@ have_kleo:
   # https://msdn.microsoft.com/en-us/library/windows/desktop/cc144104%28v=vs.85%29.aspx
   # For documentation.
 
-  push kleopatra
+  push Kleopatra
   call SetupExtRegKeys
 
   !insertmacro SectionFlagIsSet ${SEC_gpa} \
         ${SF_SELECTED} 0 leave2
 have_gpa:
-  push gpa
+  push GPA
   call SetupExtRegKeys
 
 leave2:
@@ -160,6 +170,9 @@ LangString T_File_Type_asc_Name ${LANG_ENGLISH} \
 LangString T_File_Type_sig_Name ${LANG_ENGLISH} \
    "OpenPGP Signature"
 
+LangString T_File_Type_pgp_key_Name ${LANG_ENGLISH} \
+   "OpenPGP Certificate File"
+
 LangString T_File_Type_asc_Name ${LANG_ENGLISH} \
    "CMS (S/MIME) File"
 
@@ -167,7 +180,7 @@ LangString T_File_Type_x509_Name ${LANG_ENGLISH} \
    "X509 Certificate File"
 
 LangString T_File_Type_x509_info_tip ${LANG_ENGLISH} \
-   "A certificate for CMS (S/MIME)."
+   "Certificate for CMS (S/MIME)."
 
 LangString T_File_Type_info_tip ${LANG_ENGLISH} \
    "This can be encrypted data, a signature or a certificate."
@@ -175,6 +188,9 @@ LangString T_File_Type_info_tip ${LANG_ENGLISH} \
 LangString T_File_Type_sig_info_tip ${LANG_ENGLISH} \
    "A cryptographic signature to verify the authenticity of another file."
 
+LangString T_File_Type_pgp_key_info_tip ${LANG_ENGLISH} \
+   "Certificate for OpenPGP."
+
 # Last section is a hidden one.
 Section
   WriteUninstaller "$INSTDIR\${PACKAGE}-uninstall.exe"
diff --git a/src/uninst-gpa.nsi b/src/uninst-gpa.nsi
index 50931e3..f34fa3b 100644
--- a/src/uninst-gpa.nsi
+++ b/src/uninst-gpa.nsi
@@ -49,8 +49,9 @@ Section "-un.gpa"
   DeleteRegKey HKLM "Software\Classes\gpg4win.AssocFile.gpa.CMS"
   DeleteRegKey HKLM "Software\Classes\gpg4win.AssocFile.gpa.X509"
   DeleteRegKey HKLM "Software\Classes\gpg4win.AssocFile.gpa.PGPSIG"
+  DeleteRegKey HKLM "Software\Classes\gpg4win.AssocFile.gpa.PGPKEY"
   DeleteRegKey HKLM "Software\Gpg4win\gpa"
-  DeleteRegValue HKLM "Software\RegisteredApplications" "Gpg4win.gpa.${VERSION}"
+  DeleteRegValue HKLM "Software\RegisteredApplications" "Gpg4win.gpa"
   DeleteRegValue HKLM "Software\Classes\.gpg" "gpg4win.AssocFile.gpa.GPG"
   DeleteRegValue HKLM "Software\Classes\.asc" "gpg4win.AssocFile.gpa.ASC"
   DeleteRegValue HKLM "Software\Classes\.pgp" "gpg4win.AssocFile.gpa.PGP"
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index ece2083..410f2eb 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -209,8 +209,9 @@ Section "-un.kleopatra"
   DeleteRegKey HKLM "Software\Classes\gpg4win.AssocFile.kleopatra.CMS"
   DeleteRegKey HKLM "Software\Classes\gpg4win.AssocFile.kleopatra.X509"
   DeleteRegKey HKLM "Software\Classes\gpg4win.AssocFile.kleopatra.PGPSIG"
+  DeleteRegKey HKLM "Software\Classes\gpg4win.AssocFile.kleopatra.PGPKEY"
   DeleteRegKey HKLM "Software\Gpg4win\kleopatra"
-  DeleteRegValue HKLM "Software\RegisteredApplications" "Gpg4win.kleopatra.${VERSION}"
+  DeleteRegValue HKLM "Software\RegisteredApplications" "Gpg4win.kleopatra"
   DeleteRegValue HKLM "Software\Classes\.gpg" "gpg4win.AssocFile.kleopatra.GPG"
   DeleteRegValue HKLM "Software\Classes\.asc" "gpg4win.AssocFile.kleopatra.ASC"
   DeleteRegValue HKLM "Software\Classes\.pgp" "gpg4win.AssocFile.kleopatra.PGP"
@@ -219,6 +220,7 @@ Section "-un.kleopatra"
   DeleteRegValue HKLM "Software\Classes\.p7m" "gpg4win.AssocFile.kleopatra.CMS"
   DeleteRegValue HKLM "Software\Classes\.arl" "gpg4win.AssocFile.kleopatra.CMS"
   DeleteRegValue HKLM "Software\Classes\.crl" "gpg4win.AssocFile.kleopatra.CMS"
+  DeleteRegValue HKLM "Software\Classes\.crl" "gpg4win.AssocFile.kleopatra.CMS"
 
   DeleteRegKey /ifempty HKLM "Software\Classes\.gpg"
   DeleteRegKey /ifempty HKLM "Software\Classes\.asc"

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

Summary of changes:
 NEWS                      | 15 ++++++++++++++-
 doc/README.de.txt         |  7 +++++++
 doc/README.en.txt         |  6 ++++++
 packages/packages.current | 38 +++++++++++++++++++-------------------
 src/installer-finish.nsi  | 26 +++++++++++++++++++++-----
 src/uninst-gpa.nsi        |  3 ++-
 src/uninst-kleopatra.nsi  |  4 +++-
 7 files changed, 72 insertions(+), 27 deletions(-)


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

More information about the Gpg4win-commits mailing list