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:   19-Aug-2008 17:31:41
  Branch: rpm-5_1                          Handle: 2008081915314100

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES configure.ac
    rpm/rpmio               digest.c

  Log:
    - afb: check that crc32_combine/adler32_combine really exist, for murky old
            zlib.

  Summary:
    Revision    Changes     Path
    1.2288.2.92 +2  -0      rpm/CHANGES
    2.289.2.10  +2  -0      rpm/configure.ac
    2.38.2.1    +4  -0      rpm/rpmio/digest.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.91 -r1.2288.2.92 CHANGES
  --- rpm/CHANGES	19 Aug 2008 15:21:52 -0000	1.2288.2.91
  +++ rpm/CHANGES	19 Aug 2008 15:31:41 -0000	1.2288.2.92
  @@ -1,4 +1,6 @@
   5.1.4 -> 5.1.5:
  +    - afb: check that crc32_combine/adler32_combine really exist, for murky old
  +	zlib.
       - jbj: WR: run-time discovered configuration goopiness, take 1.
       - jbj: display cpuinfo path with --showrc.
       - jbj: display sysinfo path with --showrc.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.289.2.9 -r2.289.2.10 configure.ac
  --- rpm/configure.ac	18 Aug 2008 23:46:49 -0000	2.289.2.9
  +++ rpm/configure.ac	19 Aug 2008 15:31:41 -0000	2.289.2.10
  @@ -946,6 +946,8 @@
       [rpmz z gz], [gzread], [zlib.h],
       [yes,external:none], [zlib],
       [ AC_CHECK_FUNC(gzseek)
  +      AC_CHECK_FUNC(crc32_combine, AC_DEFINE(HAVE_ZLIB_CRC32_COMBINE, 1, [Define as 1 if you have crc32_combine() in zlib]))
  +      AC_CHECK_FUNC(adler32_combine, AC_DEFINE(HAVE_ZLIB_ADLER32_COMBINE, 1, [Define as 1 if you have adler32_combine() in zlib]))
         if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
             AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have <zlib.h>])
         fi
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/digest.c
  ============================================================================
  $ cvs diff -u -r2.38 -r2.38.2.1 digest.c
  --- rpm/rpmio/digest.c	18 Feb 2008 19:59:08 -0000	2.38
  +++ rpm/rpmio/digest.c	19 Aug 2008 15:31:41 -0000	2.38.2.1
  @@ -502,8 +502,10 @@
   /*@-type @*/
   	    mp->update = (uint32_t (*)(uint32_t, const byte *, size_t)) crc32;
   #if defined(ZLIB_H)
  +#if defined(HAVE_ZLIB_CRC32_COMBINE)
   	    mp->combine = (uint32_t (*)(uint32_t, uint32_t, size_t)) crc32_combine;
   #endif
  +#endif
   /*@=type @*/
   	    ctx->paramsize = sizeof(*mp);
   	    ctx->param = mp;
  @@ -522,8 +524,10 @@
   /*@-type @*/
   #if defined(ZLIB_H)
   	    mp->update = (uint32_t (*)(uint32_t, const byte *, size_t)) adler32;
  +#if defined(HAVE_ZLIB_ADLER32_COMBINE)
   	    mp->combine = (uint32_t (*)(uint32_t, uint32_t, size_t)) adler32_combine;
   #endif
  +#endif
   /*@=type @*/
   	    ctx->paramsize = sizeof(*mp);
   	    ctx->param = mp;
  @@ .