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:   30-Jul-2007 19:09:43
  Branch: HEAD                             Handle: 2007073018094300

  Modified files:
    rpm                     CHANGES
    rpm/rpmdb               rpmdb.c

  Log:
    - HEADER_MAGIC_YES always: eliminate HEADER_MAGIC_NO usages.

  Summary:
    Revision    Changes     Path
    1.1529      +1  -0      rpm/CHANGES
    1.143       +6  -3      rpm/rpmdb/rpmdb.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1528 -r1.1529 CHANGES
  --- rpm/CHANGES	29 Jul 2007 14:02:32 -0000	1.1528
  +++ rpm/CHANGES	30 Jul 2007 17:09:43 -0000	1.1529
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: HEADER_MAGIC_YES always: eliminate HEADER_MAGIC_NO usages.
       - rse: provide support for GNU binutils ld(1)'s --as-needed via Autoconf option --enable-build-maxextlibdep
       - jbj: rip CentOS3/x86_64 gcc-3.2.3-49.x86_64 hack-a-round. Fix gcc!
       - jbj: upgrade to db-4.6.18.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  ============================================================================
  $ cvs diff -u -r1.142 -r1.143 rpmdb.c
  --- rpm/rpmdb/rpmdb.c	30 Jul 2007 12:30:54 -0000	1.142
  +++ rpm/rpmdb/rpmdb.c	30 Jul 2007 17:09:43 -0000	1.143
  @@ -1812,7 +1812,8 @@
   /*@i@*/	key->data = (void *) &mi->mi_prevoffset;
   	key->size = sizeof(mi->mi_prevoffset);
   	data->data = headerUnload(mi->mi_h);
  -	data->size = headerSizeof(mi->mi_h, HEADER_MAGIC_NO);
  +	data->size = headerSizeof(mi->mi_h, HEADER_MAGIC_YES);
  +	data->size -= 8;	/* XXX HEADER_MAGIC_NO */
   
   	/* Check header digest/signature on blob export (if requested). */
   	if (mi->mi_hdrchk && mi->mi_ts) {
  @@ -3126,7 +3127,8 @@
   
   	/* XXX db0: hack to pass sizeof header to fadAlloc */
   	datap = h;
  -	datalen = headerSizeof(h, HEADER_MAGIC_NO);
  +	datalen = headerSizeof(h, HEADER_MAGIC_YES);
  +	datalen -= 8;	/* XXX HEADER_MAGIC_NO */
   
   	xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR);
   
  @@ -3241,7 +3243,8 @@
   /*@=immediatetrans@*/
   key->size = sizeof(mi_offset.ui);
   data->data = headerUnload(h);
  -data->size = headerSizeof(h, HEADER_MAGIC_NO);
  +data->size = headerSizeof(h, HEADER_MAGIC_YES);
  +data->size -= 8;	/* XXX HEADER_MAGIC_NO */
   
   		/* Check header digest/signature on blob export. */
   		if (hdrchk && ts) {
  @@ .