From owner-svn-src-user@FreeBSD.ORG Fri May 29 19:09:53 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 D62D81065687; Fri, 29 May 2009 19:09:53 +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 C1DC08FC19; Fri, 29 May 2009 19:09:53 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TJ9rUO083832; Fri, 29 May 2009 19:09:53 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TJ9rda083820; Fri, 29 May 2009 19:09:53 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905291909.n4TJ9rda083820@svn.freebsd.org> From: Kip Macy Date: Fri, 29 May 2009 19:09:53 +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: r193050 - in user/kmacy/releng_7_2_fcs/sys: cddl/contrib/opensolaris/uts/common/zmod conf dev/mxge geom/uzip kern modules/zlib net netgraph opencrypto 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: Fri, 29 May 2009 19:09:54 -0000 Author: kmacy Date: Fri May 29 19:09:53 2009 New Revision: 193050 URL: http://svn.freebsd.org/changeset/base/193050 Log: switch kernel over to pointing at zlib 1.2.3 Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c user/kmacy/releng_7_2_fcs/sys/conf/files user/kmacy/releng_7_2_fcs/sys/dev/mxge/if_mxge.c user/kmacy/releng_7_2_fcs/sys/geom/uzip/g_uzip.c user/kmacy/releng_7_2_fcs/sys/kern/link_elf.c user/kmacy/releng_7_2_fcs/sys/kern/link_elf_obj.c user/kmacy/releng_7_2_fcs/sys/modules/zlib/Makefile user/kmacy/releng_7_2_fcs/sys/net/ppp_deflate.c user/kmacy/releng_7_2_fcs/sys/netgraph/ng_deflate.c user/kmacy/releng_7_2_fcs/sys/opencrypto/deflate.c user/kmacy/releng_7_2_fcs/sys/opencrypto/deflate.h Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c Fri May 29 19:09:53 2009 (r193050) @@ -36,6 +36,7 @@ * The resulting decompressed size is then returned through dstlen. This * function return Z_OK on success, or another error code on failure. */ +#if 0 int z_uncompress(void *dst, size_t *dstlen, const void *src, size_t srclen) { @@ -64,6 +65,7 @@ z_uncompress(void *dst, size_t *dstlen, *dstlen = zs.total_out; return (inflateEnd(&zs)); } +#endif int z_compress_level(void *dst, size_t *dstlen, const void *src, size_t srclen, @@ -91,13 +93,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. */ @@ -111,3 +106,12 @@ z_strerror(int err) return (zError(err)); } + +#if 0 +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)); +} +#endif Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c Fri May 29 19:09:53 2009 (r193050) @@ -30,40 +30,7 @@ #include #include -struct zchdr { - uint_t zch_magic; - uint_t zch_size; -}; - -#define ZCH_MAGIC 0x3cc13cc1 - -/*ARGSUSED*/ -void * -zcalloc(void *opaque, uint_t items, uint_t size) -{ - size_t nbytes = sizeof (struct zchdr) + items * size; - struct zchdr *z = kobj_zalloc(nbytes, KM_NOWAIT|KM_TMP); - - if (z == NULL) - return (NULL); - - z->zch_magic = ZCH_MAGIC; - z->zch_size = nbytes; - - return (z + 1); -} - /*ARGSUSED*/ -void -zcfree(void *opaque, void *ptr) -{ - struct zchdr *z = ((struct zchdr *)ptr) - 1; - - if (z->zch_magic != ZCH_MAGIC) - panic("zcfree region corrupt: hdr=%p ptr=%p", (void *)z, ptr); - - kobj_free(z, z->zch_size); -} void zmemcpy(void *dest, const void *source, uint_t len) Modified: user/kmacy/releng_7_2_fcs/sys/conf/files ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/conf/files Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/conf/files Fri May 29 19:09:53 2009 (r193050) @@ -1523,62 +1523,7 @@ gnu/fs/reiserfs/reiserfs_stree.c optiona gnu/fs/reiserfs/reiserfs_vfsops.c optional reiserfs gnu/fs/reiserfs/reiserfs_vnops.c optional reiserfs # -# isdn4bsd device drivers -# -i4b/driver/i4b_trace.c optional i4btrc -i4b/driver/i4b_rbch.c optional i4brbch -i4b/driver/i4b_tel.c optional i4btel -#XXXBZ#i4b/driver/i4b_ipr.c optional i4bipr -net/slcompress.c optional i4bipr | i4bisppp -i4b/driver/i4b_ctl.c optional i4bctl -#XXXBZ#i4b/driver/i4b_ing.c optional i4bing -#XXXBZ#i4b/driver/i4b_isppp.c optional i4bisppp -# -# isdn4bsd CAPI driver -# -i4b/capi/capi_l4if.c optional i4bcapi -i4b/capi/capi_llif.c optional i4bcapi -i4b/capi/capi_msgs.c optional i4bcapi -# -# isdn4bsd AVM B1/T1 CAPI driver -# -i4b/capi/iavc/iavc_pci.c optional iavc i4bcapi pci -i4b/capi/iavc/iavc_isa.c optional iavc i4bcapi isa -i4b/capi/iavc/iavc_lli.c optional iavc i4bcapi -i4b/capi/iavc/iavc_card.c optional iavc i4bcapi -# -# isdn4bsd support -# -i4b/layer2/i4b_mbuf.c optional i4btrc -# -# isdn4bsd Q.921 handler -# -i4b/layer2/i4b_l2.c optional i4bq921 -i4b/layer2/i4b_l2fsm.c optional i4bq921 -i4b/layer2/i4b_uframe.c optional i4bq921 -i4b/layer2/i4b_tei.c optional i4bq921 -i4b/layer2/i4b_sframe.c optional i4bq921 -i4b/layer2/i4b_iframe.c optional i4bq921 -i4b/layer2/i4b_l2timer.c optional i4bq921 -i4b/layer2/i4b_util.c optional i4bq921 -i4b/layer2/i4b_lme.c optional i4bq921 -# -# isdn4bsd Q.931 handler -# -i4b/layer3/i4b_q931.c optional i4bq931 -i4b/layer3/i4b_l3fsm.c optional i4bq931 -i4b/layer3/i4b_l3timer.c optional i4bq931 -i4b/layer3/i4b_l2if.c optional i4bq931 -i4b/layer3/i4b_l4if.c optional i4bq931 -i4b/layer3/i4b_q932fac.c optional i4bq931 -# -# isdn4bsd control device driver, interface to isdnd -# -i4b/layer4/i4b_i4bdrv.c optional i4b -i4b/layer4/i4b_l4.c optional i4b -i4b/layer4/i4b_l4mgmt.c optional i4b -i4b/layer4/i4b_l4timer.c optional i4b -# + isa/isa_if.m standard isa/isa_common.c optional isa isa/isahint.c optional isa @@ -1599,7 +1544,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 @@ -1852,9 +1796,36 @@ net/route.c standard net/rtsock.c standard net/slcompress.c optional netgraph_vjc | ppp | sl | sppp | \ netgraph_sppp -net/zlib.c optional crypto | geom_uzip | ipsec | \ - mxge | ppp_deflate | zfs | \ - 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_acl net80211/ieee80211_amrr.c optional wlan_amrr @@ -2449,19 +2420,6 @@ cddl/contrib/opensolaris/uts/common/os/n compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" cddl/contrib/opensolaris/uts/common/os/taskq.c optional zfs \ compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" -cddl/contrib/opensolaris/uts/common/zmod/inflate.c optional zfs \ - compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" -cddl/contrib/opensolaris/uts/common/zmod/inftrees.c optional zfs \ - compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" -cddl/contrib/opensolaris/uts/common/zmod/adler32.c optional zfs \ - compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" -cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c optional zfs \ - compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" -cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c optional zfs \ - compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" - - - cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c optional zfs \ compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c optional zfs \ @@ -2623,9 +2581,22 @@ cddl/contrib/opensolaris/uts/common/fs/z # compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" #cddl/contrib/opensolaris/uts/common/zmod/trees.c optional zfs \ # compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" -#cddl/contrib/opensolaris/uts/common/zmod/zmod.c optional zfs \ -# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" #cddl/contrib/opensolaris/uts/common/zmod/zutil.c optional zfs \ # compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" +#cddl/contrib/opensolaris/uts/common/zmod/inflate.c optional zfs \ +# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" +#cddl/contrib/opensolaris/uts/common/zmod/inftrees.c optional zfs \ +# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" +#cddl/contrib/opensolaris/uts/common/zmod/adler32.c optional zfs \ +# compile-with "${ZFS_C} ${OPENSOLARIS_IsNC} ${ZFS_INC} ${ZFS_CFLAGS}" +#cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c optional zfs \ +# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" +#cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c optional zfs \ +# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" + +cddl/contrib/opensolaris/uts/common/zmod/zmod.c optional zfs \ + compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}" + + Modified: user/kmacy/releng_7_2_fcs/sys/dev/mxge/if_mxge.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/mxge/if_mxge.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/dev/mxge/if_mxge.c Fri May 29 19:09:53 2009 (r193050) @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include #include Modified: user/kmacy/releng_7_2_fcs/sys/geom/uzip/g_uzip.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/geom/uzip/g_uzip.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/geom/uzip/g_uzip.c Fri May 29 19:09:53 2009 (r193050) @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #undef GEOM_UZIP_DEBUG #ifdef GEOM_UZIP_DEBUG Modified: user/kmacy/releng_7_2_fcs/sys/kern/link_elf.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/kern/link_elf.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/kern/link_elf.c Fri May 29 19:09:53 2009 (r193050) @@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$"); #include #ifdef DDB_CTF -#include +#include #endif #include "linker_if.h" Modified: user/kmacy/releng_7_2_fcs/sys/kern/link_elf_obj.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/kern/link_elf_obj.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/kern/link_elf_obj.c Fri May 29 19:09:53 2009 (r193050) @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include #ifdef DDB_CTF -#include +#include #endif #include "linker_if.h" Modified: user/kmacy/releng_7_2_fcs/sys/modules/zlib/Makefile ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/modules/zlib/Makefile Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/modules/zlib/Makefile Fri May 29 19:09:53 2009 (r193050) @@ -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/releng_7_2_fcs/sys/net/ppp_deflate.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/ppp_deflate.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/net/ppp_deflate.c Fri May 29 19:09:53 2009 (r193050) @@ -38,7 +38,7 @@ #include #include -#include +#include #define PACKETPTR struct mbuf * #include Modified: user/kmacy/releng_7_2_fcs/sys/netgraph/ng_deflate.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/netgraph/ng_deflate.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/netgraph/ng_deflate.c Fri May 29 19:09:53 2009 (r193050) @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include Modified: user/kmacy/releng_7_2_fcs/sys/opencrypto/deflate.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/opencrypto/deflate.c Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/opencrypto/deflate.c Fri May 29 19:09:53 2009 (r193050) @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include Modified: user/kmacy/releng_7_2_fcs/sys/opencrypto/deflate.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/opencrypto/deflate.h Fri May 29 19:06:02 2009 (r193049) +++ user/kmacy/releng_7_2_fcs/sys/opencrypto/deflate.h Fri May 29 19:09:53 2009 (r193050) @@ -36,7 +36,7 @@ #ifndef _CRYPTO_DEFLATE_H_ #define _CRYPTO_DEFLATE_H_ -#include +#include #define Z_METHOD 8 #define Z_MEMLEVEL 8