[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-23-g030afe5
by Werner Koch
cvs at cvs.gnupg.org
Wed Jul 10 17:01:19 CEST 2013
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 030afe59d7b4b390a7ec8b115f5b518d7280c928 (commit)
via 8d58961ae78a8b3c6d7a4eb4183d0528e256f0ef (commit)
from 6f84e049747615fb72a035fed1868a16c172eb13 (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 030afe59d7b4b390a7ec8b115f5b518d7280c928
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 10 15:25:45 2013 +0200
Remove the extra S/MIME readme page.
* src/installer.nsi: Remove the S/MIME configuration page.
--
The HOWTO is annyway installed and linked from the Gpg4win menu. No
need to annoy the user with an extra check+click page.
diff --git a/src/installer.nsi b/src/installer.nsi
index 1ec916a..1d33f84 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -175,15 +175,6 @@ Var STARTMENU_FOLDER
!insertmacro MUI_PAGE_INSTFILES
!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinalWarnings
-# SMIME configuration page
-!define MUI_PAGE_HEADER_TEXT "$(T_SMIMEHeaderText)"
-!define MUI_PAGE_HEADER_SUBTEXT "$(T_SMIMEHeaderSubtext)"
-!define MUI_LICENSEPAGE_TEXT_TOP "$(T_SMIMETextTop)"
-!define MUI_LICENSEPAGE_TEXT_BOTTOM "$(T_SMIMETextBottom)"
-!define MUI_LICENSEPAGE_CHECKBOX
-!define MUI_LICENSEPAGE_CHECKBOX_TEXT "$(T_SMIMECheckboxText)"
-!insertmacro MUI_PAGE_LICENSE $(T_HowtoSmimeFile)
-
# Finish page
!define MUI_FINISHPAGE_SHOWREADME "share\gpg4win\README.$(T_LangCode).txt"
!define MUI_FINISHPAGE_SHOWREADME_TEXT "$(T_ShowReadme)"
@@ -515,40 +506,6 @@ LangString T_FoundExistingVersionB ${LANG_ENGLISH} \
$\r$\n\
Do you want to continue installing Gpg4win?"
-#---------------------------------------------------
-# Strings pertaining to the SMIME configuration page
-#---------------------------------------------------
-LangString T_SMIMEHeaderText ${LANG_ENGLISH} \
- "Define trustable root certificates"
-LangString T_SMIMEHeaderSubtext ${LANG_ENGLISH} \
- "S/MIME configuration"
-LangString T_SMIMETextTop ${LANG_ENGLISH} \
- "Gpg4win needs a list of root certificates which you trust."
-LangString T_SMIMETextBottom ${LANG_ENGLISH} \
- "Therewith you can use S/MIME, the configuration is stringently \
- required. Skip this configuration only if you don't want to use \
- S/MIME."
-LangString T_SMIMECheckboxText ${LANG_ENGLISH} \
- "Root certificate defined or skip configuration"
-
-LicenseLangString T_HowtoSmimeFile ${LANG_GERMAN} \
- "${BUILD_DIR}/HOWTO-SMIME.de.txt"
-LicenseLangString T_HowtoSmimeFile ${LANG_ENGLISH} \
- "${BUILD_DIR}/HOWTO-SMIME.en.txt"
-LicenseLangString T_HowtoSmimeFile ${LANG_FRENCH} \
- "${BUILD_DIR}/HOWTO-SMIME.en.txt"
-LicenseLangString T_HowtoSmimeFile ${LANG_SPANISH} \
- "${BUILD_DIR}/HOWTO-SMIME.en.txt"
-LicenseLangString T_HowtoSmimeFile ${LANG_PORTUGUESE} \
- "${BUILD_DIR}/HOWTO-SMIME.en.txt"
-LicenseLangString T_HowtoSmimeFile ${LANG_CZECH} \
- "${BUILD_DIR}/HOWTO-SMIME.en.txt"
-LicenseLangString T_HowtoSmimeFile ${LANG_ARABIC} \
- "${BUILD_DIR}/HOWTO-SMIME.en.txt"
-LicenseLangString T_HowtoSmimeFile ${LANG_RUSSIAN} \
- "${BUILD_DIR}/HOWTO-SMIME.en.txt"
-LicenseLangString T_HowtoSmimeFile ${LANG_ITALIAN} \
- "${BUILD_DIR}/HOWTO-SMIME.en.txt"
#---------------------------------------------
# From the old installation checking functions
commit 8d58961ae78a8b3c6d7a4eb4183d0528e256f0ef
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 10 15:18:00 2013 +0200
Bump version number for the next release.
--
Also cleaned up the README files.
diff --git a/NEWS b/NEWS
index 2afcf99..ddac74b 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
-Noteworthy changes in version 2.1.2 (unreleased)
+Noteworthy changes in version 2.2.0 (unreleased)
------------------------------------------------
(en) GpgEx does now work on 64 bit Windows.
diff --git a/configure.ac b/configure.ac
index c700dd0..a3ccdb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.9.3"
# commit and push so that the git magic is able to work.
#
# After a release the make target "copy-news" is to be called as well!
-m4_define([my_version], [2.1.2])
+m4_define([my_version], [2.2.0])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
diff --git a/doc/README.de.txt b/doc/README.de.txt
index 6bc4f5c..cb07ba2 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -43,10 +43,6 @@ Gpg4win unterst
* MS Outlook: 2003, 2007
-Wichtig: Das Explorer-Plugin 'GpgEX' bietet aktuell keine
- Unterstützung für 64-bit Explorer!
- (Details in Abschnitt 3, Punkt "Probleme unter Windows x64")
-
2. Änderungen
=============
@@ -63,7 +59,7 @@ Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
* aktualisiert auf Kleopatra 2.1.1 (aus KDE 4.10.3)
* Defekte in None-Latin-Umgebungen behoben
* zahlreiche Stabilitätsverbesserungen
-
+
- Qt:
* aktualisiert von Qt 4.4.0 auf 4.8.4
* zahlreiche UI-Verbesserungen in Kleopatra
@@ -72,7 +68,7 @@ Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
- GnuPG-Backend:
* aktualisiert auf gnupg 2.0.20
* diverse Bibliotheken aktualisiert (u.a. gpgme, dirmngr,
- libassuan, libgcrypt, libgpg-error, libksba, pinentry,
+ libassuan, libgcrypt, libgpg-error, libksba, pinentry,
libpng u.v.m - siehe Datei 'packages.current' im Gpg4win-Repository)
* GPGPME bug behoben, der zu Hänger von Kleopatra führte
@@ -138,10 +134,6 @@ Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
(Hinweis: Beim verwenden von SMTP sollte das Senden
mit GpgOL funktionieren.)
- * Outlook2007 stürzt beim Öffnen von Anhängen einer
- verschlüsselten Nachricht ab
- [siehe https://bugs.g10code.com/gnupg/issue1110]
-
* Verschlüsselte E-Mails unverschlüsselt auf E-Mail-Server:
Es kann vorkommen, dass Teile von verschlüsselten E-Mails
in entschlüsselter/unverschlüsselter Form auf dem E-Mail-Server
@@ -153,30 +145,6 @@ Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
aber es kann trotzdem noch passieren.
Eine Lösung hierfür ist in Arbeit.
-- Verwendung von GpgEX:
-
- * Es kann teilweise vorkommen, dass beim Versuch Dateien mit GpgEX
- aus dem Explorer zu signieren/verschlüsseln bzw. zu entschlüsseln/prüfen,
- Kleopatra und das aktive Explorerfenster nicht mehr reagiert.
- Sie sollten Kleopatra dann über den Task-Manager beendet und die
- Datei-Krypto-Opteration nicht über GpgEX sondern direkt über
- Kleopatra (per Datei-Menü) ausführen.
-
- * Probleme unter Windows x64:
- GpgEX ist eine (32bit) Erweiterung für den (32bit) Windows
- Explorer und läuft _nicht_ in einem 64bit Explorer
- (= voreingestellter Explorer in einem Windows 64bit System).
-
- Abhilfe: Starten Sie den 32bit Explorer, um GpgEX nutzen zu können.
- Klicken Sie auf "Start" -> "Ausführen" und geben Sie folgenden
- Befehl ein:
- C:\windows\syswow64\explorer.exe /separate
- Beachten Sie, dass Sie ggf. den Pfad zu Ihrer x64-basierten
- Version von Windows anpassen müssen.
- Dieser 'separate'-Aufruf ist aktuell in Windows7/64bit defekt.
- Alternativ können Sie die Datei-Krypto-Operationen von GpgEX
- auch direkt über das Datei-Menü von Kleopatra erreichen.
-
4. Installation
===============
diff --git a/doc/README.en.txt b/doc/README.en.txt
index f407ecc..b0ab893 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -40,9 +40,6 @@ Gpg4win supports these platforms:
* MS Outlook: 2003, 2007
-Note: Currently, there is no 64-bit support for GpgEX
- (see section 3, "Using GpgEX with Windows x64", for details)
-
2. Changes
==========
@@ -59,16 +56,16 @@ New in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
* Updated to Kleopatra 2.1.1 (from KDE 4.10.3).
* Fixed bugs in none latin environments.
* Several minor and medium improvements of stability.
-
+
- Qt:
- * Updated to 4.8.4 (from Qt 4.4.0) with a lot of
+ * Updated to 4.8.4 (from Qt 4.4.0) with a lot of
improvements in Kleopatra UI.
* Improved support for Windows7 and Windows8.
- GnuPG-Backend:
* Updated to gnupg 2.0.20.
* Updated most included packages to recent versions (e.g. gpgme,
- dirmngr, libassuan, libgcrypt, libgpg-error, libksba, pinentry,
+ dirmngr, libassuan, libgcrypt, libgpg-error, libksba, pinentry,
libpng and much more - see 'packages.current' file in Gpg4win git
repository).
* Fixed a long standing bug in GPGME which led to spurious Kleopatra
@@ -131,9 +128,6 @@ New in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
[see https://bugs.g10code.com/gnupg/issue1102]
(Please note: Using SMTP with GpgOL and Exchange seems to be work.)
- * Outlook2007 crashes after opening attachments of an encrypted message
- [see https://bugs.g10code.com/gnupg/issue1110]
-
* Encrypted E-Mails occuring un-encrypted on the email server: It
can happen that parts of encrypted emails are copied to your email
server (IMAP or MAPI) in un-encrypted/decrypted form when creating
@@ -143,28 +137,6 @@ New in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
probability of this to happen, but not eliminate the issue.
A solution is being worked on.
-- Using GpgEX with 64 bit versions Windows:
-
- * In some cases sign/encrypt or decrypt/verify via GpgEX doesn't work
- correctly (Kleopatra freezed). Then you should kill Kleopatra via
- task manager and run the file crypto operation directly in Kleopatra
- (see file menu).
-
- * Problems with Windows x64:
- GpgEX is a (32bit) plugin for the (32bit) Windows
- Explorer and it does _not_ run in a 64bit Explorer
- (= default for a Windows 64bit system).
-
- Workaround: Run the 32bit Explorer to use GpgEX.
- Click "Start" -> "Run", type the following in the box, and then
- click OK:
- C:\windows\syswow64\explorer.exe /separate
- Note: Adjust the path to your x64-based version of Windows if
- necessary.
- This 'separate' command seems to be currently broken in Windows7/64bit.
- Alternatively you can use the file crypto operations of GpgEX
- directly via the file menu of Kleopatra.
-
4. Installation
===============
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
configure.ac | 2 +-
doc/README.de.txt | 36 ++----------------------------------
doc/README.en.txt | 34 +++-------------------------------
src/installer.nsi | 43 -------------------------------------------
5 files changed, 7 insertions(+), 110 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list