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:   24-Jan-2008 20:24:08
  Branch: rpm-5_0                          Handle: 2008012419240700

  Modified files:           (Branch: rpm-5_0)
    rpm                     CHANGES TODO
    rpm/python              header-py.c

  Log:
    - mej: catch EOF returned as RPMRC_NOTFOUND correctly.

  Summary:
    Revision    Changes     Path
    1.2054.2.14 +1  -0      rpm/CHANGES
    1.118.2.6   +0  -14     rpm/TODO
    1.89.2.1    +1  -1      rpm/python/header-py.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2054.2.13 -r1.2054.2.14 CHANGES
  --- rpm/CHANGES	21 Jan 2008 17:32:03 -0000	1.2054.2.13
  +++ rpm/CHANGES	24 Jan 2008 19:24:07 -0000	1.2054.2.14
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.0.1:
  +    - mej: catch EOF returned as RPMRC_NOTFOUND correctly.
       - jbj: fix: permit %{lua:...} to recurse.
       - jbj: unbreak rpm-python, preserve existing symbol in released versions.
       - jbj: fix several typos noticed by the translation project.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/TODO
  ============================================================================
  $ cvs diff -u -r1.118.2.5 -r1.118.2.6 TODO
  --- rpm/TODO	22 Jan 2008 15:47:53 -0000	1.118.2.5
  +++ rpm/TODO	24 Jan 2008 19:24:07 -0000	1.118.2.6
  @@ -22,17 +22,6 @@
   
     - decide on whether rpmbuild --lsb should be included (or not).
   
  -  - pkgioRead() has a cosmetic error message if/when called after end-of-header
  -	(or equivalent EOF) condition. The current fix is mapping return to
  -	RPMRC_NOTFOUND, but RPMRC_OK with 0 length EOF read may be necessary.
  -
  -	...
  -        /* XXX Handle EOF's as RPMRC_NOTFOUND, not RPMRC_FAIL, returns. */
  -        if (xx == 0)
  -            rc = RPMRC_NOTFOUND;
  -        else
  -	...
  -
      - 2-4 applications are having trouble compiling against rpm-5.0.0, largely
   	(my guess) because header.h has been removed. A stub to retrofit
   	could be done, but then the question will become headerGetEntry
  @@ -40,6 +29,3 @@
   	as interest, noone replied when I asked repeatedly. Alternatively,
   	just doing the port to rpm-5.0.0 is likely not hard at all.
   
  -   - XAR internal needs proper automake for "make dist" functionality.
  -
  -
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/header-py.c
  ============================================================================
  $ cvs diff -u -r1.89 -r1.89.2.1 header-py.c
  --- rpm/python/header-py.c	4 Dec 2007 22:53:54 -0000	1.89
  +++ rpm/python/header-py.c	24 Jan 2008 19:24:07 -0000	1.89.2.1
  @@ -701,7 +701,7 @@
   	{   const char item[] = "Header";
   	    const char * msg = NULL;
   	    rpmRC rc = rpmpkgRead(item, fd, &h, &msg);
  -	    if (rc != RPMRC_OK)
  +	    if (rc != RPMRC_OK && rc != RPMRC_NOTFOUND)
   		rpmlog(RPMLOG_ERR, "%s: %s: %s\n", "rpmpkgRead", item, msg);
   	    msg = _free(msg);
   	}
  @@ .