From owner-p4-projects@FreeBSD.ORG Mon May 2 23:21:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CAAA16A4D0; Mon, 2 May 2005 23:21:44 +0000 (GMT) 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 4878816A4CE for ; Mon, 2 May 2005 23:21:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 753B443D5A for ; Mon, 2 May 2005 23:21:43 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j42NLhJx085361 for ; Mon, 2 May 2005 23:21:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j42NLhpv085358 for perforce@freebsd.org; Mon, 2 May 2005 23:21:43 GMT (envelope-from sam@freebsd.org) Date: Mon, 2 May 2005 23:21:43 GMT Message-Id: <200505022321.j42NLhpv085358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 76393 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: Mon, 02 May 2005 23:21:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=76393 Change 76393 by sam@sam_ebb on 2005/05/02 23:21:33 IFC @ 76392 Affected files ... .. //depot/projects/wifi/Makefile.inc1#18 integrate .. //depot/projects/wifi/games/caesar/Makefile#2 integrate .. //depot/projects/wifi/games/caesar/caesar.c#2 integrate .. //depot/projects/wifi/games/pom/Makefile#2 integrate .. //depot/projects/wifi/games/pom/pom.c#2 integrate .. //depot/projects/wifi/gnu/lib/libobjc/Makefile#5 integrate .. //depot/projects/wifi/lib/libc/net/getaddrinfo.c#8 integrate .. //depot/projects/wifi/lib/libc/net/gethostbynis.c#3 integrate .. //depot/projects/wifi/lib/libc/net/name6.c#6 integrate .. //depot/projects/wifi/lib/libpmc/Makefile#2 integrate .. //depot/projects/wifi/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/wifi/lib/libpmc/pmc.3#3 integrate .. //depot/projects/wifi/lib/libpmc/pmc.h#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#5 integrate .. //depot/projects/wifi/sbin/atm/atm/atm.h#2 integrate .. //depot/projects/wifi/sbin/atm/atmconfig/atmconfig_device.h#2 integrate .. //depot/projects/wifi/sbin/atm/ilmid/ilmid.c#2 integrate .. //depot/projects/wifi/sbin/dump/traverse.c#2 integrate .. //depot/projects/wifi/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/wifi/sbin/fdisk_pc98/Makefile#2 integrate .. //depot/projects/wifi/sbin/fdisk_pc98/fdisk.c#3 integrate .. //depot/projects/wifi/sbin/ggate/shared/ggate.h#2 integrate .. //depot/projects/wifi/sbin/natd/natd.c#3 integrate .. //depot/projects/wifi/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/wifi/share/man/man9/taskqueue.9#6 integrate .. //depot/projects/wifi/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/ata-raid.c#8 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#25 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/wifi/sys/vm/vm_map.c#6 integrate .. //depot/projects/wifi/usr.bin/Makefile#6 integrate .. //depot/projects/wifi/usr.bin/brandelf/brandelf.c#2 integrate .. //depot/projects/wifi/usr.bin/compress/zopen.c#2 integrate .. //depot/projects/wifi/usr.bin/mkuzip/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/mkuzip/mkuzip.c#2 integrate .. //depot/projects/wifi/usr.bin/systat/pigs.c#2 integrate .. //depot/projects/wifi/usr.sbin/burncd/burncd.8#4 integrate .. //depot/projects/wifi/usr.sbin/faithd/ftp.c#3 integrate .. //depot/projects/wifi/usr.sbin/pmccontrol/pmccontrol.c#2 integrate .. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/wifi/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/menus.c#7 integrate .. //depot/projects/wifi/usr.sbin/ypserv/Makefile.yp#2 integrate .. //depot/projects/wifi/usr.sbin/ypserv/yp_dnslookup.c#3 integrate .. //depot/projects/wifi/usr.sbin/ypserv/yp_extern.h#2 integrate .. //depot/projects/wifi/usr.sbin/ypserv/yp_server.c#2 integrate Differences ... ==== //depot/projects/wifi/Makefile.inc1#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.493 2005/04/30 16:09:23 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.494 2005/05/01 17:36:09 imp Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -337,7 +337,6 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" - @rm -rf ${.OBJDIR}/sbin/ipf ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} .endif _obj: ==== //depot/projects/wifi/games/caesar/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/caesar/Makefile,v 1.9 2001/06/22 21:38:27 dd Exp $ +# $FreeBSD: src/games/caesar/Makefile,v 1.10 2005/05/01 19:34:22 stefanf Exp $ PROG= caesar DPADD= ${LIBM} @@ -8,6 +8,6 @@ MAN= caesar.6 MLINKS= caesar.6 rot13.6 -WARNS?= 2 +WARNS?= 6 .include ==== //depot/projects/wifi/games/caesar/caesar.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.13 2003/05/05 09:52:25 obrien Exp $"); +__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.14 2005/05/01 19:34:22 stefanf Exp $"); #include #include @@ -80,9 +80,7 @@ void printit(char *); int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { int ch, dot, i, nread, winnerdot = 0; char *inbuf; @@ -153,8 +151,8 @@ exit(0); } -void printit(arg) - char *arg; +void +printit(char *arg) { int ch, rot; ==== //depot/projects/wifi/games/pom/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/pom/Makefile,v 1.6 2001/06/22 21:38:27 dd Exp $ +# $FreeBSD: src/games/pom/Makefile,v 1.7 2005/05/01 19:34:22 stefanf Exp $ PROG= pom MAN= pom.6 DPADD= ${LIBM} LDADD= -lm -WARNS?= 2 +WARNS?= 6 .include ==== //depot/projects/wifi/games/pom/pom.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/pom/pom.c,v 1.12 2003/05/05 09:52:25 obrien Exp $"); +__FBSDID("$FreeBSD: src/games/pom/pom.c,v 1.13 2005/05/01 19:34:22 stefanf Exp $"); /* * Phase of the Moon. Calculates the current phase of the moon. @@ -78,7 +78,7 @@ static double potm(double); int -main() +main(void) { time_t tt; struct tm *GMT; @@ -122,8 +122,7 @@ * return phase of the moon */ static double -potm(days) - double days; +potm(double days) { double N, Msol, Ec, LambdaSol, l, Mm, Ev, Ac, A3, Mmprime; double A4, lprime, V, ldprime, D, Nm; @@ -159,8 +158,7 @@ * convert degrees to radians */ static double -dtor(deg) - double deg; +dtor(double deg) { return(deg * PI / 180); } @@ -170,8 +168,7 @@ * adjust value so 0 <= deg <= 360 */ static void -adj360(deg) - double *deg; +adj360(double *deg) { for (;;) if (*deg < 0) ==== //depot/projects/wifi/gnu/lib/libobjc/Makefile#5 (text+ko) ==== @@ -1,18 +1,13 @@ -# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.25 2005/02/21 21:02:25 ru Exp $ +# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.26 2005/05/01 01:59:48 peter Exp $ OBJCDIR=${.CURDIR}/../../../contrib/libobjc GCCDIR= ${.CURDIR}/../../../contrib/gcc .PATH: ${OBJCDIR}/objc ${OBJCDIR} -LIB= objc +LIB= objc +SHLIB_MAJOR= 1 NO_MAN= -.if ${MACHINE_ARCH} == "amd64" -SHLIB_MAJOR= 1 -.else -# XXX is this still correct? -NO_PIC= # works but method lookup slowdown is significant -.endif SRCS= archive.c class.c encoding.c gc.c hash.c init.c misc.c \ nil_method.c objects.c sarray.c selector.c sendmsg.c \ @@ -23,11 +18,6 @@ sarray.h thr.h typedstream.h NXConstStr.h Object.h Protocol.h INCSDIR=${INCLUDEDIR}/objc -# PR ia64/49081 -.if ${MACHINE_ARCH} == "ia64" -CFLAGS+= -fpic -.endif - OBJCFLAGS= -fgnu-runtime ${CFLAGS} CFLAGS+= -DHAVE_GTHR_DEFAULT -DIN_GCC -DIN_TARGET_LIBS CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools ==== //depot/projects/wifi/lib/libc/net/getaddrinfo.c#8 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.65 2005/04/15 18:15:12 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.66 2005/05/02 04:43:32 ume Exp $"); #include "namespace.h" #include @@ -781,7 +781,8 @@ { struct addrinfo ai = *aio->aio_ai; struct sockaddr_storage ss; - int s, srclen; + socklen_t srclen; + int s; /* set unspec ("no source is available"), just in case */ aio->aio_srcsa.sa_family = AF_UNSPEC; ==== //depot/projects/wifi/lib/libc/net/gethostbynis.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.24 2005/04/30 20:07:01 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.25 2005/05/01 07:39:45 ume Exp $"); #include #include @@ -202,14 +202,18 @@ { #ifdef YP struct hostdata *hd; + u_long oresopt; + int error; if ((hd = __hostdata_init()) == NULL) { h_errno = NETDB_INTERNAL; return NULL; } - if (_gethostbynisname_r(name, af, &hd->host, &hd->data) != 0) - return NULL; - return &hd->host; + oresopt = _res.options; + _res.options &= ~RES_USE_INET6; + error = _gethostbynisname_r(name, af, &hd->host, &hd->data); + _res.options = oresopt; + return (error == 0) ? &hd->host : NULL; #else return NULL; #endif @@ -220,14 +224,18 @@ { #ifdef YP struct hostdata *hd; + u_long oresopt; + int error; if ((hd = __hostdata_init()) == NULL) { h_errno = NETDB_INTERNAL; return NULL; } - if (_gethostbynisaddr_r(addr, len, af, &hd->host, &hd->data) != 0) - return NULL; - return &hd->host; + oresopt = _res.options; + _res.options &= ~RES_USE_INET6; + error = _gethostbynisaddr_r(addr, len, af, &hd->host, &hd->data); + _res.options = oresopt; + return (error == 0) ? &hd->host : NULL; #else return NULL; #endif ==== //depot/projects/wifi/lib/libc/net/name6.c#6 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.48 2005/04/28 18:21:11 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.51 2005/05/02 04:43:32 ume Exp $"); #include "namespace.h" #ifdef ICMPNL @@ -954,7 +954,8 @@ struct policyhead *ph; { struct sockaddr_storage ss = aio->aio_un.aiou_ss; - int s, srclen; + socklen_t srclen; + int s; /* set unspec ("no source is available"), just in case */ aio->aio_srcsa.sa_family = AF_UNSPEC; @@ -1369,7 +1370,7 @@ /* * NIS * - * XXX actually a hack, these are INET4 specific. + * XXX actually a hack. */ static int _nis_ghbyname(void *rval, void *cb_data, va_list ap) ==== //depot/projects/wifi/lib/libpmc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpmc/Makefile,v 1.2 2005/04/19 14:43:59 jkoshy Exp $ +# $FreeBSD: src/lib/libpmc/Makefile,v 1.3 2005/05/01 14:11:47 jkoshy Exp $ LIB= pmc @@ -12,6 +12,7 @@ MLINKS+= \ pmc.3 pmc_allocate.3 \ pmc.3 pmc_attach.3 \ + pmc.3 pmc_capabilities.3 \ pmc.3 pmc_configure_logfile.3 \ pmc.3 pmc_cpuinfo.3 \ pmc.3 pmc_detach.3 \ @@ -35,6 +36,7 @@ pmc.3 pmc_set.3 \ pmc.3 pmc_start.3 \ pmc.3 pmc_stop.3 \ + pmc.3 pmc_width.3 \ pmc.3 pmc_write.3 \ pmc.3 pmc_x86_get_msr.3 ==== //depot/projects/wifi/lib/libpmc/libpmc.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.4 2005/04/21 05:50:25 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.5 2005/05/01 14:11:47 jkoshy Exp $"); #include #include @@ -1981,6 +1981,36 @@ return 0; } +int +pmc_width(pmc_id_t pmcid, uint32_t *width) +{ + unsigned int i; + enum pmc_class cl; + + cl = PMC_ID_TO_CLASS(pmcid); + for (i = 0; i < cpu_info.pm_nclass; i++) + if (cpu_info.pm_classes[i].pm_class == cl) { + *width = cpu_info.pm_classes[i].pm_width; + return 0; + } + return EINVAL; +} + +int +pmc_capabilities(pmc_id_t pmcid, uint32_t *caps) +{ + unsigned int i; + enum pmc_class cl; + + cl = PMC_ID_TO_CLASS(pmcid); + for (i = 0; i < cpu_info.pm_nclass; i++) + if (cpu_info.pm_classes[i].pm_class == cl) { + *caps = cpu_info.pm_classes[i].pm_caps; + return 0; + } + return EINVAL; +} + const char * pmc_name_of_cputype(enum pmc_cputype cp) { ==== //depot/projects/wifi/lib/libpmc/pmc.3#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.2 2005/04/23 05:45:18 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.3 2005/05/01 14:11:47 jkoshy Exp $ .\" .Dd Apr 15, 2005 .Os @@ -29,6 +29,7 @@ .Sh NAME .Nm pmc_allocate , .Nm pmc_attach , +.Nm pmc_capabilities , .Nm pmc_configure_logfile , .Nm pmc_cpuinfo , .Nm pmc_detach , @@ -53,6 +54,7 @@ .Nm pmc_start , .Nm pmc_stop , .Nm pmc_write , +.Nm pmc_width , .Nm pmc_x86_get_msr .Nd programming API for using hardware performance monitoring counters .Sh LIBRARY @@ -73,6 +75,8 @@ .Fa "pid_t pid" .Fc .Ft int +.Fn pmc_capabilities "pmc_id_t pmc" "uint32_t *caps" +.Ft int .Fn pmc_configure_logfile "int fd" .Ft int .Fn pmc_cpuinfo "const struct pmc_op_getcpuinfo **cpu_info" @@ -130,6 +134,8 @@ .Ft int .Fn pmc_write "pmc_id_t pmc" "pmc_value_t value" .Ft int +.Fn pmc_width "pmc_id_t pmc" "uint32_t *width" +.Ft int .Fn pmc_x86_get_msr "int pmc" "uint32_t *msr" .Sh DESCRIPTION These functions implement a high-level library for using the @@ -252,6 +258,20 @@ The read and write operation may be combined using .Fn pmc_rw . .Pp +The function +.Fn pmc_capabilities +sets argument +.Fa caps +to a bitmask of capabilities supported by the PMC denoted by +argument +.Fa pmc . +The function +.Fn pmc_width +sets argument +.Fa width +to the width of the PMC denoted by argument +.Fa pmc . +.Pp The .Fn pmc_configure_logfile function causes the @@ -3011,13 +3031,15 @@ .El .Pp A call to +.Fn pmc_capabilities , .Fn pmc_name_of_capability , .Fn pmc_name_of_disposition , .Fn pmc_name_of_state , .Fn pmc_name_of_event , .Fn pmc_name_of_mode +.Fn pmc_name_of_class and -.Fn pmc_name_of_class +.Fn pmc_width may fail with the following error: .Bl -tag -width Er .It Bq Er EINVAL ==== //depot/projects/wifi/lib/libpmc/pmc.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpmc/pmc.h,v 1.1 2005/04/19 04:01:21 jkoshy Exp $ + * $FreeBSD: src/lib/libpmc/pmc.h,v 1.2 2005/05/01 14:11:47 jkoshy Exp $ */ #ifndef _PMC_H_ @@ -38,6 +38,7 @@ int pmc_allocate(const char *_ctrspec, enum pmc_mode _mode, uint32_t _flags, int _cpu, pmc_id_t *_pmcid); int pmc_attach(pmc_id_t _pmcid, pid_t _pid); +int pmc_capabilities(pmc_id_t _pmc, uint32_t *_caps); int pmc_configure_logfile(int _fd); int pmc_detach(pmc_id_t _pmcid, pid_t _pid); int pmc_disable(int _cpu, int _pmc); @@ -50,6 +51,7 @@ int pmc_set(pmc_id_t _pmc, pmc_value_t _value); int pmc_start(pmc_id_t _pmc); int pmc_stop(pmc_id_t _pmc); +int pmc_width(pmc_id_t _pmc, uint32_t *_width); int pmc_write(pmc_id_t _pmc, pmc_value_t _value); int pmc_ncpu(void); ==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.849 2005/04/25 15:32:58 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.852 2005/05/02 05:56:30 bmah Exp $ 2000 @@ -330,7 +330,7 @@ in the &man.acpi.4; driver. These can individually be disabled by setting device hints such as hint.ichss.0.disabled="1". - The &man.hwpmc.4;, hardware performance + The &man.hwpmc.4; hardware performance monitoring counter driver has been added. This driver virtualizes the hardware performance monitoring facilities in modern CPUs and provides support for using @@ -444,6 +444,18 @@ The &man.ixgb.4; driver is now MPSAFE. + The musycc driver, for the LanMedia LMC1504 T1/E1 + network interface card, has been removed due to + disuse. + + Drivers using the &man.ndis.4; device + driver wrapper mechanism are now built and loaded + differently. The &man.ndis.4; driver can now be pre-built + as module or statically compiled into a kernel. Individual + drivers can now be built with the &man.ndisgen.8; utility; + the result is a kernel module that can be loaded into a + running kernel using &man.kldload.8;. + The &man.ndis.4; device driver wrapper now supports &windows;/x86-64 binaries on amd64 systems. &merged; @@ -511,7 +523,7 @@ when the gid, jail, and/or uid rule options are used. &merged; - The &man.ipfw.4; and &man.dummynet.4; system now + The &man.ipfw.4; and &man.dummynet.4; systems now support IPv6. &man.ipfw.8; now supports classification and tagging @@ -549,7 +561,7 @@ The new sysctl net.link.tap.user_open has been implemented. This allows unprivileged access to - &man.tap.4; device nodes based on the file system permission. + &man.tap.4; device nodes based on file system permissions. A bug in TCP that sometimes caused RST packets to be ignored if the receive window was zero bytes has been @@ -602,16 +614,16 @@ debug.mpsafenet sysctl variable may be set to 1). - The Unix domain socket now supports + Unix domain sockets now support the LOCAL_CREDS and - LOCAL_CONNWAIT. + LOCAL_CONNWAIT options. The LOCAL_CREDS option provides a mechanism for the receiver to receive the credentials of the process as a &man.recvmsg.2; control message. The LOCAL_CONNWAIT option causes the &man.connect.2; function to block until &man.accept.2; has been called on the listening socket. - For more details, see &man.unix.4; manual page. + For more details, see the &man.unix.4; manual page. @@ -698,7 +710,7 @@ eject) to take place after fixating a disk. - The machine-specific optimized version of + Machine-specific optimized versions of &man.bcmp.3;, &man.bcopy.3;, &man.bzero.3;, &man.memcmp.3;, &man.memcpy.3;, &man.memmove.3;, &man.memset.3;, &man.strcat.3; and &man.strcpy.3; have been implemented. @@ -758,7 +770,7 @@ The on-disk format of LC_CTYPE files has been changed to be machine-independent. - The &man.mixer.8; utility now supports + The &man.mixer.8; utility now supports the option. This is the same as the option but does not output mixing field separators. @@ -975,10 +987,10 @@ run out of buffer space due to a local denial-of-service attack. &merged; - The &man.syslogd.8; now supports option + The &man.syslogd.8; now supports the option, which allows to change the pathname of the privileged - socket. This is useful when you do not want the daemon - to receive any messages from the local sockets + socket. This is useful for preventing the daemon + from receiving any messages from the local sockets (/var/run/log and /var/run/logpriv are used by default). &merged; @@ -1067,15 +1079,24 @@ BIND has been updated from version 9.3.0 to version 9.3.1. &merged; + bsnmp has been updated from 1.7 + to 1.9. + FILE has been updated from 4.10 to 4.12. GNU readline has been updated from version 4.3 to version 5.0. + IPFilter has been updated from + 3.4.35 to 4.1.18. + Heimdal has been updated from 0.6.1 to 0.6.3. &merged; + libz has been updated from 1.2.1 + to 1.2.2. + lukemftp has been updated from a 26 April 2004 snapshot from OpenBSD's sources to a snapshot as of 19 February 2005. @@ -1096,6 +1117,9 @@ sendmail has been updated from version 8.13.1 to version 8.13.3. &merged; + tcsh has been updated from + 6.13.00 to 6.14.00. + The timezone database has been updated from the tzdata2004e release to the tzdata2004g release. &merged; @@ -1206,8 +1230,8 @@ Documentation The &man.sched.4bsd.4; and &man.sched.ule.4; manual pages - have been added. These explain the kernel options SCHED_4BSD - and SCHED_ULE and some sysctls applicable. + have been added. These explain the kernel options SCHED_4BSD + and SCHED_ULE, as well as some applicable sysctl variables. The &man.ataraid.4; manual page has been added. It explains the &man.ata.4; software ==== //depot/projects/wifi/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#5 (text+ko) ==== @@ -1,14 +1,14 @@ &os;/&arch; &release.current; 发行说明 The &os; Project - $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.4 2005/04/18 16:55:48 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.5 2005/05/01 15:07:58 delphij Exp $ 2000 @@ -143,6 +143,12 @@ FreeBSD-SA-05:04.ifconf。 &merged; + 修正了 &man.cvs.1; 中的多处程序设计问题， 这些问题可能导致在 + CVS 服务器上执行任意代码。 + 要了解更多信息， 请参见安全公告 + FreeBSD-SA-05:05.cvs。 + &merged; + @@ -297,6 +303,12 @@ hint.ichss.0.disabled="1" 来禁用。 + 加入了用于硬件性能监视计数器的 &man.hwpmc.4; + 驱动。 这个驱动抽象了新式 CPU 中提供的硬件性能监视机制， + 并提供了在用户进程中利用这些机制的支持。 要了解更多的细节， + 请参见 &man.hwpmc.4; 的联机手册、 相关联的函数库， + 以及有关的其他工具。 + 删去了对于 OLDCARD 子系统的支持。 现在， NEWCARD 系统被用于支持所有的 PCCARD 设备了。 @@ -385,6 +397,12 @@ &man.hme.4; 驱动现在 MPSAFE 了。 &merged; + 加入了 &man.ipw.4; (用于 Intel PRO/Wireless 2100)， + &man.iwi.4; (用于 Intel PRO/Wireless 2200BG/2225BG/2915ABG)， + &man.ral.4; (用于 Ralink Technology RT2500)， + 以及 &man.ural.4; (用于 Ralink Technology RT2500USB) + 驱动。 + &man.ixgb.4; 驱动现在 MPSAFE 了。 现在 &man.ndis.4; 设备驱动 wrapper @@ -450,6 +468,8 @@ 当使用了 gid, jail, 和/或 uid 规则选项时正常工作了。 &merged; + &man.ipfw.4; 和 &man.dummynet.4; 系统能够支持 IPv6 了。 + &man.ipfw.8; 现在支持通过转发 socket， 以及 TCP 数据长度来区分并标记 &man.altq.4; 包了。 @@ -481,6 +501,10 @@ &man.sppp.4; 驱动现在 MPSAFE 了。 + 实现了一个新的 sysctl net.link.tap.user_open。 + 它允许基于文件系统权限对 + &man.tap.4; 设备进行非特权访问。 + 修正了 TCP 的一处问题， 这一问题有时会导致当接收窗口大小为零时， RST 包被忽略的问题。 &merged; @@ -523,6 +547,15 @@ debug.mpsafenet sysctl 变量设置为 1)。 + 现在 Unix domain socket 提供了 + LOCAL_CREDS 和 + LOCAL_CONNWAIT。 + 其中， LOCAL_CREDS 选项提供了一种机制， + 使得接收方能够以 &man.recvmsg.2; 控制消息的形式， + 收到发送者的进程凭据。 + 而 LOCAL_CONNWAIT 则将让 &man.connect.2; + 函数阻塞， 直到在监听 socket 上执行了 &man.accept.2; 为止。 + 欲了解进一步的情况， 请参见 &man.unix.4; 联机手册。 @@ -555,6 +588,8 @@ 删去了旧的 vinum(4) 子系统， 新的基于 &man.geom.4; 的版本提供了更好的功能。 + &man.twa.4; 驱动更新到了来自 3ware 网站的 9.2 版 (用于 &os; 5.2.1) + 删去了 &man.wd.4; 驱动。 &man.ata.4; 驱动已经能够在 pc98 平台上很好的工作， 因而不再需要旧的 &man.wd.4; @@ -601,6 +636,11 @@ 现在 &man.burncd.8; 工具能够在光盘定型之后执行命令了 (例如 eject)。 + 实现了针对本平台优化的 + &man.bcmp.3;, &man.bcopy.3;, &man.bzero.3;, &man.memcmp.3;, + &man.memcpy.3;, &man.memmove.3;, &man.memset.3;, &man.strcat.3; + and &man.strcpy.3; 版本。 + 现在 &man.ftpd.8; 程序会正确地为目录和文件的状态使用 212 和 213 状态代码了 (过去的版本， 曾经长期使用 211)。 @@ -628,6 +668,12 @@ 以强制创建 GPT， 即使磁盘上原先已经存在了 MBR 记录。 &merged; + 现在 &man.getprotoent.3;， &man.getprotobyname.3;， 以及 + &man.getprotobynumber.3; 函数是线程安全的了。 + + 现在 &man.getservent.3;， &man.getservbyname.3;， 以及 + &man.getservbyport.3; 函数是线程安全的了。 + gvinum(8) 工具现在支持 checkparity、 rebuildparity， 以及 @@ -645,6 +691,10 @@ 磁盘上的 LC_CTYPE 文件格式， 现在已经改为机器无关的格式了。 + &man.mixer.8; 工具新增了 + 参数。 它的功能和 一样， + 但并不输出混音字段间隔符。 + 修正了 libalias 函数库中的一处问题， 该问题可能导致使用 &man.natd.8; 的 选项时出现 core dump。 @@ -787,7 +837,7 @@ 现在使用 &man.bsdtar.1; 代替了 GNU tar。 &man.restore.8; 工具又能够处理 - &os; 版本 1 的转储磁带了。 + &os; 版本 1 的转储磁带了。 &merged; 修正了一个导致 &man.rexecd.8; 工具总是以 参数运行的问题。 &merged; @@ -804,6 +854,10 @@ 加入了用于检查字符串是否是当前 locale 的编码的 &man.rpmatch.3; 库函数。 + 下列 ISO/IEC 9899:1999 标准函数得以实现： roundl()、 + lroundl()、 llroundl()、 + truncl()， 以及 floorl()。 + &man.rtld.1; 动态连接器现在支持通过 LD_LIBMAP 环境变量来指定库映射关系了。 这一选项能够覆盖 &man.libmap.conf.5; 的设置。 &merged; @@ -824,9 +878,15 @@ 者避免了发生本地的拒绝服务攻击时， 特权程序由于域 socket 的缓冲区耗尽而死锁。 &merged; + &man.syslogd.8; 新增了 选项， + 用以改变特权 socket 的路径名。 如果您不希望服务接受来自本地 socket + 的消息 (默认使用的是 /var/run/log 和 + /var/run/logpriv) 时， 这个选项就很有用了。 + &merged; + &man.syslogd.8; 工具现在允许在主机名标识符中使用 : 和 % - 这两个字符了。 这些字符被 IPv6 地址和 scope ID 使用。 + 这两个字符了。 这些字符被 IPv6 地址和 scope ID 使用。 &merged; 现在 &man.systat.1; 的显示也包括了 IPv6 的数据。 &merged; @@ -860,6 +920,9 @@ <filename>/etc/rc.d</filename> 脚本 + 加入了用于启动 &man.bsnmpd.1; 的启动脚本， + rc.d/bsnmpd。 + &man.rc.conf.5; 现在支持在引导时修改网络接口的名字了。 &merged; 例如： @@ -1026,6 +1089,12 @@ 文档 + 新增了 &man.sched.4bsd.4; 和 &man.sched.ule.4; 联机手册。 + 它们介绍了内核选项 SCHED_4BSD 和 SCHED_ULE 以及他们各自适用的 sysctl。 + + 新增了 &man.ataraid.4; 联机手册。 它介绍了 &man.ata.4; 软件 + RAID 驱动。 + 对于基本系统的联机手册中的内容和表达方式进行了大量的整理。 交叉引用更加准确和一致， 标准小节的标题贯穿始终， 而使用的符号也进行了清理。 ==== //depot/projects/wifi/sbin/atm/atm/atm.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sbin/atm/atm/atm.h,v 1.8 2003/07/29 13:37:04 harti Exp $ + * @(#) $FreeBSD: src/sbin/atm/atm/atm.h,v 1.9 2005/05/02 10:31:27 delphij Exp $ * */ @@ -191,6 +191,5 @@ void check_netif_name(const char *); void sock_error(int); -extern const struct proto protos[]; extern const struct aal aals[]; extern const struct encaps encaps[]; ==== //depot/projects/wifi/sbin/atm/atmconfig/atmconfig_device.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/atm/atmconfig/atmconfig_device.h,v 1.1 2004/08/12 12:31:43 harti Exp $ + * $FreeBSD: src/sbin/atm/atmconfig/atmconfig_device.h,v 1.2 2005/05/02 10:31:27 delphij Exp $ */ #ifndef ATMCONFIG_DEVICE_H_ #define ATMCONFIG_DEVICE_H_ @@ -45,7 +45,7 @@ TAILQ_ENTRY(atmif) link; uint64_t found; int32_t index; - u_char *ifname; + char *ifname; size_t ifnamelen; uint32_t pcr; int32_t media; ==== //depot/projects/wifi/sbin/atm/ilmid/ilmid.c#2 (text+ko) ==== @@ -71,7 +71,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.33 2004/02/10 20:48:08 cperciva Exp $"); +__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.34 2005/05/02 10:31:27 delphij Exp $"); #endif @@ -1875,7 +1875,7 @@ get_local_ip (int s, long *aval) { char intf_name[IFNAMSIZ]; - int namelen = IFNAMSIZ; + socklen_t namelen = IFNAMSIZ; struct air_netif_rsp *net_info = NULL; struct sockaddr_in *sain; @@ -2468,7 +2468,7 @@ close ( ilmi_fd[intf] ); ilmi_fd[intf] = -1; } else { - bpp = (caddr_t)&buf[1]; + bpp = &buf[1]; Hdr = asn_get_header(&bpp); if ( Log && Debug_Level > 1 ) ==== //depot/projects/wifi/sbin/dump/traverse.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/traverse.c,v 1.35 2004/07/28 05:54:38 kan Exp $"; + "$FreeBSD: src/sbin/dump/traverse.c,v 1.36 2005/05/02 10:00:39 delphij Exp $"; #endif /* not lint */ #include @@ -149,7 +149,7 @@ union dinode *dp; struct cg *cgp; ino_t ino; - char *cp; + u_char *cp; if ((cgp = malloc(sblock->fs_cgsize)) == NULL) quit("mapfiles: cannot allocate memory.\n"); ==== //depot/projects/wifi/sbin/fdisk/fdisk.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.77 2005/04/29 21:24:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.79 2005/05/01 09:50:02 nyan Exp $"); #include #include @@ -51,8 +51,6 @@ #define LBUF 100 static char lbuf[LBUF]; -#define MBRSIGOFF 510 - /* * * Ported to 386bsd by Julian Elischer Thu Oct 15 20:26:46 PDT 1992 @@ -76,15 +74,14 @@ struct mboot { unsigned char padding[2]; /* force the longs to be long aligned */ - unsigned char *bootinst; /* boot code */ >>> TRUNCATED FOR MAIL (1000 lines) <<<