RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   27-Jun-2007 11:03:01
  Branch: HEAD                             Handle: 2007062710030001

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               rpmio.c

  Log:
    Support building even without ZLib via Autoconf option --without-zlib

  Summary:
    Revision    Changes     Path
    1.1402      +1  -0      rpm/CHANGES
    1.85        +10 -0      rpm/rpmio/rpmio.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1401 -r1.1402 CHANGES
  --- rpm/CHANGES	27 Jun 2007 08:18:52 -0000	1.1401
  +++ rpm/CHANGES	27 Jun 2007 09:03:00 -0000	1.1402
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rse: support building without ZLib via --without-zlib
       - rse: in rpmio for LZMA use %{__lzma} macro instead of hard-coded /usr/bin/lzma when possible
       - rse: use explicit enable/disable of Perl and Python APIs
       - rse: cleanup elf(3) API related Autoconf glue
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  ============================================================================
  $ cvs diff -u -r1.84 -r1.85 rpmio.c
  --- rpm/rpmio/rpmio.c	27 Jun 2007 08:47:29 -0000	1.84
  +++ rpm/rpmio/rpmio.c	27 Jun 2007 09:03:01 -0000	1.85
  @@ -202,8 +202,10 @@
   	    sprintf(be, "FD %d fp %p", fps->fdno, fps->fp);
   	} else if (fps->io == ufdio) {
   	    sprintf(be, "UFD %d fp %p", fps->fdno, fps->fp);
  +#ifdef	HAVE_ZLIB_H
   	} else if (fps->io == gzdio) {
   	    sprintf(be, "GZD %p fdno %d", fps->fp, fps->fdno);
  +#endif
   #if HAVE_BZLIB_H
   	} else if (fps->io == bzdio) {
   	    sprintf(be, "BZD %p fdno %d", fps->fp, fps->fdno);
  @@ -3420,11 +3422,13 @@
       if (end && *end) {
   	if (!strcmp(end, "fdio")) {
   	    iof = fdio;
  +#if HAVE_ZLIB_H
   	} else if (!strcmp(end, "gzdio")) {
   	    iof = gzdio;
   	    /*@-internalglobs@*/
   	    fd = gzdFdopen(fd, zstdio);
   	    /*@=internalglobs@*/
  +#endif
   #if HAVE_BZLIB_H
   	} else if (!strcmp(end, "bzdio")) {
   	    iof = bzdio;
  @@ -3460,10 +3464,12 @@
   	for (end = other; *end && strchr("0123456789fh", *end); end++)
   	    {};
   	if (*end == '\0') {
  +#if HAVE_ZLIB_H
   	    iof = gzdio;
   	    /*@-internalglobs@*/
   	    fd = gzdFdopen(fd, zstdio);
   	    /*@=internalglobs@*/
  +#endif
   	}
       }
       /*@=branchstate@*/
  @@ -3585,8 +3591,10 @@
   	/*@=voidabstract =nullpass@*/
   
       vh = fdGetFp(fd);
  +#if HAVE_ZLIB_H
       if (vh && fdGetIo(fd) == gzdio)
   	return gzdFlush(vh);
  +#endif
   #if HAVE_BZLIB_H
       if (vh && fdGetIo(fd) == bzdio)
   	return bzdFlush(vh);
  @@ -3614,9 +3622,11 @@
   	    /*@+voidabstract -nullpass@*/
   	    ec = ferror(fdGetFILE(fd));
   	    /*@=voidabstract =nullpass@*/
  +#if HAVE_ZLIB_H
   	} else if (fps->io == gzdio) {
   	    ec = (fd->syserrno || fd->errcookie != NULL) ? -1 : 0;
   	    i--;	/* XXX fdio under gzdio always has fdno == -1 */
  +#endif
   #if HAVE_BZLIB_H
   	} else if (fps->io == bzdio) {
   	    ec = (fd->syserrno  || fd->errcookie != NULL) ? -1 : 0;
  @@ .