solidircd-cvs Mailing List for Solid IRCd

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/solidircd/solidircd-stable/zlib
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10987/zlib

Modified Files:
	ChangeLog FAQ INDEX Makefile.in README adler32.c compress.c 
	configure crc32.c deflate.c deflate.h example.c gzio.c 
	inftrees.h minigzip.c trees.c uncompr.c zconf.in.h zlib.3 
	zutil.c zutil.h 
Log Message:
compile fixes

Index: INDEX
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/INDEX,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** INDEX	10 Apr 2007 20:13:08 -0000	1.2
--- INDEX	10 Apr 2007 21:43:14 -0000	1.3
***************
*** 9,15 ****
--- 9,18 ----
  zconf.in.h      template for zconf.h (used by configure)

+ amiga/          makefiles for Amiga SAS C
+ as400/          makefiles for IBM AS/400
  msdos/          makefiles for MSDOS
  old/            makefiles for various architectures and zlib documentation
                  files that have not yet been updated for zlib 1.2.x
+ projects/       projects for various Integrated Development Environments
  qnx/            makefiles for QNX
  win32/          makefiles for Windows
***************
*** 47,54 ****
                  unsupported contribution by third parties
  See contrib/README.contrib
-                source files for sample programs:
- example.c
- minigzip.c
- 
-                 unsupported contribution by third parties
- See contrib/README.contrib
--- 50,51 ----

Index: inftrees.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/inftrees.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** inftrees.h	27 Jun 2005 03:02:37 -0000	1.1.1.1
--- inftrees.h	10 Apr 2007 21:43:14 -0000	1.2
***************
*** 1,4 ****
  /* inftrees.h -- header to use inftrees.c
!  * Copyright (C) 1995-2003 Mark Adler
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
--- 1,4 ----
  /* inftrees.h -- header to use inftrees.c
!  * Copyright (C) 1995-2005 Mark Adler
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
***************
*** 37,46 ****

  /* Maximum size of dynamic tree.  The maximum found in a long but non-
!    exhaustive search was 1004 code structures (850 for length/literals
!    and 154 for distances, the latter actually the result of an
     exhaustive search).  The true maximum is not known, but the value
     below is more than safe. */
! #define ENOUGH 1440
! #define MAXD 154

  /* Type of code to build for inftable() */
--- 37,46 ----

  /* Maximum size of dynamic tree.  The maximum found in a long but non-
!    exhaustive search was 1444 code structures (852 for length/literals
!    and 592 for distances, the latter actually the result of an
     exhaustive search).  The true maximum is not known, but the value
     below is more than safe. */
! #define ENOUGH 2048
! #define MAXD 592

  /* Type of code to build for inftable() */

Index: Makefile.in
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in	27 Jun 2005 03:02:37 -0000	1.1.1.1
--- Makefile.in	10 Apr 2007 21:43:14 -0000	1.2
***************
*** 1,4 ****
  # Makefile for zlib
! # Copyright (C) 1995-2003 Jean-loup Gailly.
  # For conditions of distribution and use, see copyright notice in zlib.h

--- 1,4 ----
  # Makefile for zlib
! # Copyright (C) 1995-2005 Jean-loup Gailly.
  # For conditions of distribution and use, see copyright notice in zlib.h

***************
*** 31,35 ****
  LIBS=libz.a
  SHAREDLIB=libz.so
! SHAREDLIBV=libz.so.1.2.1
  SHAREDLIBM=libz.so.1

--- 31,35 ----
  LIBS=libz.a
  SHAREDLIB=libz.so
! SHAREDLIBV=libz.so.1.2.3
  SHAREDLIBM=libz.so.1

***************
*** 57,62 ****
  all: example$(EXE) minigzip$(EXE)

- build: all
- 
  check: test
  test: all
--- 57,60 ----
***************
*** 70,73 ****
--- 68,72 ----
  	fi

+ build: libz.a
  libz.a: $(OBJS) $(OBJA)
  	$(AR) $@ $(OBJS) $(OBJA)
***************
*** 129,134 ****
  maintainer-clean: distclean
  distclean: clean
! 	cp -p Makefile.in Makefile
! 	cp -p zconf.in.h zconf.h
  	rm -f .DS_Store

--- 128,133 ----
  maintainer-clean: distclean
  distclean: clean
! 	rm -f Makefile
! 	rm -f zconf.h
  	rm -f .DS_Store

Index: zlib.3
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/zlib.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** zlib.3	27 Jun 2005 03:02:38 -0000	1.1.1.1
--- zlib.3	10 Apr 2007 21:43:14 -0000	1.2
***************
*** 1,3 ****
! .TH ZLIB 3 "17 November 2003"
  .SH NAME
  zlib \- compression/decompression library
--- 1,3 ----
! .TH ZLIB 3 "18 July 2005"
  .SH NAME
  zlib \- compression/decompression library
***************
*** 134,139 ****
  or (for the Windows DLL version) to Gilles Vollant (in...@wi...).
  .SH AUTHORS
! Version 1.2.1
! Copyright (C) 1995-2003 Jean-loup Gailly (jl...@gz...)
  and Mark Adler (ma...@al...).
  .LP
--- 134,139 ----
  or (for the Windows DLL version) to Gilles Vollant (in...@wi...).
  .SH AUTHORS
! Version 1.2.3
! Copyright (C) 1995-2005 Jean-loup Gailly (jl...@gz...)
  and Mark Adler (ma...@al...).
  .LP

Index: FAQ
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/FAQ,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FAQ	10 Apr 2007 20:13:08 -0000	1.2
--- FAQ	10 Apr 2007 21:43:14 -0000	1.3
***************
*** 22,30 ****

      See
-         * http://www.winimage.com/zLibDll/
          * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm
          * contrib/visual-basic.txt in the zlib distribution

!  4. compress() returns Z_BUF_ERROR

      Make sure that before the call of compress, the length of the compressed
--- 22,30 ----

      See
          * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm
          * contrib/visual-basic.txt in the zlib distribution
+         * win32/DLL_FAQ.txt in the zlib distribution

!  4. compress() returns Z_BUF_ERROR.

      Make sure that before the call of compress, the length of the compressed
***************
*** 33,37 ****
      ("as any"), not by value ("as long").

!  5. deflate() or inflate() returns Z_BUF_ERROR

      Before making the call, make sure that avail_in and avail_out are not
--- 33,37 ----
      ("as any"), not by value ("as long").

!  5. deflate() or inflate() returns Z_BUF_ERROR.

      Before making the call, make sure that avail_in and avail_out are not
***************
*** 48,53 ****
      It's in zlib.h for the moment, and Francis S. Lin has converted it to a
      web page zlib.html. Volunteers to transform this to Unix-style man pages,
!     please contact Jean-loup Gailly (jl...@gz...). Examples of zlib usage
!     are in the files example.c and minigzip.c.

   7. Why don't you use GNU autoconf or libtool or ...?
--- 48,53 ----
      It's in zlib.h for the moment, and Francis S. Lin has converted it to a
      web page zlib.html. Volunteers to transform this to Unix-style man pages,
!     please contact us (zl...@gz...). Examples of zlib usage are in the files
!     example.c and minigzip.c.

   7. Why don't you use GNU autoconf or libtool or ...?
***************
*** 78,82 ****
  11. Can zlib handle .zip archives?

!     See the directory contrib/minizip in the zlib distribution.

  12. Can zlib handle .Z files?
--- 78,83 ----
  11. Can zlib handle .zip archives?

!     Not by itself, no.  See the directory contrib/minizip in the zlib
!     distribution.

  12. Can zlib handle .Z files?
***************
*** 93,96 ****
--- 94,99 ----
  14. How do I install a shared zlib library on Unix?

+     After the above, then:
+ 
      make install

***************
*** 100,109 ****
      can #include <zlib.h>, it's there. The -lz option will probably link to it.

! 15. I have a question about OttoPDF

      We are not the authors of OttoPDF. The real author is on the OttoPDF web
!     site Joel Hainley jha...@my....

! 16. Why does gzip give an error on a file I make with compress/deflate?

      The compress and deflate functions produce data in the zlib format, which
--- 103,131 ----
      can #include <zlib.h>, it's there. The -lz option will probably link to it.

! 15. I have a question about OttoPDF.

      We are not the authors of OttoPDF. The real author is on the OttoPDF web
!     site: Joel Hainley, jha...@my....

! 16. Can zlib decode Flate data in an Adobe PDF file?
! 
!     Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ .
!     To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ .
! 
! 17. Why am I getting this "register_frame_info not found" error on Solaris?
! 
!     After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
!     generates an error such as:
! 
!         ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
!         symbol __register_frame_info: referenced symbol not found
! 
!     The symbol __register_frame_info is not part of zlib, it is generated by
!     the C compiler (cc or gcc). You must recompile applications using zlib
!     which have this problem. This problem is specific to Solaris. See
!     http://www.sunfreeware.com for Solaris versions of zlib and applications
!     using zlib.
! 
! 18. Why does gzip give an error on a file I make with compress/deflate?

      The compress and deflate functions produce data in the zlib format, which
***************
*** 113,117 ****
      headers and trailers around the compressed data.

! 17. Ok, so why are there two different formats?

      The gzip format was designed to retain the directory information about
--- 135,139 ----
      headers and trailers around the compressed data.

! 19. Ok, so why are there two different formats?

      The gzip format was designed to retain the directory information about
***************
*** 121,125 ****
      uses a faster integrity check than gzip.

! 18. Well that's nice, but how do I make a gzip file in memory?

      You can request that deflate write the gzip format instead of the zlib
--- 143,147 ----
      uses a faster integrity check than gzip.

! 20. Well that's nice, but how do I make a gzip file in memory?

      You can request that deflate write the gzip format instead of the zlib
***************
*** 127,138 ****
      the gzip format using inflateInit2(). Read zlib.h for more details.

!     Note that you cannot specify special gzip header contents (e.g. a file
!     name or modification date), nor will inflate tell you what was in the
!     gzip header. If you need to customize the header or see what's in it,
!     you can use the raw deflate and inflate operations and the crc32()
!     function and roll your own gzip encoding and decoding. Read the gzip
!     RFC 1952 for details of the header and trailer format.
! 
! 19. Is zlib thread-safe?

      Yes. However any library routines that zlib uses and any application-
--- 149,153 ----
      the gzip format using inflateInit2(). Read zlib.h for more details.

! 21. Is zlib thread-safe?

      Yes. However any library routines that zlib uses and any application-
***************
*** 145,157 ****
      single thread at a time.

! 20. Can I use zlib in my commercial application?

      Yes. Please read the license in zlib.h.

! 21. Is zlib under the GNU license?

      No. Please read the license in zlib.h.

! 22. The license says that altered source versions must be "plainly marked". So
      what exactly do I need to do to meet that requirement?

--- 160,172 ----
      single thread at a time.

! 22. Can I use zlib in my commercial application?

      Yes. Please read the license in zlib.h.

! 23. Is zlib under the GNU license?

      No. Please read the license in zlib.h.

! 24. The license says that altered source versions must be "plainly marked". So
      what exactly do I need to do to meet that requirement?

***************
*** 176,185 ****
      in zlib.h as you would for a full source distribution.

! 23. Will zlib work on a big-endian or little-endian architecture, and can I
      exchange compressed data between them?

      Yes and yes.

! 24. Will zlib work on a 64-bit machine?

      It should. It has been tested on 64-bit machines, and has no dependence
--- 191,200 ----
      in zlib.h as you would for a full source distribution.

! 25. Will zlib work on a big-endian or little-endian architecture, and can I
      exchange compressed data between them?

      Yes and yes.

! 26. Will zlib work on a 64-bit machine?

      It should. It has been tested on 64-bit machines, and has no dependence
***************
*** 187,191 ****
      difficulties, please provide a complete problem report to zl...@gz...

! 25. Will zlib decompress data from the PKWare Data Compression Library?

      No. The PKWare DCL uses a completely different compressed data format
--- 202,206 ----
      difficulties, please provide a complete problem report to zl...@gz...

! 27. Will zlib decompress data from the PKWare Data Compression Library?

      No. The PKWare DCL uses a completely different compressed data format
***************
*** 193,197 ****
      directory for a possible solution to your problem.

! 26. Can I access data randomly in a compressed stream?

      No, not without some preparation. If when compressing you periodically
--- 208,212 ----
      directory for a possible solution to your problem.

! 28. Can I access data randomly in a compressed stream?

      No, not without some preparation. If when compressing you periodically
***************
*** 201,205 ****
      often, since it can significantly degrade compression.

! 27. Does zlib work on MVS, OS/390, CICS, etc.?

      We don't know for sure. We have heard occasional reports of success on
--- 216,220 ----
      often, since it can significantly degrade compression.

! 29. Does zlib work on MVS, OS/390, CICS, etc.?

      We don't know for sure. We have heard occasional reports of success on
***************
*** 208,212 ****
      these questions. Thanks.

! 28. Is there some simpler, easier to read version of inflate I can look at
      to understand the deflate format?

--- 223,227 ----
      these questions. Thanks.

! 30. Is there some simpler, easier to read version of inflate I can look at
      to understand the deflate format?

***************
*** 214,218 ****
      contrib/puff directory.

! 29. Does zlib infringe on any patents?

      As far as we know, no. In fact, that was originally the whole point behind
--- 229,233 ----
      contrib/puff directory.

! 31. Does zlib infringe on any patents?

      As far as we know, no. In fact, that was originally the whole point behind
***************
*** 221,225 ****
      http://www.gzip.org/#faq11

! 30. Can zlib work with greater than 4 GB of data?

      Yes. inflate() and deflate() will process any amount of data correctly.
--- 236,240 ----
      http://www.gzip.org/#faq11

! 32. Can zlib work with greater than 4 GB of data?

      Yes. inflate() and deflate() will process any amount of data correctly.
***************
*** 239,243 ****
      type is 64 bits, then the limit is 16 exabytes.

! 31. Does zlib have any security vulnerabilities?

      The only one that we are aware of is potentially in gzprintf(). If zlib
--- 254,258 ----
      type is 64 bits, then the limit is 16 exabytes.

! 33. Does zlib have any security vulnerabilities?

      The only one that we are aware of is potentially in gzprintf(). If zlib
***************
*** 259,263 ****
      1.1.3 and before were subject to a double-free vulnerability.

! 32. Is there a Java version of zlib?

      Probably what you want is to use zlib in Java. zlib is already included
--- 274,278 ----
      1.1.3 and before were subject to a double-free vulnerability.

! 34. Is there a Java version of zlib?

      Probably what you want is to use zlib in Java. zlib is already included
***************
*** 266,271 ****
      page for links: http://www.zlib.org/

! 33. I get this or that compiler or source-code scanner warning when I crank it
!     up to maximally-pendantic. Can't you guys write proper code?

      Many years ago, we gave up attempting to avoid warnings on every compiler
--- 281,286 ----
      page for links: http://www.zlib.org/

! 35. I get this or that compiler or source-code scanner warning when I crank it
!     up to maximally-pedantic. Can't you guys write proper code?

      Many years ago, we gave up attempting to avoid warnings on every compiler
***************
*** 274,278 ****
      works.

! 34. Will zlib read the (insert any ancient or arcane format here) compressed
      data format?

--- 289,302 ----
      works.

! 36. Valgrind (or some similar memory access checker) says that deflate is
!     performing a conditional jump that depends on an uninitialized value.
!     Isn't that a bug?
! 
!     No.  That is intentional for performance reasons, and the output of
!     deflate is not affected.  This only started showing up recently since
!     zlib 1.2.x uses malloc() by default for allocations, whereas earlier
!     versions used calloc(), which zeros out the allocated memory.
! 
! 37. Will zlib read the (insert any ancient or arcane format here) compressed
      data format?

***************
*** 280,291 ****
      formats and associated software.

! 35. How can I encrypt/decrypt zip files with zlib?

      zlib doesn't support encryption. The original PKZIP encryption is very weak
      and can be broken with freely available programs. To get strong encryption,
!     use gpg ( http://www.gnupg.org/ ) which already includes zlib compression.
      For PKZIP compatible "encryption", look at http://www.info-zip.org/

! 36. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?

      "gzip" is the gzip format, and "deflate" is the zlib format. They should
--- 304,315 ----
      formats and associated software.

! 38. How can I encrypt/decrypt zip files with zlib?

      zlib doesn't support encryption. The original PKZIP encryption is very weak
      and can be broken with freely available programs. To get strong encryption,
!     use GnuPG, http://www.gnupg.org/ , which already includes zlib compression.
      For PKZIP compatible "encryption", look at http://www.info-zip.org/

! 39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?

      "gzip" is the gzip format, and "deflate" is the zlib format. They should
***************
*** 303,325 ****
      Bottom line: use the gzip format for HTTP 1.1 encoding.

- 37. Does zlib support the new "Deflate64" format introduced by PKWare?
- 
-     No. PKWare has apparently decided to keep that format proprietary, since
-     they have not documented it as they have previous compression formats.
-     In any case, the compression improvements are so modest compared to other
-     more modern approaches, that it's not worth the effort to implement.
- 
- 38. Can you please sign these lengthy legal documents and fax them back to us
-     so that we can use your software in our product?
- 
-     No. Go away. Shoo.
- 1, most notably Microsoft. So even though the
-     "deflate" transfer encoding using the zlib format would be the more
-     efficient approach (and in fact exactly what the zlib format was designed
-     for), using the "gzip" transfer encoding is probably more reliable due to
-     an unfortunate choice of name on the part of the HTTP 1.1 authors.
- 
-     Bottom line: use the gzip format for HTTP 1.1 encoding.
- 
  40. Does zlib support the new "Deflate64" format introduced by PKWare?

--- 327,330 ----

Index: README
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	27 Jun 2005 03:02:39 -0000	1.1.1.1
--- README	10 Apr 2007 21:43:14 -0000	1.2
***************
*** 1,5 ****
  ZLIB DATA COMPRESSION LIBRARY

! zlib 1.2.1 is a general purpose data compression library.  All the code is
  thread safe.  The data format used by the zlib library is described by RFCs
  (Request for Comments) 1950 to 1952 in the files
--- 1,5 ----
  ZLIB DATA COMPRESSION LIBRARY

! zlib 1.2.3 is a general purpose data compression library.  All the code is
  thread safe.  The data format used by the zlib library is described by RFCs
  (Request for Comments) 1950 to 1952 in the files
***************
*** 17,23 ****
  To compile all files and run the test program, follow the instructions given at
  the top of Makefile. In short "make test; make install" should work for most
! machines. For Unix: "./configure; make test; make install" For MSDOS, use one
! of the special makefiles such as Makefile.msc. For VMS, use Make_vms.com or
! descrip.mms.

  Questions about zlib should be sent to <zl...@gz...>, or to Gilles Vollant
--- 17,22 ----
  To compile all files and run the test program, follow the instructions given at
  the top of Makefile. In short "make test; make install" should work for most
! machines. For Unix: "./configure; make test; make install". For MSDOS, use one
! of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.

  Questions about zlib should be sent to <zl...@gz...>, or to Gilles Vollant
***************
*** 35,39 ****
  http://dogma.net/markn/articles/zlibtool/zlibtool.htm

! The changes made in version 1.2.1 are documented in the file ChangeLog.

  Unsupported third party contributions are provided in directory "contrib".
--- 34,38 ----
  http://dogma.net/markn/articles/zlibtool/zlibtool.htm

! The changes made in version 1.2.3 are documented in the file ChangeLog.

  Unsupported third party contributions are provided in directory "contrib".
***************
*** 47,51 ****
  http://www.cpan.org/modules/by-module/Compress/

! A Python interface to zlib written by A.M. Kuchling <am...@ma...> is
  available in Python 1.5 and later versions, see
  http://www.python.org/doc/lib/module-zlib.html
--- 46,50 ----
  http://www.cpan.org/modules/by-module/Compress/

! A Python interface to zlib written by A.M. Kuchling <am...@am...> is
  available in Python 1.5 and later versions, see
  http://www.python.org/doc/lib/module-zlib.html
***************
*** 94,98 ****
  Copyright notice:

!  (C) 1995-2003 Jean-loup Gailly and Mark Adler

    This software is provided 'as-is', without any express or implied
--- 93,97 ----
  Copyright notice:

!  (C) 1995-2004 Jean-loup Gailly and Mark Adler

    This software is provided 'as-is', without any express or implied

Index: configure
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure	10 Apr 2007 20:13:08 -0000	1.2
--- configure	10 Apr 2007 21:43:14 -0000	1.3
***************
*** 78,96 ****
    case `(uname -s || echo unknown) 2>/dev/null` in
    Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
!   CYGWIN* | Cygwin* | cygwin* )
               EXE='.exe';;
    QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
           # (ala...@ic...)
                   LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};;
!   HP-UX*)        LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
                   shared_ext='.sl'
                   SHAREDLIB='libz.sl';;
    Darwin*)   shared_ext='.dylib'
               SHAREDLIB=libz$shared_ext
               SHAREDLIBV=libz.$VER$shared_ext
               SHAREDLIBM=libz.$VER1$shared_ext
!              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name /usr/lib/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"}
!              libdir='/usr/lib'
!              includedir='/usr/include';;
    *)             LDSHARED=${LDSHARED-"$cc -shared"};;
    esac
--- 78,101 ----
    case `(uname -s || echo unknown) 2>/dev/null` in
    Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
!   CYGWIN* | Cygwin* | cygwin* | OS/2* )
               EXE='.exe';;
    QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
           # (ala...@ic...)
                   LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};;
!   HP-UX*)
!          LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
!          case `(uname -m || echo unknown) 2>/dev/null` in
!          ia64)
!                  shared_ext='.so'
!                  SHAREDLIB='libz.so';;
!          *)
                   shared_ext='.sl'
                   SHAREDLIB='libz.sl';;
+          esac;;
    Darwin*)   shared_ext='.dylib'
               SHAREDLIB=libz$shared_ext
               SHAREDLIBV=libz.$VER$shared_ext
               SHAREDLIBM=libz.$VER1$shared_ext
!              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};;
    *)             LDSHARED=${LDSHARED-"$cc -shared"};;
    esac
***************
*** 103,108 ****
--- 108,119 ----
  #            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
               LDSHARED=${LDSHARED-"ld -b"}
+          case `(uname -m || echo unknown) 2>/dev/null` in
+          ia64)
+              shared_ext='.so'
+              SHAREDLIB='libz.so';;
+          *)
               shared_ext='.sl'
               SHAREDLIB='libz.sl';;
+          esac;;
    IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
               CFLAGS=${CFLAGS-"-ansi -O2"}
***************
*** 128,131 ****
--- 139,145 ----
               CFLAGS=${CFLAGS-"-O2"}
               LDSHARED=${LDSHARED-"ld"};;
+   SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
+              CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"}
+              LDSHARED=${LDSHARED-"cc -xarch=v9b"};;
    UNIX_System_V\ 4.2.0)
               SFLAGS=${CFLAGS-"-KPIC -O"}
***************
*** 444,463 ****
  /^LDFLAGS *=/s#=.*#=$LDFLAGS#
  " > Makefile
- C *=/s#=.*#=$CC#
- /^CFLAGS *=/s#=.*#=$CFLAGS#
- /^CPP *=/s#=.*#=$CPP#
- /^LDSHARED *=/s#=.*#=$LDSHARED#
- /^LIBS *=/s#=.*#=$LIBS#
- /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
- /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
- /^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
- /^AR *=/s#=.*#=$AR#
- /^RANLIB *=/s#=.*#=$RANLIB#
- /^EXE *=/s#=.*#=$EXE#
- /^prefix *=/s#=.*#=$prefix#
- /^exec_prefix *=/s#=.*#=$exec_prefix#
- /^libdir *=/s#=.*#=$libdir#
- /^includedir *=/s#=.*#=$includedir#
- /^mandir *=/s#=.*#=$mandir#
- /^LDFLAGS *=/s#=.*#=$LDFLAGS#
- " > Makefile
--- 458,459 ----

Index: compress.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/compress.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** compress.c	27 Jun 2005 03:02:45 -0000	1.1.1.1
--- compress.c	10 Apr 2007 21:43:14 -0000	1.2
***************
*** 1,4 ****
  /* compress.c -- compress a memory buffer
!  * Copyright (C) 1995-2002 Jean-loup Gailly.
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
--- 1,4 ----
  /* compress.c -- compress a memory buffer
!  * Copyright (C) 1995-2003 Jean-loup Gailly.
   * For conditions of distribution and use, see copyright notice in zlib.h
   */

Index: ChangeLog
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog	10 Apr 2007 20:13:08 -0000	1.2
--- ChangeLog	10 Apr 2007 21:43:14 -0000	1.3
***************
*** 2,5 ****
--- 2,138 ----
                  ChangeLog file for zlib

+ Changes in 1.2.3 (18 July 2005)
+ - Apply security vulnerability fixes to contrib/infback9 as well
+ - Clean up some text files (carriage returns, trailing space)
+ - Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
+ 
+ Changes in 1.2.2.4 (11 July 2005)
+ - Add inflatePrime() function for starting inflation at bit boundary
+ - Avoid some Visual C warnings in deflate.c
+ - Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
+   compile
+ - Fix some spelling errors in comments [Betts]
+ - Correct inflateInit2() error return documentation in zlib.h
+ - Added zran.c example of compressed data random access to examples
+   directory, shows use of inflatePrime()
+ - Fix cast for assignments to strm->state in inflate.c and infback.c
+ - Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
+ - Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
+ - Add cast in trees.c t avoid a warning [Oberhumer]
+ - Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
+ - Update make_vms.com [Zinser]
+ - Initialize state->write in inflateReset() since copied in inflate_fast()
+ - Be more strict on incomplete code sets in inflate_table() and increase
+   ENOUGH and MAXD -- this repairs a possible security vulnerability for
+   invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
+   discovering the vulnerability and providing test cases.
+ - Add ia64 support to configure for HP-UX [Smith]
+ - Add error return to gzread() for format or i/o error [Levin]
+ - Use malloc.h for OS/2 [Necasek]
+ 
+ Changes in 1.2.2.3 (27 May 2005)
+ - Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
+ - Typecast fread() return values in gzio.c [Vollant]
+ - Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
+ - Fix crc check bug in gzread() after gzungetc() [Heiner]
+ - Add the deflateTune() function to adjust internal compression parameters
+ - Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
+ - Remove an incorrect assertion in examples/zpipe.c
+ - Add C++ wrapper in infback9.h [Donais]
+ - Fix bug in inflateCopy() when decoding fixed codes
+ - Note in zlib.h how much deflateSetDictionary() actually uses
+ - Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
+ - Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
+ - Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
+ - Add gzdirect() function to indicate transparent reads
+ - Update contrib/minizip [Vollant]
+ - Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
+ - Add casts in crc32.c to avoid warnings [Oberhumer]
+ - Add contrib/masmx64 [Vollant]
+ - Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
+ 
+ Changes in 1.2.2.2 (30 December 2004)
+ - Replace structure assignments in deflate.c and inflate.c with zmemcpy to
+   avoid implicit memcpy calls (portability for no-library compilation)
+ - Increase sprintf() buffer size in gzdopen() to allow for large numbers
+ - Add INFLATE_STRICT to check distances against zlib header
+ - Improve WinCE errno handling and comments [Chang]
+ - Remove comment about no gzip header processing in FAQ
+ - Add Z_FIXED strategy option to deflateInit2() to force fixed trees
+ - Add updated make_vms.com [Coghlan], update README
+ - Create a new "examples" directory, move gzappend.c there, add zpipe.c,
+   fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
+ - Add FAQ entry and comments in deflate.c on uninitialized memory access
+ - Add Solaris 9 make options in configure [Gilbert]
+ - Allow strerror() usage in gzio.c for STDC
+ - Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
+ - Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
+ - Use z_off_t for adler32_combine() and crc32_combine() lengths
+ - Make adler32() much faster for small len
+ - Use OS_CODE in deflate() default gzip header
+ 
+ Changes in 1.2.2.1 (31 October 2004)
+ - Allow inflateSetDictionary() call for raw inflate
+ - Fix inflate header crc check bug for file names and comments
+ - Add deflateSetHeader() and gz_header structure for custom gzip headers
+ - Add inflateGetheader() to retrieve gzip headers
+ - Add crc32_combine() and adler32_combine() functions
+ - Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
+ - Use zstreamp consistently in zlib.h (inflate_back functions)
+ - Remove GUNZIP condition from definition of inflate_mode in inflate.h
+   and in contrib/inflate86/inffast.S [Truta, Anderson]
+ - Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
+ - Update projects/README.projects and projects/visualc6 [Truta]
+ - Update win32/DLL_FAQ.txt [Truta]
+ - Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
+ - Deprecate Z_ASCII; use Z_TEXT instead [Truta]
+ - Use a new algorithm for setting strm->data_type in trees.c [Truta]
+ - Do not define an exit() prototype in zutil.c unless DEBUG defined
+ - Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
+ - Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
+ - Fix Darwin build version identification [Peterson]
+ 
+ Changes in 1.2.2 (3 October 2004)
+ - Update zlib.h comments on gzip in-memory processing
+ - Set adler to 1 in inflateReset() to support Java test suite [Walles]
+ - Add contrib/dotzlib [Ravn]
+ - Update win32/DLL_FAQ.txt [Truta]
+ - Update contrib/minizip [Vollant]
+ - Move contrib/visual-basic.txt to old/ [Truta]
+ - Fix assembler builds in projects/visualc6/ [Truta]
+ 
+ Changes in 1.2.1.2 (9 September 2004)
+ - Update INDEX file
+ - Fix trees.c to update strm->data_type (no one ever noticed!)
+ - Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
+ - Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
+ - Add limited multitasking protection to DYNAMIC_CRC_TABLE
+ - Add NO_vsnprintf for VMS in zutil.h [Mozilla]
+ - Don't declare strerror() under VMS [Mozilla]
+ - Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
+ - Update contrib/ada [Anisimkov]
+ - Update contrib/minizip [Vollant]
+ - Fix configure to not hardcode directories for Darwin [Peterson]
+ - Fix gzio.c to not return error on empty files [Brown]
+ - Fix indentation; update version in contrib/delphi/ZLib.pas and
+   contrib/pascal/zlibpas.pas [Truta]
+ - Update mkasm.bat in contrib/masmx86 [Truta]
+ - Update contrib/untgz [Truta]
+ - Add projects/README.projects [Truta]
+ - Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
+ - Update win32/DLL_FAQ.txt [Truta]
+ - Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
+ - Remove an unnecessary assignment to curr in inftrees.c [Truta]
+ - Add OS/2 to exe builds in configure [Poltorak]
+ - Remove err dummy parameter in zlib.h [Kientzle]
+ 
+ Changes in 1.2.1.1 (9 January 2004)
+ - Update email address in README
+ - Several FAQ updates
+ - Fix a big fat bug in inftrees.c that prevented decoding valid
+   dynamic blocks with only literals and no distance codes --
+   Thanks to "Hot Emu" for the bug report and sample file
+ - Add a note to puff.c on no distance codes case.
+ 
  Changes in 1.2.1 (17 November 2003)
  - Remove a tab in contrib/gzappend/gzappend.c
***************
*** 408,412 ****
  - add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
    gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
! - Fix a deflate bug occuring only with compression level 0 (thanks to
    Andy Buckler for finding this one).
  - In minigzip, pass transparently also the first byte for .Z files.
--- 541,545 ----
  - add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
    gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
! - Fix a deflate bug occurring only with compression level 0 (thanks to
    Andy Buckler for finding this one).
  - In minigzip, pass transparently also the first byte for .Z files.
***************
*** 721,879 ****
  - added Z_HUFFMAN_ONLY
  - added gzerror()
- - avoid warning on fdopen (gzio.c) for HP cc -Aa
- - include stdlib.h for STDC compilers
- - include errno.h for Cray
- - ignore error if ranlib doesn't exist
- - call ranlib twice for NeXTSTEP
- - use exec_prefix instead of prefix for libz.a
- - renamed ct_* as _tr_* to avoid conflict with applications
- - clear z->msg in inflateInit2 before any error return
- - initialize opaque in example.c, gzio.c, deflate.c and inflate.c
- - fixed typo in zconf.h (_GNUC__ => __GNUC__)
- - check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
- - fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
- - in fcalloc, normalize pointer if size > 65520 bytes
- - don't use special fcalloc for 32 bit Borland C++
- - use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
- - use Z_BINARY instead of BINARY
- - document that gzclose after gzdopen will close the file
- - allow "a" as mode in gzopen.
- - fix error checking in gzread
- - allow skipping .gz extra-field on pipes
- - added reference to Perl interface in README
- - put the crc table in FAR data (I dislike more and more the medium model :)
- - added get_crc_table
- - added a dimension to all arrays (Borland C can't count).
- - workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
- - guard against multiple inclusion of *.h (for precompiled header on Mac)
- - Watcom C pretends to be Microsoft C small model even in 32 bit mode.
- - don't use unsized arrays to avoid silly warnings by Visual C++:
-      warning C4746: 'inflate_mask' : unsized array treated as  '__far'
-      (what's wrong with far data in far model?).
- - define enum out of inflate_blocks_state to allow compilation with C++
- 
- Changes in 0.95 (16 Aug 95)
- - fix MSDOS small and medium model (now easier to adapt to any compiler)
- - inlined send_bits
- - fix the final (:-) bug for deflate with flush (output was correct but
-   not completely flushed in rare occasions).
- - default window size is same for compression and decompression
-   (it's now sufficient to set MAX_WBITS in zconf.h).
- - voidp -> voidpf and voidnp -> voidp (for consistency with other
-   typedefs and because voidnp was not near in large model).
- 
- Changes in 0.94 (13 Aug 95)
- - support MSDOS medium model
- - fix deflate with flush (could sometimes generate bad output)
- - fix deflateReset (zlib header was incorrectly suppressed)
- - added support for VMS
- - allow a compression level in gzopen()
- - gzflush now calls fflush
- - For deflate with flush, flush even if no more input is provided.
- - rename libgz.a as libz.a
- - avoid complex expression in infcodes.c triggering Turbo C bug
- - work around a problem with gcc on Alpha (in INSERT_STRING)
- - don't use inline functions (problem with some gcc versions)
- - allow renaming of Byte, uInt, etc... with #define.
- - avoid warning about (unused) pointer before start of array in deflate.c
- - avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
- - avoid reserved word 'new' in trees.c
- 
- Changes in 0.93 (25 June 95)
- - temporarily disable inline functions
- - make deflate deterministic
- - give enough lookahead for PARTIAL_FLUSH
- - Set binary mode for stdin/stdout in minigzip.c for OS/2
- - don't even use signed char in inflate (not portable enough)
- - fix inflate memory leak for segmented architectures
- 
- Changes in 0.92 (3 May 95)
- - don't assume that char is signed (problem on SGI)
- - Clear bit buffer when starting a stored block
- - no memcpy on Pyramid
- - suppressed inftest.c
- - optimized fill_window, put longest_match inline for gcc
- - optimized inflate on stored blocks.
- - untabify all sources to simplify patches
- 
- Changes in 0.91 (2 May 95)
- - Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
- - Document the memory requirements in zconf.h
- - added "make install"
- - fix sync search logic in inflateSync
- - deflate(Z_FULL_FLUSH) now works even if output buffer too short
- - after inflateSync, don't scare people with just "lo world"
- - added support for DJGPP
- 
- Changes in 0.9 (1 May 95)
- - don't assume that zalloc clears the allocated memory (the TurboC bug
-   was Mark's bug after all :)
- - let again gzread copy uncompressed data unchanged (was working in 0.71)
- - deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
- - added a test of inflateSync in example.c
- - moved MAX_WBITS to zconf.h because users might want to change that.
- - document explicitly that zalloc(64K) on MSDOS must return a normalized
-   pointer (zero offset)
- - added Makefiles for Microsoft C, Turbo C, Borland C++
- - faster crc32()
- 
- Changes in 0.8 (29 April 95)
- - added fast inflate (inffast.c)
- - deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
-   is incompatible with previous versions of zlib which returned Z_OK.
- - work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
-   (actually that was not a compiler bug, see 0.81 above)
- - gzread no longer reads one extra byte in certain cases
- - In gzio destroy(), don't reference a freed structure
- - avoid many warnings for MSDOS
- - avoid the ERROR symbol which is used by MS Windows
- 
- Changes in 0.71 (14 April 95)
- - Fixed more MSDOS compilation problems :( There is still a bug with
-   TurboC large model.
- 
- Changes in 0.7 (14 April 95)
- - Added full inflate support.
- - Simplified the crc32() interface. The pre- and post-conditioning
-   (one's complement) is now done inside crc32(). WARNING: this is
-   incompatible with previous versions; see zlib.h for the new usage.
- 
- Changes in 0.61 (12 April 95)
- - workaround for a bug in TurboC. example and minigzip now work on MSDOS.
- 
- Changes in 0.6 (11 April 95)
- - added minigzip.c
- - added gzdopen to reopen a file descriptor as gzFile
- - added transparent reading of non-gziped files in gzread.
- - fixed bug in gzread (don't read crc as data)
- - fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
- - don't allocate big arrays in the stack (for MSDOS)
- - fix some MSDOS compilation problems
- 
- Changes in 0.5:
- - do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
-   not yet Z_FULL_FLUSH.
- - support decompression but only in a single step (forced Z_FINISH)
- - added opaque object for zalloc and zfree.
- - added deflateReset and inflateReset
- - added a variable zlib_version for consistency checking.
- - renamed the 'filter' parameter of deflateInit2 as 'strategy'.
-   Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
- 
- Changes in 0.4:
- - avoid "zip" everywhere, use zlib instead of ziplib.
- - suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
-   if compression method == 8.
- - added adler32 and crc32
- - renamed deflateOptions as deflateInit2, call one or the other but not both
- - added the method parameter for deflateInit2.
- - added inflateInit2
- - simplied considerably deflateInit and inflateInit by not supporting
-   user-provided history buffer. This is supported only in deflateInit2
-   and inflateInit2.
- 
- Changes in 0.3:
- - prefix all macro names with Z_
- - use Z_FINISH instead of deflateEnd to finish compression.
- - added Z_HUFFMAN_ONLY
- - added gzerror()
--- 854,855 ----

Index: example.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/example.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** example.c	27 Jun 2005 03:02:41 -0000	1.1.1.1
--- example.c	10 Apr 2007 21:43:14 -0000	1.2
***************
*** 1,4 ****
  /* example.c -- usage example of the zlib compression library
!  * Copyright (C) 1995-2003 Jean-loup Gailly.
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
--- 1,4 ----
  /* example.c -- usage example of the zlib compression library
!  * Copyright (C) 1995-2004 Jean-loup Gailly.
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
***************
*** 12,17 ****
  #  include <string.h>
  #  include <stdlib.h>
- #else
-    extern void exit  OF((int));
  #endif

--- 12,15 ----

2004	Jan	Feb	Mar	Apr	May	Jun	Jul (16)	Aug (7)	Sep (4)	Oct (94)	Nov (11)	Dec (2)
2005	Jan (2)	Feb	Mar	Apr	May (128)	Jun (22)	Jul (46)	Aug	Sep (15)	Oct	Nov	Dec (32)
2006	Jan (11)	Feb (2)	Mar (74)	Apr (3)	May	Jun (11)	Jul	Aug	Sep	Oct (11)	Nov	Dec
2007	Jan	Feb	Mar	Apr (23)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

solidircd-cvs Mailing List for Solid IRCd

solidircd-cvs — CVS