RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/lib/ depends.c psm.c rpmfi.c rpmrollback.c...

From: Jeff Johnson <jbj@rpm5.org>
Date: Thu 06 Sep 2007 - 01:08:01 CEST
Message-Id: <20070905230801.8E78034845E@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:   06-Sep-2007 01:08:01
  Branch: HEAD                             Handle: 2007090600080001

  Modified files:
    rpm                     CHANGES
    rpm/lib                 depends.c psm.c rpmfi.c rpmrollback.c rpmte.c

  Log:
    - pubkey headers were misidentified as source, not binary, headers.

  Summary:
    Revision    Changes     Path
    1.1613      +1  -0      rpm/CHANGES
    1.340       +3  -1      rpm/lib/depends.c
    2.222       +3  -1      rpm/lib/psm.c
    2.76        +3  -1      rpm/lib/rpmfi.c
    1.12        +3  -1      rpm/lib/rpmrollback.c
    2.51        +3  -1      rpm/lib/rpmte.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1612 -r1.1613 CHANGES
  --- rpm/CHANGES	4 Sep 2007 12:50:19 -0000	1.1612
  +++ rpm/CHANGES	5 Sep 2007 23:08:00 -0000	1.1613
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: pubkey headers were misidentified as source, not binary, headers.
       - rpm.org: report open error on signing explicitly (#155079).
       - rpm.org: fix for debugedit -l.
       - afb: handle Mac OS X 10.3.9 statvfs deviance.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/depends.c
  ============================================================================
  $ cvs diff -u -r1.339 -r1.340 depends.c
  --- rpm/lib/depends.c	18 Aug 2007 21:32:29 -0000	1.339
  +++ rpm/lib/depends.c	5 Sep 2007 23:08:01 -0000	1.340
  @@ -213,7 +213,9 @@
       /*
        * Always add source headers.
        */
  -    isSource = (headerIsEntry(h, RPMTAG_SOURCERPM) == 0) ;
  +    isSource =
  +	(headerIsEntry(h, RPMTAG_SOURCERPM) == 0 &&
  +	 headerIsEntry(h, RPMTAG_ARCH) != 0);
       if (isSource) {
   	oc = ts->orderCount;
   	goto addheader;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  ============================================================================
  $ cvs diff -u -r2.221 -r2.222 psm.c
  --- rpm/lib/psm.c	19 Aug 2007 17:43:03 -0000	2.221
  +++ rpm/lib/psm.c	5 Sep 2007 23:08:01 -0000	2.222
  @@ -199,7 +199,9 @@
   
       rpmrc = RPMRC_OK;
   
  -    isSource = (headerIsEntry(h, RPMTAG_SOURCERPM) == 0);
  +    isSource =
  +	(headerIsEntry(h, RPMTAG_SOURCERPM) == 0 &&
  +	 headerIsEntry(h, RPMTAG_ARCH) != 0);
   
       if (!isSource) {
   	rpmError(RPMERR_NOTSRPM, _("source package expected, binary found\n"));
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfi.c
  ============================================================================
  $ cvs diff -u -r2.75 -r2.76 rpmfi.c
  --- rpm/lib/rpmfi.c	19 Aug 2007 13:49:25 -0000	2.75
  +++ rpm/lib/rpmfi.c	5 Sep 2007 23:08:01 -0000	2.76
  @@ -1324,7 +1324,9 @@
       fi->hfd = headerFreeData;
   
       fi->h = (h != NULL && scareMem ? headerLink(h) : NULL);
  -    fi->isSource = (headerIsEntry(h, RPMTAG_SOURCERPM) == 0);
  +    fi->isSource =
  +	(headerIsEntry(h, RPMTAG_SOURCERPM) == 0 &&
  +	 headerIsEntry(h, RPMTAG_ARCH) != 0);
   
       if (fi->fsm == NULL)
   	fi->fsm = newFSM();
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrollback.c
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 rpmrollback.c
  --- rpm/lib/rpmrollback.c	21 Aug 2007 03:08:36 -0000	1.11
  +++ rpm/lib/rpmrollback.c	5 Sep 2007 23:08:01 -0000	1.12
  @@ -178,7 +178,9 @@
   	case RPMRC_NOTTRUSTED:
   	case RPMRC_NOKEY:
   	case RPMRC_OK:
  -	    isSource = (headerIsEntry(h, RPMTAG_SOURCERPM) == 0);
  +	    isSource =
  +		(headerIsEntry(h, RPMTAG_SOURCERPM) == 0 &&
  +		 headerIsEntry(h, RPMTAG_ARCH) != 0);
   	    if (isSource)
   		goto bottom;
   	    /*@switchbreak@*/ break;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmte.c
  ============================================================================
  $ cvs diff -u -r2.50 -r2.51 rpmte.c
  --- rpm/lib/rpmte.c	19 Aug 2007 02:34:49 -0000	2.50
  +++ rpm/lib/rpmte.c	5 Sep 2007 23:08:01 -0000	2.51
  @@ -150,7 +150,9 @@
       xx = hge(h, RPMTAG_OS, NULL, &os, NULL);
       p->os = (os != NULL ? xstrdup(os) : NULL);
   
  -    p->isSource = (headerIsEntry(h, RPMTAG_SOURCERPM) == 0);
  +    p->isSource =
  +	(headerIsEntry(h, RPMTAG_SOURCERPM) == 0 &&
  +	 headerIsEntry(h, RPMTAG_ARCH) != 0);
   
       nb = strlen(p->NEVR) + 1;
   #ifdef	DYING	/* p->NEVR includes arch now. */
  @@ .
Received on Thu Sep 6 01:08:01 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.