From owner-svn-src-user@FreeBSD.ORG Sun Nov 29 22:43:52 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 922E31065672; Sun, 29 Nov 2009 22:43:52 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7D36F8FC1F; Sun, 29 Nov 2009 22:43:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nATMhqtA011767; Sun, 29 Nov 2009 22:43:52 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nATMhqBT011744; Sun, 29 Nov 2009 22:43:52 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911292243.nATMhqBT011744@svn.freebsd.org> From: Kip Macy Date: Sun, 29 Nov 2009 22:43:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199954 - in user/kmacy/head_zlib/sys: cddl/contrib/opensolaris/uts/common/zmod conf dev/mxge geom/uzip kern libkern/zlib modules/crypto modules/netgraph modules/zfs modules/zlib net ne... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 22:43:52 -0000 Author: kmacy Date: Sun Nov 29 22:43:51 2009 New Revision: 199954 URL: http://svn.freebsd.org/changeset/base/199954 Log: - update zlib to 1.2.3 - move files in to libkern - point all of the kernel at updated zlib - bz needs to integrate his ng_deflate fixes (currently disabled in the build) - zfs needs to now be marked as depending on zlib (add MODULE_DEPEND to zmod.c) Added: user/kmacy/head_zlib/sys/libkern/zlib/ - copied from r193049, user/kmacy/releng_7_2_fcs/sys/libkern/zlib/ user/kmacy/head_zlib/sys/opencrypto/opencrypto_deflate.c - copied, changed from r199952, user/kmacy/head_zlib/sys/opencrypto/deflate.c Deleted: user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c user/kmacy/head_zlib/sys/kern/inflate.c user/kmacy/head_zlib/sys/net/zlib.c user/kmacy/head_zlib/sys/net/zlib.h user/kmacy/head_zlib/sys/opencrypto/deflate.c Modified: user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c user/kmacy/head_zlib/sys/conf/NOTES user/kmacy/head_zlib/sys/conf/files user/kmacy/head_zlib/sys/dev/mxge/if_mxge.c user/kmacy/head_zlib/sys/geom/uzip/g_uzip.c user/kmacy/head_zlib/sys/kern/link_elf.c user/kmacy/head_zlib/sys/kern/link_elf_obj.c user/kmacy/head_zlib/sys/libkern/zlib/deflate.c user/kmacy/head_zlib/sys/libkern/zlib/inflate.c user/kmacy/head_zlib/sys/libkern/zlib/trees.c user/kmacy/head_zlib/sys/libkern/zlib/uncompr.c user/kmacy/head_zlib/sys/libkern/zlib/zl_crc32.c user/kmacy/head_zlib/sys/libkern/zlib/zlib.h user/kmacy/head_zlib/sys/libkern/zlib/zutil.c user/kmacy/head_zlib/sys/libkern/zlib/zutil.h user/kmacy/head_zlib/sys/modules/crypto/Makefile user/kmacy/head_zlib/sys/modules/netgraph/Makefile user/kmacy/head_zlib/sys/modules/zfs/Makefile user/kmacy/head_zlib/sys/modules/zlib/Makefile user/kmacy/head_zlib/sys/netgraph/ng_deflate.c user/kmacy/head_zlib/sys/opencrypto/deflate.h Modified: user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c ============================================================================== --- user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c Sun Nov 29 22:43:51 2009 (r199954) @@ -30,41 +30,6 @@ #include "zlib.h" #include "zutil.h" -/* - * Uncompress the buffer 'src' into the buffer 'dst'. The caller must store - * the expected decompressed data size externally so it can be passed in. - * The resulting decompressed size is then returned through dstlen. This - * function return Z_OK on success, or another error code on failure. - */ -int -z_uncompress(void *dst, size_t *dstlen, const void *src, size_t srclen) -{ - z_stream zs; - int err; - - bzero(&zs, sizeof (zs)); - zs.next_in = (uchar_t *)src; - zs.avail_in = srclen; - zs.next_out = dst; - zs.avail_out = *dstlen; - - /* - * Call inflateInit2() specifying a window size of DEF_WBITS - * with the 6th bit set to indicate that the compression format - * type (zlib or gzip) should be automatically detected. - */ - if ((err = inflateInit2(&zs, DEF_WBITS | 0x20)) != Z_OK) - return (err); - - if ((err = inflate(&zs, Z_FINISH)) != Z_STREAM_END) { - (void) inflateEnd(&zs); - return (err == Z_OK ? Z_BUF_ERROR : err); - } - - *dstlen = zs.total_out; - return (inflateEnd(&zs)); -} - int z_compress_level(void *dst, size_t *dstlen, const void *src, size_t srclen, int level) @@ -91,13 +56,6 @@ z_compress_level(void *dst, size_t *dstl return (deflateEnd(&zs)); } -int -z_compress(void *dst, size_t *dstlen, const void *src, size_t srclen) -{ - return (z_compress_level(dst, dstlen, src, srclen, - Z_DEFAULT_COMPRESSION)); -} - /* * Convert a zlib error code into a string error message. */ Modified: user/kmacy/head_zlib/sys/conf/NOTES ============================================================================== --- user/kmacy/head_zlib/sys/conf/NOTES Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/conf/NOTES Sun Nov 29 22:43:51 2009 (r199954) @@ -670,7 +670,7 @@ options NETGRAPH_BPF options NETGRAPH_BRIDGE options NETGRAPH_CAR options NETGRAPH_CISCO -options NETGRAPH_DEFLATE +#options NETGRAPH_DEFLATE options NETGRAPH_DEVICE options NETGRAPH_ECHO options NETGRAPH_EIFACE Modified: user/kmacy/head_zlib/sys/conf/files ============================================================================== --- user/kmacy/head_zlib/sys/conf/files Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/conf/files Sun Nov 29 22:43:51 2009 (r199954) @@ -1964,7 +1964,6 @@ kern/cpufreq_if.m standard kern/device_if.m standard kern/imgact_elf.c standard kern/imgact_shell.c standard -kern/inflate.c optional gzip kern/init_main.c standard kern/init_sysent.c standard kern/ksched.c optional _kposix_priority_scheduling @@ -2272,10 +2271,36 @@ net/route.c standard net/rtsock.c standard net/slcompress.c optional netgraph_vjc | sppp | \ netgraph_sppp -net/vnet.c optional vimage -net/zlib.c optional crypto | geom_uzip | ipsec | \ - mxge | netgraph_deflate | \ - ddb_ctf +libkern/zlib/adler32.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip +libkern/zlib/compress.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip +libkern/zlib/deflate.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip +libkern/zlib/inflate.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip +libkern/zlib/inffast.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip +libkern/zlib/inftrees.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip +libkern/zlib/trees.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip +libkern/zlib/uncompr.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip +libkern/zlib/zutil.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip +libkern/zlib/zl_crc32.c optional zfs | crypto | geom_uzip | ipsec | \ + mxge | ppp_deflate | \ + netgraph_deflate | ddb_ctf | gzip net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan wlan_acl net80211/ieee80211_action.c optional wlan @@ -2569,7 +2594,7 @@ opencrypto/crypto.c optional crypto opencrypto/cryptodev.c optional cryptodev opencrypto/cryptodev_if.m optional crypto opencrypto/cryptosoft.c optional crypto -opencrypto/deflate.c optional crypto +opencrypto/opencrypto_deflate.c optional crypto opencrypto/rmd160.c optional crypto | ipsec opencrypto/skipjack.c optional crypto opencrypto/xform.c optional crypto Modified: user/kmacy/head_zlib/sys/dev/mxge/if_mxge.c ============================================================================== --- user/kmacy/head_zlib/sys/dev/mxge/if_mxge.c Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/dev/mxge/if_mxge.c Sun Nov 29 22:43:51 2009 (r199954) @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include #include Modified: user/kmacy/head_zlib/sys/geom/uzip/g_uzip.c ============================================================================== --- user/kmacy/head_zlib/sys/geom/uzip/g_uzip.c Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/geom/uzip/g_uzip.c Sun Nov 29 22:43:51 2009 (r199954) @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #undef GEOM_UZIP_DEBUG #ifdef GEOM_UZIP_DEBUG Modified: user/kmacy/head_zlib/sys/kern/link_elf.c ============================================================================== --- user/kmacy/head_zlib/sys/kern/link_elf.c Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/kern/link_elf.c Sun Nov 29 22:43:51 2009 (r199954) @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); #include #ifdef DDB_CTF -#include +#include #endif #include "linker_if.h" Modified: user/kmacy/head_zlib/sys/kern/link_elf_obj.c ============================================================================== --- user/kmacy/head_zlib/sys/kern/link_elf_obj.c Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/kern/link_elf_obj.c Sun Nov 29 22:43:51 2009 (r199954) @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include #ifdef DDB_CTF -#include +#include #endif #include "linker_if.h" Modified: user/kmacy/head_zlib/sys/libkern/zlib/deflate.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/deflate.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/head_zlib/sys/libkern/zlib/deflate.c Sun Nov 29 22:43:51 2009 (r199954) @@ -93,10 +93,12 @@ local uInt longest_match OF((deflate_st #endif local uInt longest_match_fast OF((deflate_state *s, IPos cur_match)); +#if 0 #ifdef DEBUG local void check_match OF((deflate_state *s, IPos start, IPos match, int length)); #endif +#endif /* =========================================================================== * Local data @@ -297,7 +299,7 @@ int ZEXPORT deflateInit2_(strm, level, m if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || s->pending_buf == Z_NULL) { s->status = FINISH_STATE; - strm->msg = (char*)ERR_MSG(Z_MEM_ERROR); + strm->msg = __DECONST(char*, ERR_MSG(Z_MEM_ERROR)); deflateEnd (strm); return Z_MEM_ERROR; } @@ -1225,7 +1227,7 @@ local uInt longest_match_fast(s, cur_mat return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; } -#ifdef DEBUG +#if 0 /* =========================================================================== * Check that the match at match_start is indeed a match. */ Modified: user/kmacy/head_zlib/sys/libkern/zlib/inflate.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/inflate.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/head_zlib/sys/libkern/zlib/inflate.c Sun Nov 29 22:43:51 2009 (r199954) @@ -245,7 +245,7 @@ struct inflate_state FAR *state; state->distbits = 5; } -#ifdef MAKEFIXED +#if 0 #include /* Modified: user/kmacy/head_zlib/sys/libkern/zlib/trees.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/trees.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/head_zlib/sys/libkern/zlib/trees.c Sun Nov 29 22:43:51 2009 (r199954) @@ -35,9 +35,6 @@ #include -#ifdef DEBUG -# include -#endif /* =========================================================================== * Constants @@ -163,7 +160,7 @@ local void copy_block OF((deflate_st local void gen_trees_header OF((void)); #endif -#ifndef DEBUG +#if 1 # define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) /* Send a code of the given tree. c and tree must not have side effects */ @@ -318,7 +315,7 @@ local void tr_static_init() /* =========================================================================== * Genererate the file trees.h describing the static trees. */ -#ifdef GEN_TREES_H +#if 0 # ifndef DEBUG # include # endif @@ -986,7 +983,8 @@ void _tr_flush_block(s, buf, stored_len, } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { #endif send_bits(s, (STATIC_TREES<<1)+eof, 3); - compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); + compress_block(s, __DECONST(ct_data *,static_ltree), + __DECONST(ct_data *,static_dtree)); #ifdef DEBUG s->compressed_len += 3 + s->static_len; #endif Modified: user/kmacy/head_zlib/sys/libkern/zlib/uncompr.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/uncompr.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/head_zlib/sys/libkern/zlib/uncompr.c Sun Nov 29 22:43:51 2009 (r199954) @@ -32,7 +32,7 @@ int ZEXPORT uncompress (dest, destLen, s z_stream stream; int err; - stream.next_in = (Bytef*)source; + stream.next_in = (Bytef*)(uintptr_t)source; stream.avail_in = (uInt)sourceLen; /* Check for source > 64K on 16-bit machine: */ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; Modified: user/kmacy/head_zlib/sys/libkern/zlib/zl_crc32.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zl_crc32.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/head_zlib/sys/libkern/zlib/zl_crc32.c Sun Nov 29 22:43:51 2009 (r199954) @@ -22,7 +22,7 @@ one thread to use crc32(). */ -#ifdef MAKECRCH +#if 0 # include # ifndef DYNAMIC_CRC_TABLE # define DYNAMIC_CRC_TABLE Modified: user/kmacy/head_zlib/sys/libkern/zlib/zlib.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zlib.h Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/head_zlib/sys/libkern/zlib/zlib.h Sun Nov 29 22:43:51 2009 (r199954) @@ -30,7 +30,7 @@ #ifndef ZLIB_H #define ZLIB_H - +#include #include #ifdef __cplusplus Modified: user/kmacy/head_zlib/sys/libkern/zlib/zutil.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/head_zlib/sys/libkern/zlib/zutil.c Sun Nov 29 22:43:51 2009 (r199954) @@ -5,8 +5,20 @@ /* @(#) $Id$ */ + +#ifdef _KERNEL #include +/* Assume this is a *BSD or SVR4 kernel */ +#include +#include +#include +#include +#include +#include +# define HAVE_MEMCPY +#endif + #ifndef NO_DUMMY_DECL struct internal_state {int dummy;}; /* for buggy compilers */ #endif @@ -112,7 +124,7 @@ uLong ZEXPORT zlibCompileFlags() return flags; } -#ifdef DEBUG +#if 0 # ifndef verbose # define verbose 0 @@ -334,3 +346,25 @@ zcfree(void *opaque, void *ptr) #endif /* MY_ZCALLOC */ + +#ifdef _KERNEL +static int +zlib_modevent(module_t mod, int type, void *unused) +{ + switch (type) { + case MOD_LOAD: + return 0; + case MOD_UNLOAD: + return 0; + } + return EINVAL; +} + +static moduledata_t zlib_mod = { + "zlib", + zlib_modevent, + 0 +}; +DECLARE_MODULE(zlib, zlib_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); +MODULE_VERSION(zlib, 1); +#endif /* _KERNEL */ Modified: user/kmacy/head_zlib/sys/libkern/zlib/zutil.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/head_zlib/sys/libkern/zlib/zutil.h Sun Nov 29 22:43:51 2009 (r199954) @@ -61,7 +61,7 @@ extern const char * const z_errmsg[10]; #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] #define ERR_RETURN(strm,err) \ - return (strm->msg = (char*)ERR_MSG(err), (err)) + return (strm->msg = (char*)(uintptr_t)ERR_MSG(err), (err)) /* To be used only when the state is known to be valid */ /* common constants */ @@ -243,7 +243,7 @@ extern const char * const z_errmsg[10]; #endif /* Diagnostic functions */ -#ifdef DEBUG +#if 0 # include extern int z_verbose; extern void z_error OF((char *m)); Modified: user/kmacy/head_zlib/sys/modules/crypto/Makefile ============================================================================== --- user/kmacy/head_zlib/sys/modules/crypto/Makefile Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/modules/crypto/Makefile Sun Nov 29 22:43:51 2009 (r199954) @@ -11,8 +11,8 @@ KMOD = crypto SRCS = crypto.c cryptodev_if.c SRCS += criov.c cryptosoft.c xform.c -SRCS += cast.c deflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c -SRCS += skipjack.c bf_enc.c bf_skey.c +SRCS += cast.c opencrypto_deflate.c rmd160.c rijndael-alg-fst.c +SRCS += rijndael-api.c skipjack.c bf_enc.c bf_skey.c SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha2.c SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h Modified: user/kmacy/head_zlib/sys/modules/netgraph/Makefile ============================================================================== --- user/kmacy/head_zlib/sys/modules/netgraph/Makefile Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/modules/netgraph/Makefile Sun Nov 29 22:43:51 2009 (r199954) @@ -11,7 +11,6 @@ SUBDIR= async \ bridge \ car \ cisco \ - deflate \ device \ echo \ eiface \ @@ -53,6 +52,9 @@ SUBDIR= async \ vjc \ vlan +# deflate \ + + .if ${MK_BLUETOOTH} != "no" || defined(ALL_MODULES) _bluetooth= bluetooth .endif Modified: user/kmacy/head_zlib/sys/modules/zfs/Makefile ============================================================================== --- user/kmacy/head_zlib/sys/modules/zfs/Makefile Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/modules/zfs/Makefile Sun Nov 29 22:43:51 2009 (r199954) @@ -45,16 +45,7 @@ SRCS+= list.c SRCS+= nvpair_alloc_system.c .PATH: ${SUNW}/uts/common/zmod -SRCS+= adler32.c -SRCS+= opensolaris_crc32.c -SRCS+= deflate.c -SRCS+= inffast.c -SRCS+= inflate.c -SRCS+= inftrees.c -SRCS+= trees.c SRCS+= zmod.c -SRCS+= zmod_subr.c -SRCS+= zutil.c .PATH: ${SUNW}/common/zfs .include "${SUNW}/uts/common/Makefile.files" Modified: user/kmacy/head_zlib/sys/modules/zlib/Makefile ============================================================================== --- user/kmacy/head_zlib/sys/modules/zlib/Makefile Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/modules/zlib/Makefile Sun Nov 29 22:43:51 2009 (r199954) @@ -1,8 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${.CURDIR}/../../libkern/zlib KMOD= zlib -SRCS= zlib.c +SRCS= adler32.c compress.c deflate.c inflate.c inffast.c inftrees.c +SRCS+= trees.c uncompr.c zutil.c zl_crc32.c .include Modified: user/kmacy/head_zlib/sys/netgraph/ng_deflate.c ============================================================================== --- user/kmacy/head_zlib/sys/netgraph/ng_deflate.c Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/netgraph/ng_deflate.c Sun Nov 29 22:43:51 2009 (r199954) @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include Modified: user/kmacy/head_zlib/sys/opencrypto/deflate.h ============================================================================== --- user/kmacy/head_zlib/sys/opencrypto/deflate.h Sun Nov 29 22:33:59 2009 (r199953) +++ user/kmacy/head_zlib/sys/opencrypto/deflate.h Sun Nov 29 22:43:51 2009 (r199954) @@ -36,7 +36,7 @@ #ifndef _CRYPTO_DEFLATE_H_ #define _CRYPTO_DEFLATE_H_ -#include +#include #define Z_METHOD 8 #define Z_MEMLEVEL 8 Copied and modified: user/kmacy/head_zlib/sys/opencrypto/opencrypto_deflate.c (from r199952, user/kmacy/head_zlib/sys/opencrypto/deflate.c) ============================================================================== --- user/kmacy/head_zlib/sys/opencrypto/deflate.c Sun Nov 29 21:34:52 2009 (r199952, copy source) +++ user/kmacy/head_zlib/sys/opencrypto/opencrypto_deflate.c Sun Nov 29 22:43:51 2009 (r199954) @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include