From owner-p4-projects@FreeBSD.ORG Wed Jul 23 19:27:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B43A137B404; Wed, 23 Jul 2003 19:27:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F50637B401 for ; Wed, 23 Jul 2003 19:27:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3F3643F85 for ; Wed, 23 Jul 2003 19:27:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6O2R90U058168 for ; Wed, 23 Jul 2003 19:27:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6O2R9Xf058165 for perforce@freebsd.org; Wed, 23 Jul 2003 19:27:09 -0700 (PDT) Date: Wed, 23 Jul 2003 19:27:09 -0700 (PDT) Message-Id: <200307240227.h6O2R9Xf058165@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 34911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jul 2003 02:27:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=34911 Change 34911 by peter@peter_daintree on 2003/07/23 19:26:27 IFC @34910 Affected files ... .. //depot/projects/hammer/lib/Makefile#22 integrate .. //depot/projects/hammer/sbin/Makefile#14 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#6 integrate .. //depot/projects/hammer/sys/netncp/ncp_ncp.c#8 integrate .. //depot/projects/hammer/sys/netsmb/smb_usr.c#4 integrate .. //depot/projects/hammer/usr.bin/Makefile#17 integrate .. //depot/projects/hammer/usr.sbin/Makefile#25 integrate Differences ... ==== //depot/projects/hammer/lib/Makefile#22 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.164 2003/07/20 01:34:40 mtm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.165 2003/07/24 02:05:48 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -79,6 +79,11 @@ _compat= compat .endif +.if ${MACHINE_ARCH} == "amd64" +_libncp= libncp +_libsmb= libsmb +.endif + .if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "powerpc" .if !defined(NOLIBTHR) _libthr= libthr ==== //depot/projects/hammer/sbin/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.123 2003/07/02 16:16:49 gordon Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.124 2003/07/24 01:42:49 peter Exp $ # XXX MISSING: icheck ncheck @@ -108,7 +108,8 @@ # XXX: should combine with i386 above .if ${MACHINE_ARCH} == "amd64" -SUBDIR+=fdisk +SUBDIR+=fdisk \ + gpt .endif .include ==== //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.19 2003/06/12 20:48:37 phk Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.20 2003/07/24 01:59:18 peter Exp $ */ #include "opt_netsmb.h" #ifndef NETSMB @@ -332,7 +332,8 @@ { #ifndef SMP int name[2]; - int olen, ncpu, plen, error; + int ncpu, error; + size_t olen, plen; name[0] = CTL_HW; name[1] = HW_NCPU; ==== //depot/projects/hammer/sys/netncp/ncp_ncp.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netncp/ncp_ncp.c,v 1.17 2003/06/11 05:30:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netncp/ncp_ncp.c,v 1.18 2003/07/24 01:59:17 peter Exp $"); #include #include @@ -206,7 +206,8 @@ ncp_renegotiate_connparam(struct ncp_conn *conn, int buffsize, u_int8_t in_options) { u_int8_t options; - int neg_buffsize, error, sl, ckslevel, ilen; + int neg_buffsize, error, sl, ckslevel; + size_t ilen; sl = conn->li.sig_level; if (sl >= 2) ==== //depot/projects/hammer/sys/netsmb/smb_usr.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netsmb/smb_usr.c,v 1.4 2003/06/11 05:32:09 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netsmb/smb_usr.c,v 1.5 2003/07/24 01:59:18 peter Exp $"); #include #include @@ -302,8 +302,7 @@ struct mdchain *mdp; int error, len; - if (dp->ioc_tparamcnt > 0xffff || dp->ioc_tdatacnt > 0xffff || - dp->ioc_setupcnt > 3) + if (dp->ioc_setupcnt > 3) return EINVAL; error = smb_t2_init(t2p, SSTOCP(ssp), dp->ioc_setup[0], scred); if (error) ==== //depot/projects/hammer/usr.bin/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.243 2003/07/16 20:59:11 markm Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.244 2003/07/24 02:09:19 peter Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -242,6 +242,12 @@ SUBDIR+=uac .endif +.if ${MACHINE_ARCH} == "amd64" +SUBDIR+=ncplist \ + ncplogin \ + smbutil +.endif + .if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) SUBDIR+=chkey newkey .endif ==== //depot/projects/hammer/usr.sbin/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.262 2003/07/14 16:36:40 njl Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.264 2003/07/24 02:07:14 peter Exp $ .if ${MACHINE_ARCH} != "powerpc" _sysinstall=sysinstall @@ -197,8 +197,20 @@ .endif .endif +# kgmon: builds, but no kernel profiling +# kgzip: builds, but missing support files +# mptable: broken (not 64 bit clean) +# pnpinfo: crashes (not really useful anyway) .if ${MACHINE_ARCH} == "amd64" -SUBDIR+= btxld +SUBDIR+=acpi \ + boot0cfg \ + btxld \ + lptcontrol \ + mount_nwfs \ + mount_smbfs \ + sicontrol \ + spkrtest \ + zzz .endif .if ${MACHINE} == "i386"