RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/build/ pack.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Wed 28 Nov 2007 - 00:00:25 CET
Message-Id: <20071127230025.623C7348465@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:   28-Nov-2007 00:00:25
  Branch: HEAD                             Handle: 2007112723002003

  Modified files:
    rpm                     CHANGES
    rpm/build               pack.c

  Log:
    - fix: RPMTAG_BUILDTIME is type RPM_UINT32_TYPE, not RPM_STRING_TYPE.
    - fix: getBuildTime returns uint32_t *, not uint32_t.

  Summary:
    Revision    Changes     Path
    1.1895      +2  -0      rpm/CHANGES
    2.260       +2  -2      rpm/build/pack.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1894 -r1.1895 CHANGES
  --- rpm/CHANGES	27 Nov 2007 03:29:12 -0000	1.1894
  +++ rpm/CHANGES	27 Nov 2007 23:00:20 -0000	1.1895
  @@ -1,4 +1,6 @@
   5.0a2 -> 5.0a3:
  +    - jbj: fix: RPMTAG_BUILDTIME is type RPM_UINT32_TYPE, not RPM_STRING_TYPE.
  +    - jbj: fix: getBuildTime returns uint32_t *, not uint32_t.
       - jbj: rpmbuild: more memory leak plugging.
       - jbj: rpmbuild: plug some memory leaks.
       - jbj: fix: return 0, not -1, with unsigned changes as error.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/pack.c
  ============================================================================
  $ cvs diff -u -r2.259 -r2.260 pack.c
  --- rpm/build/pack.c	27 Nov 2007 03:29:13 -0000	2.259
  +++ rpm/build/pack.c	27 Nov 2007 23:00:23 -0000	2.260
  @@ -994,8 +994,8 @@
   	xx = headerPut(pkg->header, he, 0);
   
   	he->tag = RPMTAG_BUILDTIME;
  -	he->t = RPM_STRING_TYPE;
  -	he->p.ui32p = getBuildTime();
  +	he->t = RPM_UINT32_TYPE;
  +	he->p.ui32p = *getBuildTime();
   	he->c = 1;
   	xx = headerPut(pkg->header, he, 0);
   
  @@ .
Received on Wed Nov 28 00:00:25 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.