[Gpg4win-commits] r1292 - in trunk: . patches/gnupg2-2.0.12

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-09-28 12:11:50 +0200 (Mon, 28 Sep 2009)
New Revision: 1292

Modified:
   trunk/NEWS
   trunk/patches/gnupg2-2.0.12/11-photoid-sk.patch
Log:
Fix the patch


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-09-28 08:36:21 UTC (rev 1291)
+++ trunk/NEWS	2009-09-28 10:11:50 UTC (rev 1292)
@@ -18,7 +18,7 @@
 GPA:          0.9.0
 GpgOL:        1.0.1
 GpgEX:        0.9.3
-Claws-Mail:   3.7.2
+Claws-Mail:   3.7.2cvs27
 Kompendium:   3.0.0-beta4
 ~~~~~~~~~~~~~~~
 

Modified: trunk/patches/gnupg2-2.0.12/11-photoid-sk.patch
===================================================================
--- trunk/patches/gnupg2-2.0.12/11-photoid-sk.patch	2009-09-28 08:36:21 UTC (rev 1291)
+++ trunk/patches/gnupg2-2.0.12/11-photoid-sk.patch	2009-09-28 10:11:50 UTC (rev 1292)
@@ -10,34 +10,19 @@
        (get_validity_string): Ditto.
 
 
-
-Index: g10/trustdb.c
-===================================================================
---- g10/trustdb.c       (revision 5159)
-+++ g10/trustdb.c       (working copy)
-@@ -1176,12 +1176,15 @@
- int
- get_validity_info (PKT_public_key *pk, PKT_user_id *uid)
+--- g10/trustdb.c.orig  2008-12-09 09:26:37.000000000 +0100
++++ g10/trustdb.c       2009-09-28 11:06:28.000000000 +0200
+@@ -1157,6 +1157,9 @@
  {
--    int trustlevel;
--
--    trustlevel = get_validity (pk, uid);
--    if( trustlevel & TRUST_FLAG_REVOKED )
--       return 'r';
--    return trust_letter ( trustlevel );
-+  int trustlevel;
-+  
-+  if (!pk)
-+    return '?';  /* Just in case a NULL PK is passed.  */
-+  
-+  trustlevel = get_validity (pk, uid);
-+  if ( (trustlevel & TRUST_FLAG_REVOKED) )
-+    return 'r';
-+  return trust_letter (trustlevel);
- }
+     int trustlevel;
  
- const char *
-@@ -1189,6 +1192,9 @@
++    if (!pk)
++        return '?';  /* Just in case a NULL PK is passed.  */
++
+     trustlevel = get_validity (pk, uid);
+     if( trustlevel & TRUST_FLAG_REVOKED )
+        return 'r';
+@@ -1168,6 +1171,9 @@
  {
    int trustlevel;