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:   20-Nov-2007 20:48:59
  Branch: HEAD                             Handle: 2007112019485801

  Modified files:
    rpm                     CHANGES
    rpm/lib                 package.c rpmchecksig.c rpmts.c

  Log:
    - jbj: use the fd attached pgpDig everywhere necessary.

  Summary:
    Revision    Changes     Path
    1.1855      +1  -0      rpm/CHANGES
    2.187       +4  -2      rpm/lib/package.c
    1.188       +1  -1      rpm/lib/rpmchecksig.c
    2.122       +2  -2      rpm/lib/rpmts.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1854 -r1.1855 CHANGES
  --- rpm/CHANGES	20 Nov 2007 19:24:00 -0000	1.1854
  +++ rpm/CHANGES	20 Nov 2007 19:48:58 -0000	1.1855
  @@ -1,4 +1,5 @@
   5.0a2 -> 5.0a3:
  +    - jbj: use the fd attached pgpDig everywhere necessary.
       - jbj: attach pgpDig to the fd being used to verify signatures.
       - jbj: splint fiddles for refcounted storage.
       - jbj: add refcounts to rpmwf and pgpDig, they're gonna be snarly.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/package.c
  ============================================================================
  $ cvs diff -u -r2.186 -r2.187 package.c
  --- rpm/lib/package.c	19 Nov 2007 21:50:18 -0000	2.186
  +++ rpm/lib/package.c	20 Nov 2007 19:48:59 -0000	2.187
  @@ -117,6 +117,9 @@
       }
   #endif
   
  +assert(dig != NULL);
  +    (void) fdSetDig(fd, dig);
  +
       /* Snapshot current I/O counters (cached persistent I/O reuses counters) */
       (void) rpmswAdd(opsave, fdstat_op(fd, FDSTAT_READ));
   
  @@ -222,7 +225,6 @@
   	goto exit;
       }
   
  -assert(dig != NULL);
       dig->nbytes = 0;
   
       /* Retrieve the tag parameters from the signature header. */
  @@ -232,7 +234,7 @@
   	goto exit;
       }
   /*@-noeffect@*/
  -    xx = pgpSetSig(rpmtsDig(ts), she->tag, she->t, she->p.ptr, she->c);
  +    xx = pgpSetSig(dig, she->tag, she->t, she->p.ptr, she->c);
   /*@=noeffect@*/
   
       switch (she->tag) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  ============================================================================
  $ cvs diff -u -r1.187 -r1.188 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c	20 Nov 2007 19:24:00 -0000	1.187
  +++ rpm/lib/rpmchecksig.c	20 Nov 2007 19:48:59 -0000	1.188
  @@ -1006,7 +1006,7 @@
   	    pgpDigClean(dig);
   
   /*@-noeffect@*/
  -	    xx = pgpSetSig(rpmtsDig(ts), she->tag, she->t, she->p.ptr, she->c);
  +	    xx = pgpSetSig(dig, she->tag, she->t, she->p.ptr, she->c);
   /*@=noeffect@*/
   
   	    switch (she->tag) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmts.c
  ============================================================================
  $ cvs diff -u -r2.121 -r2.122 rpmts.c
  --- rpm/lib/rpmts.c	19 Nov 2007 18:57:54 -0000	2.121
  +++ rpm/lib/rpmts.c	20 Nov 2007 19:48:59 -0000	2.122
  @@ -689,12 +689,12 @@
   
   rpmVSFlags rpmtsVSFlags(rpmts ts)
   {
  -    return pgpGetVSFlags(rpmtsDig(ts));
  +    return pgpGetVSFlags(ts->dig);
   }
   
   rpmVSFlags rpmtsSetVSFlags(rpmts ts, rpmVSFlags vsflags)
   {
  -    return pgpSetVSFlags(rpmtsDig(ts), vsflags);
  +    return pgpSetVSFlags(ts->dig, vsflags);
   }
   
   /*
  @@ .