RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/lib/ package.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Tue 31 Jul 2007 - 18:34:58 CEST
Message-Id: <20070731163458.6BB4734844A@rpm5.org>
  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:   31-Jul-2007 18:34:58
  Branch: HEAD                             Handle: 2007073117345701

  Modified files:
    rpm                     CHANGES
    rpm/lib                 package.c

  Log:
    - query of packages w/o lead (using --nolead).

  Summary:
    Revision    Changes     Path
    1.1534      +1  -0      rpm/CHANGES
    2.141       +5  -0      rpm/lib/package.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1533 -r1.1534 CHANGES
  --- rpm/CHANGES	30 Jul 2007 19:42:58 -0000	1.1533
  +++ rpm/CHANGES	31 Jul 2007 16:34:57 -0000	1.1534
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: query of packages w/o lead (using --nolead).
       - jbj: --newmagic enabler to add new signature/metadata magic to headers.
       - jbj: nobrainer --nolead & --nosigh disablers.
       - jbj: get rid of convertdb1.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/package.c
  ============================================================================
  $ cvs diff -u -r2.140 -r2.141 package.c
  --- rpm/lib/package.c	16 Jul 2007 01:32:28 -0000	2.140
  +++ rpm/lib/package.c	31 Jul 2007 16:34:58 -0000	2.141
  @@ -39,6 +39,8 @@
   /*@unchecked@*/ /*@only@*/ /*@null@*/
   static unsigned int * keyids;
   
  +extern int _nolead;
  +
   /*@unchecked@*/
   static unsigned char header_magic[8] = {
           0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
  @@ -793,6 +795,8 @@
       (void) rpmswAdd(opsave, fdstat_op(fd, FDSTAT_READ));
   
       memset(l, 0, sizeof(*l));
  +    l->signature_type = RPMSIGTYPE_HEADERSIG;
  +if (!_nolead) {
       rc = readLead(fd, l);
       if (rc != RPMRC_OK)
   	goto exit;
  @@ -815,6 +819,7 @@
   	goto exit;
   	/*@notreached@*/ break;
       }
  +}
   
       /* Read the signature header. */
       msg = NULL;
  @@ .
Received on Tue Jul 31 18:34:58 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.