Update to zlib-1.2.5.

This contains numerous bug fixes and improvements.  For more details,
see the ChangeLog.

Incorporated in this commit is removal of using patch files, and just
making the appropriate changes on master.

diff --git a/contrib/zlib-1.2/gzguts.h b/contrib/zlib-1.2/gzguts.h
index 0f8fb79..8b7fd73 100644 (file)
--- a/contrib/zlib-1.2/gzguts.h
+++ b/contrib/zlib-1.2/gzguts.h
@@ -26,6 +26,7 @@
 #  include <limits.h>
 #endif
 #include <fcntl.h>
+#include <unistd.h>
 
 #ifdef NO_DEFLATE       /* for compatibility with old definition */
 #  define NO_GZCOMPRESS

diff --git a/contrib/zlib-1.2/zlib.h b/contrib/zlib-1.2/zlib.h
index bfbba83..a384266 100644 (file)
--- a/contrib/zlib-1.2/zlib.h
+++ b/contrib/zlib-1.2/zlib.h
@@ -28,8 +28,8 @@
   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
 */
 
-#ifndef ZLIB_H
-#define ZLIB_H
+#ifndef _ZLIB_H
+#define _ZLIB_H
 
 #include "zconf.h"
 
@@ -1610,4 +1610,4 @@ ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 }
 #endif
 
-#endif /* ZLIB_H */
+#endif /* _ZLIB_H */

diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index b9d90a0..4b146f3 100644 (file)
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -7,16 +7,15 @@ LIB=          z
 MAN=           zlib.3
 WARNS?=                2
 
-PATCHES!=      echo ${.CURDIR}/patches/*.patch
 CONTRIBDIR=    ${.CURDIR}/../../contrib/zlib-1.2
 
 .PATH: ${CONTRIBDIR}
 
-SRCS=  adler32.c compress.c crc32.c deflate.c gzio.c infback.c
+SRCS=  adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c
+SRCS+= gzwrite.c infback.c
 SRCS+= inffast.c inflate.c inftrees.c trees.c uncompr.c zopen.c zutil.c
-SRCS+= ${PATCHES}
 
-CFLAGS+= -I${.OBJDIR} -I${CONTRIBDIR}
+CFLAGS+= -I${CONTRIBDIR}
 
 INCS=          zconf.h zlib.h
 

diff --git a/lib/libz/Makefile.stand b/lib/libz/Makefile.stand
index 103177c..076fa37 100644 (file)
--- a/lib/libz/Makefile.stand
+++ b/lib/libz/Makefile.stand
@@ -9,12 +9,3 @@ ZLIBDIR= ${.CURDIR}/../../contrib/zlib-1.2
 CFLAGS+=-DHAVE_MEMCPY -I${ZLIBDIR}
 SRCS+= adler32.c crc32.c deflate.c infback.c inffast.c inflate.c \
        inftrees.c zutil.c
-
-ZLIB_PATCHES!= echo ${.CURDIR}/../libz/patches/*.patch
-.for patch in ${ZLIB_PATCHES}
-.for file in ${patch:R:T}
-CLEANFILES+=   ${file}
-${file}: ${ZLIBDIR}/${file} ${patch}
-       patch -o ${.TARGET} -i ${patch} ${ZLIBDIR}/${file}
-.endfor
-.endfor

diff --git a/lib/libz/patches/zconf.h.patch b/lib/libz/patches/zconf.h.patch
deleted file mode 100644 (file)
index 8a64568..0000000
--- a/lib/libz/patches/zconf.h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-$DragonFly: src/lib/libz/patches/zconf.h.patch,v 1.1 2004/11/12 18:10:42 joerg Exp $
-
---- zconf.h.orig       2004-11-12 18:56:36.000000000 +0100
-+++ zconf.h    2004-11-12 18:56:46.000000000 +0100
-@@ -5,8 +5,8 @@
- 
- /* @(#) $Id$ */
- 
--#ifndef ZCONF_H
--#define ZCONF_H
-+#ifndef _ZCONF_H
-+#define _ZCONF_H
- 
- /*
-  * If you *really* need a unique prefix for all types and library functions,
-@@ -323,4 +323,4 @@
- #   pragma map(inflate_copyright,"INCOPY")
- #endif
- 
--#endif /* ZCONF_H */
-+#endif /* _ZCONF_H */

diff --git a/lib/libz/patches/zlib.h.patch b/lib/libz/patches/zlib.h.patch
deleted file mode 100644 (file)
index b2bb130..0000000
--- a/lib/libz/patches/zlib.h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-$DragonFly: src/lib/libz/patches/zlib.h.patch,v 1.1 2004/11/12 18:10:42 joerg Exp $
-
---- zlib.h.orig        2004-10-23 15:49:54.000000000 +0200
-+++ zlib.h     2004-11-12 18:57:57.000000000 +0100
-@@ -28,8 +28,8 @@
-   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
- */
- 
--#ifndef ZLIB_H
--#define ZLIB_H
-+#ifndef _ZLIB_H
-+#define _ZLIB_H
- 
- #include "zconf.h"
- 
-@@ -1197,4 +1197,4 @@
- }
- #endif
- 
--#endif /* ZLIB_H */
-+#endif /* _ZLIB_H */