RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 11-Apr-2011 16:33:23 Branch: rpm-5_4 Handle: 2011041114332201 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/tests thkp.c Log: add more gpg keys to thkp.c test program Summary: Revision Changes Path 1.3501.2.112+1 -0 rpm/CHANGES 1.1.4.1 +14 -0 rpm/tests/thkp.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.111 -r1.3501.2.112 CHANGES --- rpm/CHANGES 11 Apr 2011 00:34:47 -0000 1.3501.2.111 +++ rpm/CHANGES 11 Apr 2011 14:33:22 -0000 1.3501.2.112 @@ -1,4 +1,5 @@ 5.4.0 -> 5.4.1: + - devzero2000: add more gpg keys to thkp.c test program - jbj: move multiarch* to mandriva.in. - jbj: put "devel(libfoo)" deps under RPM_VENDOR_MANDRIVA. - proyvind: merge multiarch-utils from mandriva. @@ . patch -p0 <<'@@ .' Index: rpm/tests/thkp.c ============================================================================ $ cvs diff -u -r1.1 -r1.1.4.1 thkp.c --- rpm/tests/thkp.c 23 May 2010 16:27:22 -0000 1.1 +++ rpm/tests/thkp.c 11 Apr 2011 14:33:23 -0000 1.1.4.1 @@ -49,6 +49,11 @@ "Fedora (11) <fed...@fedoraproject.org>", /* 0xd22e77f2 */ "0x57bbccba", /* Fedora (12) <fed...@fedoraproject.org> */ "0xe8e40fde", /* Fedora (13) <fed...@fedoraproject.org> */ + "0xfdb36b03", /* Fedora (14-s390x) <fed...@fedoraproject.org> */ + "0x97a1071f", /* Fedora (14) <fed...@fedoraproject.org> */ + "0x069c8460", /* Fedora (15) <fed...@fedoraproject.org> */ + "0x0608b895", /* EPEL (6) <e...@fedoraproject.org> */ + "0x217521f6", /* Fedora EPEL <e...@fedoraproject.org> */ /* --- IDMS 2010-05-22 */ "0x1edca302", /* IDMS Linux (Trunk) <gpgk...@idms-linux.org> */ /* --- CentOS 5.4 */ @@ -56,6 +61,15 @@ /* --- Mandriva */ "0x70771FF3", /* Mandriva Linux <mandr...@mandriva.com> */ "0x22458A98", /* Mandriva Security Team <secur...@mandriva.com> */ + "0x37017186", /* MandrakeCooker <coo...@linux-mandrake.com> */ + "0x78D019F5", /* MandrakeContrib <coo...@linux-mandrake.com */ +/* --- Ubuntu */ + "0x437D05B5", /* Ubuntu Archive Automatic Signing Key <ftpmas...@ubuntu.com> */ + "0xFBB75451", /* Ubuntu CD Image Automatic Signing Key <cdim...@ubuntu.com> */ +/* --- Debian */ + "0x55BE302B", /* Debian Archive Automatic Signing Key (5.0/lenny) <ftpmas...@debian.org> */ + "0x473041FA", /* Debian Archive Automatic Signing Key (6.0/squeeze) <ftpmas...@debian.org> */ + /* --- Caixa Magica */ "0xC45A42F1", /* Caixa Magica Repository <ge...@caixamagica.pt> */ /* --- rpmforge */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org