- drop upstreamed gpgme-1.1.0-tests.patch
This commit is contained in:
Rex Dieter 2006-03-03 13:00:38 +00:00
parent 565b1b981f
commit 1903542304
4 changed files with 10 additions and 84 deletions

View File

@ -1,2 +1,2 @@
gpgme-1.1.0.tar.bz2
gpgme-1.1.0.tar.bz2.sig
gpgme-1.1.2.tar.bz2
gpgme-1.1.2.tar.bz2.sig

View File

@ -1,74 +0,0 @@
--- 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@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@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++;
--- gpgme-1.1.0/tests/gpg/t-sig-notation.c.tests 2005-09-30 21:06:08.000000000 -0500
+++ gpgme-1.1.0/tests/gpg/t-sig-notation.c 2005-10-11 09:24:40.000000000 -0500
@@ -42,8 +42,8 @@
{ "laughing@me",
"Just Squeeze Me",
GPGME_SIG_NOTATION_HUMAN_READABLE },
- { "leave@home",
- "Right Now",
+ { "preferred-email-encoding@pgp.com",
+ "pgpmime",
GPGME_SIG_NOTATION_HUMAN_READABLE | GPGME_SIG_NOTATION_CRITICAL },
{ NULL,
"http://www.gnu.org/policy/",

View File

@ -1,8 +1,8 @@
Name: gpgme
Summary: GnuPG Made Easy - high level crypto API
Version: 1.1.0
Release: 3%{?dist}.2
Version: 1.1.2
Release: 1%{?dist}
License: LGPL
Group: Applications/System
@ -11,8 +11,6 @@ Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: gpgme-1.1.0-tests.patch
BuildRequires: gnupg >= 1.2.2
BuildRequires: gnupg2 >= 1.9.6
BuildRequires: libgpg-error-devel >= 0.5
@ -43,8 +41,6 @@ Requires(postun): /sbin/install-info
%prep
%setup -q
%patch1 -p1 -b .tests
%build
%configure \
@ -99,6 +95,10 @@ fi
%changelog
* Fri Mar 3 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-1
- 1.1.2
- drop upstreamed gpgme-1.1.0-tests.patch
* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- fc5: gcc/glibc respin

View File

@ -1,2 +1,2 @@
9d75ad0d604918bbf8e1ca5ed11ab195 gpgme-1.1.0.tar.bz2
b0af886d384bacfee4af6fa835f27b5b gpgme-1.1.0.tar.bz2.sig
7c2333679035a5f37e99630a156a40ca gpgme-1.1.2.tar.bz2
5b786d78d322ea0778eea5ae67c087b4 gpgme-1.1.2.tar.bz2.sig