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:47:42 CEST
Message-Id: <20070731164742.CAB3034844A@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:47:42
  Branch: HEAD                             Handle: 2007073117474200

  Modified files:
    rpm                     CHANGES
    rpm/lib                 package.c

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

  Summary:
    Revision    Changes     Path
    1.1535      +1  -0      rpm/CHANGES
    2.142       +6  -0      rpm/lib/package.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1534 -r1.1535 CHANGES
  --- rpm/CHANGES	31 Jul 2007 16:34:57 -0000	1.1534
  +++ rpm/CHANGES	31 Jul 2007 16:47:42 -0000	1.1535
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: query of packages w/o lead/sigh (using --nolead --nosigh).
       - 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.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/package.c
  ============================================================================
  $ cvs diff -u -r2.141 -r2.142 package.c
  --- rpm/lib/package.c	31 Jul 2007 16:34:58 -0000	2.141
  +++ rpm/lib/package.c	31 Jul 2007 16:47:42 -0000	2.142
  @@ -40,6 +40,7 @@
   static unsigned int * keyids;
   
   extern int _nolead;
  +extern int _nosigh;
   
   /*@unchecked@*/
   static unsigned char header_magic[8] = {
  @@ -105,6 +106,9 @@
       const void * ptr;
       int xx;
   
  +    if (h == NULL || sigh == NULL)
  +	return;
  +
       for (hi = headerInitIterator(sigh);
           headerNextIterator(hi, &tag, &type, &ptr, &count);
           ptr = hfd(ptr, type))
  @@ -821,6 +825,7 @@
       }
   }
   
  +if (!_nosigh) {
       /* Read the signature header. */
       msg = NULL;
       rc = rpmReadSignature(fd, &sigh, l->signature_type, &msg);
  @@ -840,6 +845,7 @@
   	break;
       }
       msg = _free(msg);
  +}
   
   #define	_chk(_mask)	(sigtag == 0 && !(vsflags & (_mask)))
   
  @@ .
Received on Tue Jul 31 18:47:42 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.