[svn] GnuPG - r5047 - in trunk: . doc g10 po

[svn author wk]

Author: wk
Date: 2009-06-17 13:18:26 +0200 (Wed, 17 Jun 2009)
New Revision: 5047

Modified:
   trunk/NEWS
   trunk/configure.ac
   trunk/doc/help.txt
   trunk/g10/ChangeLog
   trunk/g10/parse-packet.c
   trunk/po/be.po
   trunk/po/ca.po
   trunk/po/cs.po
   trunk/po/da.po
   trunk/po/de.po
   trunk/po/el.po
   trunk/po/eo.po
   trunk/po/es.po
   trunk/po/et.po
   trunk/po/fi.po
   trunk/po/fr.po
   trunk/po/gl.po
   trunk/po/hu.po
   trunk/po/id.po
   trunk/po/it.po
   trunk/po/ja.po
   trunk/po/nb.po
   trunk/po/pl.po
   trunk/po/pt.po
   trunk/po/pt_BR.po
   trunk/po/ro.po
   trunk/po/ru.po
   trunk/po/sk.po
   trunk/po/sv.po
   trunk/po/tr.po
   trunk/po/zh_CN.po
   trunk/po/zh_TW.po
Log:
Preparing for 2.0.12.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2009-06-17 10:51:55 UTC (rev 5046)
+++ trunk/g10/ChangeLog	2009-06-17 11:18:26 UTC (rev 5047)
@@ -1,5 +1,8 @@
 2009-06-17  Werner Koch  <wk at g10code.com>
 
+	* parse-packet.c (parse): Use a casted -1 instead of a 32 bit
+	constant to check for a garbled package.  Fixes bug#1040.
+
 	* card-util.c (put_data_to_file, read_cert): New. 
 	(card_edit): Add command "readcert".
 	(fetch_url): Allow code also for this gnupg major version 2.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-06-17 10:51:55 UTC (rev 5046)
+++ trunk/NEWS	2009-06-17 11:18:26 UTC (rev 5047)
@@ -1,8 +1,6 @@
-Noteworthy changes in version 2.0.12 (not released)
+Noteworthy changes in version 2.0.12 (2009-06-17)
 -------------------------------------------------
 
- This is a BETA version!
-
  * GPGSM now always lists ephemeral certificates if specified by
    fingerprint or keygrip.
 
@@ -10,10 +8,10 @@
    information about smartcards.
 
  * Made sure not to leak file descriptors if running gpg-agent with a
-   command.  Restores the signal mask to solve a problem in Mono.
+   command.  Restore the signal mask to solve a problem in Mono.
 
  * Changed order of the confirmation questions for root certificates
-   and stores negative answers in trustlist.txt.
+   and store negative answers in trustlist.txt.
 
  * Better synchronization of concurrent smartcard sessions.
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-06-17 10:51:55 UTC (rev 5046)
+++ trunk/configure.ac	2009-06-17 11:18:26 UTC (rev 5047)
@@ -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.
 m4_define([my_version], [2.0.12])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))

Modified: trunk/doc/help.txt
===================================================================
--- trunk/doc/help.txt	2009-06-17 10:51:55 UTC (rev 5046)
+++ trunk/doc/help.txt	2009-06-17 11:18:26 UTC (rev 5047)
@@ -168,6 +168,7 @@
 
 .gpg.keygen.name
 Enter the name of the key holder. 
+The characters "<" and ">" are not allowed.
 Example: Heinrich Heine
 .
 
@@ -179,6 +180,7 @@
 
 .gpg.keygen.comment
 Please enter an optional comment.
+The characters "(" and ")" are not allowed.
 In general there is no need for a comment.
 .
 

Modified: trunk/g10/parse-packet.c
===================================================================
--- trunk/g10/parse-packet.c	2009-06-17 10:51:55 UTC (rev 5046)
+++ trunk/g10/parse-packet.c	2009-06-17 11:18:26 UTC (rev 5047)
@@ -501,8 +501,8 @@
 	  }
       }
 
-    if (pktlen == 0xffffffff) {
-        /* with a some probability this is caused by a problem in the
+    if (pktlen == (unsigned long)(-1)) {
+        /* With some probability this is caused by a problem in the
          * the uncompressing layer - in some error cases it just loops
          * and spits out 0xff bytes. */
         log_error ("%s: garbled packet detected\n", iobuf_where(inp) );

Modified: trunk/po/be.po  [not shown]
Modified: trunk/po/ca.po  [not shown]
Modified: trunk/po/cs.po  [not shown]
Modified: trunk/po/da.po  [not shown]
Modified: trunk/po/de.po  [not shown]
Modified: trunk/po/el.po  [not shown]
Modified: trunk/po/eo.po  [not shown]
Modified: trunk/po/es.po  [not shown]
Modified: trunk/po/et.po  [not shown]
Modified: trunk/po/fi.po  [not shown]
Modified: trunk/po/fr.po  [not shown]
Modified: trunk/po/gl.po  [not shown]
Modified: trunk/po/hu.po  [not shown]
Modified: trunk/po/id.po  [not shown]
Modified: trunk/po/it.po  [not shown]
Modified: trunk/po/ja.po  [not shown]
Modified: trunk/po/nb.po  [not shown]
Modified: trunk/po/pl.po  [not shown]
Modified: trunk/po/pt.po  [not shown]
Modified: trunk/po/pt_BR.po  [not shown]
Modified: trunk/po/ro.po  [not shown]
Modified: trunk/po/ru.po  [not shown]
Modified: trunk/po/sk.po  [not shown]
Modified: trunk/po/sv.po  [not shown]
Modified: trunk/po/tr.po  [not shown]
Modified: trunk/po/zh_CN.po  [not shown]
Modified: trunk/po/zh_TW.po  [not shown]