rpms/gpgme/FC-3 gpgme-1.0.3-tests.patch, NONE, 1.1 gpgme.spec, 1.7, 1.8

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gpgme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11526/FC-3

Modified Files:
	gpgme.spec 
Added Files:
	gpgme-1.0.3-tests.patch 
Log Message:
* Tue Dec 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.3-2
- tests.patch so 'make check' passes


gpgme-1.0.3-tests.patch:

--- NEW FILE gpgme-1.0.3-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "<certify at pca.dfn.de>", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "<certify at pca.dfn.de>", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/gpgme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gpgme.spec	6 Dec 2005 13:48:43 -0000	1.7
+++ gpgme.spec	6 Dec 2005 14:05:22 -0000	1.8
@@ -2,7 +2,7 @@
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group:   Applications/System
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: gpgme-1.0.2-macro.patch
+Patch1: gpgme-1.0.3-tests.patch
 
 BuildRequires: gnupg >= 1.2.2
 BuildRequires: gnupg2 >= 1.9.6
@@ -43,7 +44,8 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .tests
+%patch0 -p0 -b .macro
+%patch1 -p1 -b .tests
 
 
 %build
@@ -63,8 +65,7 @@
 
 
 %check || :
-# expect t-keylist failure, reported upstream
-make check ||:
+make check
 
 
 %clean
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Tue Dec 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.3-2
+- tests.patch so 'make check' passes
+
 * Mon Aug  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.0.3-1
 - 1.0.3
 - --disable-static