RPM Community Forums

Mailing List Message of <rpm-cvs>

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

From: Jeff Johnson <jbj@rpm5.org>
Date: Tue 04 Sep 2007 - 14:50:20 CEST
Message-Id: <20070904125020.15C5E34845E@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:   04-Sep-2007 14:50:20
  Branch: HEAD                             Handle: 2007090413501900

  Modified files:
    rpm                     CHANGES
    rpm/lib                 rpmchecksig.c

  Log:
    - rpm.org: report open error on signing explicitly (#155079).

  Summary:
    Revision    Changes     Path
    1.1612      +1  -0      rpm/CHANGES
    1.134       +7  -3      rpm/lib/rpmchecksig.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1611 -r1.1612 CHANGES
  --- rpm/CHANGES	4 Sep 2007 12:45:36 -0000	1.1611
  +++ rpm/CHANGES	4 Sep 2007 12:50:19 -0000	1.1612
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - 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.
       - rse: make devtool %standalone fully modular for allowing its modules to be reused in other devtool targets
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  ============================================================================
  $ cvs diff -u -r1.133 -r1.134 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c	19 Aug 2007 22:07:21 -0000	1.133
  +++ rpm/lib/rpmchecksig.c	4 Sep 2007 12:50:19 -0000	1.134
  @@ -1168,10 +1168,14 @@
   	FD_t fd;
   	int xx;
   
  -	if ((fd = Fopen(fn, "r.fdio")) == NULL
  -	 || Ferror(fd)
  -	 || rpmVerifySignatures(qva, ts, fd, fn))
  +	fd = Fopen(arg, "r.fdio");
  +	if (fd == NULL || Ferror(fd)) {
  +	    rpmError(RPMERR_OPEN, _("%s: open failed: %s\n"), 
  +		     arg, Fstrerror(fd));
   	    res++;
  +	} else if (rpmVerifySignatures(qva, ts, fd, arg)) {
  +	    res++;
  +	}
   
   	if (fd != NULL) xx = Fclose(fd);
       }
  @@ .
Received on Tue Sep 4 14:50:20 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.