[Gpg4win-commits] r1173 - in trunk: . patches patches/gnupg2-2.0.12 src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Jun 18 17:37:42 CEST 2009
Author: werner
Date: 2009-06-18 17:37:42 +0200 (Thu, 18 Jun 2009)
New Revision: 1173
Added:
trunk/patches/gnupg2-2.0.12/
trunk/patches/gnupg2-2.0.12/01-scd-pw2.patch
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/NEWS
trunk/configure.ac
trunk/src/Makefile.am
Log:
Argg, need a fix for the new GnuPG release.
Removed unneeded infos about beta releases.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-06-17 15:00:09 UTC (rev 1172)
+++ trunk/ChangeLog 2009-06-18 15:37:42 UTC (rev 1173)
@@ -1,3 +1,9 @@
+2009-06-18 Werner Koch <wk at g10code.com>
+
+ * NEWS: Remove unneeded info about the 1.9 beta releases.
+
+ * patches/gnupg2-2.0.9/01-scd-pw2.patch: New.
+
2009-06-17 Emanuel Schuetze <emanuel.schuetze at intevation.de>
* packages/packages.current: Update kdesupport.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-06-17 15:00:09 UTC (rev 1172)
+++ trunk/Makefile.am 2009-06-18 15:37:42 UTC (rev 1173)
@@ -42,6 +42,7 @@
patches/gnupg2-2.0.9/03-i18n+etc.patch \
patches/gnupg2-2.0.9/04-ks-w32init.patch \
patches/gnupg2-2.0.9/05-w32-http.patch \
+ patches/gnupg2-2.0.9/01-scd-pw2.patch \
patches/gpgol-0.9.91/01-gpgme.patch \
patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch \
patches/claws-mail-3.7.1/02-3.7.1cvs22.patch \
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-06-17 15:00:09 UTC (rev 1172)
+++ trunk/NEWS 2009-06-18 15:37:42 UTC (rev 1173)
@@ -3,20 +3,22 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
-Noteworthy changes in version 1.9.17
+Noteworthy changes in version 2.0.0
---------------------------------------------------
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
+(en) First production release of this major redesign. Over the last
+ 14 months we did 15 beta releases and hopefully squashed most of
+ the serious bugs.
+(de) Dies ist das erste produktionsreife Version der neuen Gpg4win
+ Architektur. In den vergangenen 14 Monaten wurden 15 Beta
+ Versionen veröffentlich um die meisten der gravierenden
+ Programmfehler zu beseitigen.
~~~~~~~~~~~~~~~
GnuPG: 2.0.12
-DirMngr: 1.0.3-svn310
+DirMngr: 1.0.3
Kleopatra: 20090514
-GPA: 0.9.0-svn1001
+GPA: 0.9.0
GpgOL: 0.10.19
GpgEX: 0.9.2
Claws-Mail: 3.7.1
@@ -24,348 +26,7 @@
~~~~~~~~~~~~~~~
-Noteworthy changes in version 1.9.16 (2009-05-14)
----------------------------------------------------
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.12-svn5008
-DirMngr: 1.0.3-svn310
-Kleopatra: 20090514
-GPA: 0.9.0-svn994
-GpgOL: 0.10.19
-GpgEX: 0.9.2
-Claws-Mail: 3.7.1
-Kompendium: 3.0.0-beta1-svn1118
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.15 (2009-03-25)
--------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.12-svn4966
-DirMngr: 1.0.3-svn310
-Kleopatra: 20090324
-GPA: 0.8.0
-GpgOL: 0.10.19
-GpgEX: 0.9.2
-Claws-Mail: 3.7.0
-Kompendium: 3.0.0-beta1-svn1118
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.14 (2009-03-03)
--------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.11
-DirMngr: 1.0.3-svn310
-Kleopatra: 20090302
-GPA: 0.8.0
-GpgOL: 0.10.19
-GpgEX: 0.9.2
-Claws-Mail: 3.7.0
-Kompendium: 3.0.0-beta1-svn1118
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.13 (2008-12-02)
--------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn4880
-DirMngr: 1.0.3-svn310
-Kleopatra: 20081128
-GPA: 0.8.0
-GpgOL: 0.10.18-svn290
-GpgEX: 0.9.1
-Claws-Mail: 3.6.1cvs47
-Kompendium: 3.0.0-beta
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.12 (2008-11-18)
--------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn4870
-DirMngr: 1.0.3-svn310
-Kleopatra: 20081117
-GPA: 0.8.0
-GpgOL: 0.10.17
-GpgEX: 0.9.1
-Claws-Mail: 3.6.1cvs32
-Kompendium: 3.0.0-beta
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.11 (2008-11-11)
--------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn4870
-DirMngr: 1.0.3-svn310
-Kleopatra: 20081111
-GPA: 0.8.0
-GpgOL: 0.10.16
-GpgEX: 0.9.1
-Claws-Mail: 3.6.1cvs20
-Kompendium: 3.0.0-beta
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.9 (2008-10-29)
-------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn4870
-DirMngr: 1.0.3-svn309
-Kleopatra: 20081007-3
-GPA: 0.8.0
-GpgOL: 0.10.15
-GpgEX: 0.9.1
-Claws-Mail: 3.6.0cvs7
-Kompendium: 3.0.0-beta
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.8 (2008-10-08)
-------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn4835
-DirMngr: 1.0.3-svn309
-Kleopatra: 20081007-3
-GPA: 0.8.0
-GpgOL: 0.10.15
-GpgEX: 0.9.1
-Claws-Mail: 3.6.0cvs7
-Kompendium: 3.0.0-beta
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.7 (2008-09-09)
-------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn4809
-DirMngr: 1.0.3-svn307
-Kleopatra: 20080908-2
-GPA: 0.8.0
-GpgOL: 0.10.15
-GpgEX: 0.9.1
-Claws-Mail: 3.4.0
-Kompendium: 3.0.0-beta
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.6 (2008-08-11)
-------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn4809
-DirMngr: 1.0.3-svn307
-Kleopatra: 20080811-6
-GPA: 0.7.7-svn899
-GpgOL: 0.10.15
-GpgEX: 0.9.0
-Claws-Mail: 3.4.0
-Novices: 1.0.0
-Einsteiger: 2.0.2
-Durchblicker: 2.0.2
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.5 (2008-07-21)
-------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn4797
-DirMngr: 1.0.2-svn302
-Kleopatra: 20080718
-GPA: 0.7.7-svn899
-GpgOL: 0.10.15-svn260
-GpgEX: 0.9.0
-Claws-Mail: 3.4.0
-Novices: 1.0.0
-Einsteiger: 2.0.2
-Durchblicker: 2.0.2
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.4 (2008-07-09)
-------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-(en) Global configuration is now stored below CSIDL_COMMON_APPDATA\GNU
- and not anymore below the installation directory. Similar to
- user setttings, these configuration files are not removed or
- overwritten during an uninstall or an reinstall.
-
-
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.0.10-svn4797
-DirMngr: 1.0.2-svn302
-Kleopatra: 20080706
-GPA: 0.7.7-svn899
-GpgOL: 0.10.15-svn260
-GpgEX: 0.9.0
-Claws-Mail: 3.4.0
-Novices: 1.0.0
-Einsteiger: 2.0.2
-Durchblicker: 2.0.2
-~~~~~~~~~~~~~~~
-
- (1.9.3 was not published)
-
-
-Noteworthy changes in version 1.9.2 (2008-05-28)
-------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 1.4.9
-GnuPG2: 2.0.10-svn4773
-DirMngr: 1.0.2-svn299
-Kleopatra: 20080526-2
-GPA: 0.7.7-svn897
-GpgOL: 0.10.14
-GpgEX: 0.9.0
-WinPT: 1.2.0
-Claws-Mail: 3.4.0
-Novices: 1.0.0
-Einsteiger: 2.0.2
-Durchblicker: 2.0.2
-~~~~~~~~~~~~~~~
-
-
-Noteworthy changes in version 1.9.1 (2008-05-13)
-------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 1.4.9
-GnuPG2: 2.0.10-svn4762
-DirMngr: 1.0.2-svn297
-Kleopatra: 20080512
-GPA: 0.7.7-svn859
-GpgOL: 0.10.13
-GpgEX: 0.9.0
-WinPT: 1.2.0
-Claws-Mail: 3.4.0
-Novices: 1.0.0
-Einsteiger: 2.0.2
-Durchblicker: 2.0.2
-~~~~~~~~~~~~~~~
-
-
-
-Noteworthy changes in version 1.9.0 (2008-04-23)
-------------------------------------------------
-
-(en) This is a BETA version of the new Gpg4win/2 architecture.
- This version shall not be used in a production environment.
-(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
- Diese Version soll nicht in einer Produktivumgebung
- eingesetzt werden.
-
-~~~~~~~~~~~~~~~
-GnuPG: 1.4.9
-GnuPG2: 2.0.9
-DirMngr: 1.0.2-svn297
-Kleopatra: 20080421
-GPA: 0.7.7-svn859
-GpgOL: 0.10.12
-GpgEX: 0.9.0
-WinPT: 1.2.0
-Claws-Mail: 3.1.0cvs70
-Novices: 1.0.0
-Einsteiger: 2.0.2
-Durchblicker: 2.0.2
-~~~~~~~~~~~~~~~
-
-
Noteworthy changes in version 1.1.3 (2007-09-17)
------------------------------------------------
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-06-17 15:00:09 UTC (rev 1172)
+++ trunk/configure.ac 2009-06-18 15:37:42 UTC (rev 1173)
@@ -25,7 +25,7 @@
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
# Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.9.17])
+m4_define([my_version], [2.0.0])
m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
Added: trunk/patches/gnupg2-2.0.12/01-scd-pw2.patch
===================================================================
--- trunk/patches/gnupg2-2.0.12/01-scd-pw2.patch 2009-06-17 15:00:09 UTC (rev 1172)
+++ trunk/patches/gnupg2-2.0.12/01-scd-pw2.patch 2009-06-18 15:37:42 UTC (rev 1173)
@@ -0,0 +1,109 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+scd/
+2009-06-18 Werner Koch <wk at g10code.com>
+
+ * app-openpgp.c (verify_chv2): Remove special case for v2 cards.
+ (get_public_key): Use extended mode.
+
+
+Index: scd/app-openpgp.c
+===================================================================
+--- scd/app-openpgp.c (revision 5047)
++++ scd/app-openpgp.c (working copy)
+@@ -1118,11 +1118,25 @@
+
+ if (app->card_version > 0x0100)
+ {
++ int exmode, le_value;
++
+ /* We may simply read the public key out of these cards. */
++ if (app->app_local->cardcap.ext_lc_le)
++ {
++ exmode = 1; /* Use extended length. */
++ le_value = app->app_local->extcap.max_rsp_data;
++ }
++ else
++ {
++ exmode = 0;
++ le_value = 256; /* Use legacy value. */
++ }
++
+ err = iso7816_read_public_key
+- (app->slot, 0, (const unsigned char*)(keyno == 0? "\xB6" :
+- keyno == 1? "\xB8" : "\xA4"), 2,
+- 0,
++ (app->slot, exmode,
++ (const unsigned char*)(keyno == 0? "\xB6" :
++ keyno == 1? "\xB8" : "\xA4"), 2,
++ le_value,
+ &buffer, &buflen);
+ if (err)
+ {
+@@ -1579,43 +1593,31 @@
+ char *pinvalue;
+
+ if (app->did_chv2)
+- return 0; /* We already verified CHV2 (PW1 for v2 cards). */
++ return 0; /* We already verified CHV2. */
+
+- if (app->app_local->extcap.is_v2)
++ rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue);
++ if (rc)
++ return rc;
++ app->did_chv2 = 1;
++
++ if (!app->did_chv1 && !app->force_chv1 && pinvalue)
+ {
+- /* Version two cards don't have a CHV2 anymore. We need to
+- verify CHV1 (now called PW1) instead. */
+- rc = verify_a_chv (app, pincb, pincb_arg, 1, 0, &pinvalue);
++ /* For convenience we verify CHV1 here too. We do this only if
++ the card is not configured to require a verification before
++ each CHV1 controlled operation (force_chv1) and if we are not
++ using the keypad (PINVALUE == NULL). */
++ rc = iso7816_verify (app->slot, 0x81, pinvalue, strlen (pinvalue));
++ if (gpg_err_code (rc) == GPG_ERR_BAD_PIN)
++ rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED);
+ if (rc)
+- return rc;
+- app->did_chv2 = 1;
+- }
+- else
+- {
+- /* Version 1 cards only. */
+- rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue);
+- if (rc)
+- return rc;
+- app->did_chv2 = 1;
+-
+- if (!app->did_chv1 && !app->force_chv1 && pinvalue)
+ {
+- /* For convenience we verify CHV1 here too. We do this only
+- if the card is not configured to require a verification
+- before each CHV1 controlled operation (force_chv1) and if
+- we are not using the keypad (PINVALUE == NULL). */
+- rc = iso7816_verify (app->slot, 0x81, pinvalue, strlen (pinvalue));
+- if (gpg_err_code (rc) == GPG_ERR_BAD_PIN)
+- rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED);
+- if (rc)
+- {
+- log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc));
+- flush_cache_after_error (app);
+- }
+- else
+- app->did_chv1 = 1;
++ log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc));
++ flush_cache_after_error (app);
+ }
++ else
++ app->did_chv1 = 1;
+ }
++
+ xfree (pinvalue);
+
+ return rc;
+
+
Property changes on: trunk/patches/gnupg2-2.0.12/01-scd-pw2.patch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-06-17 15:00:09 UTC (rev 1172)
+++ trunk/src/Makefile.am 2009-06-18 15:37:42 UTC (rev 1173)
@@ -114,7 +114,8 @@
done ; \
for i in `$(tsdir)/src/potomo --get-linguas $$$${pkgsdir}/po` ; do \
$(mkdir_p) $$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES || true; \
- rm $$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES/gnupg2.mo || true; \
+ rm $$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES/gnupg2.mo 2>/dev/null \
+ || true; \
$(tsdir)/src/potomo $$$${pkgsdir}/po/$$$${i}.po \
$$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES/gnupg2.mo; \
done)
@@ -148,7 +149,8 @@
# libgpg-error proper.
define gpg4win_pkg_libgpg_error_post_install
(for i in `$(tsdir)/src/potomo --get-linguas $$$${pkgsdir}/po` ; do \
- rm $$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES/libgpg-error.mo || true; \
+ rm $$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES/libgpg-error.mo \
+ 2>/dev/null|| true; \
$(tsdir)/src/potomo $$$${pkgsdir}/po/$$$${i}.po \
$$$${pkgidir}/share/locale/$$$${i}/LC_MESSAGES/libgpg-error.mo; \
done)
More information about the Gpg4win-commits
mailing list