RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   18-Nov-2007 23:33:21
  Branch: HEAD                             Handle: 2007111822332100

  Modified files:
    rpm                     CHANGES
    rpm/lib                 rpmchecksig.c

  Log:
    - jbj: fix: don't add RPMTAG_ARCH to pubkeys, pubkeys cannot be
    erased.

  Summary:
    Revision    Changes     Path
    1.1844      +1  -0      rpm/CHANGES
    1.183       +2  -0      rpm/lib/rpmchecksig.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1843 -r1.1844 CHANGES
  --- rpm/CHANGES	18 Nov 2007 19:51:26 -0000	1.1843
  +++ rpm/CHANGES	18 Nov 2007 22:33:21 -0000	1.1844
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +    - jbj: fix: don't add RPMTAG_ARCH to pubkeys, pubkeys cannot be erased.
       - jbj: fix: handle absolute paths to spec files again.
       - jbj: fix: don't attempt header sanity checks on pubkeys.
       - jbj: fix: don't loop on failed lookup by instance.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  ============================================================================
  $ cvs diff -u -r1.182 -r1.183 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c	17 Nov 2007 17:57:38 -0000	1.182
  +++ rpm/lib/rpmchecksig.c	18 Nov 2007 22:33:21 -0000	1.183
  @@ -593,6 +593,7 @@
       xx = hae(h, he, 0);
   #endif
   
  +#ifdef	NOTYET	/* XXX can't erase pubkeys with "pubkey" arch. */
       /* Add a "pubkey" arch/os to avoid missing value NULL ptrs. */
       he->tag = RPMTAG_ARCH;
       he->p.str = "pubkey";
  @@ -600,6 +601,7 @@
       he->tag = RPMTAG_OS;
       he->p.str = "pubkey";
       xx = hae(h, he, 0);
  +#endif
   
       he->tag = RPMTAG_LICENSE;
       he->p.str = license;
  @@ .