Date: Mon, 2 May 2005 23:21:43 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 76393 for review Message-ID: <200505022321.j42NLhpv085358@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.prog.mk> ==== //depot/projects/wifi/games/caesar/caesar.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__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 <errno.h> #include <math.h> @@ -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 <bsd.prog.mk> ==== //depot/projects/wifi/games/pom/pom.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__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 <sys/cdefs.h> -__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 <sys/types.h> @@ -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 <sys/cdefs.h> -__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 <sys/param.h> #include <sys/socket.h> @@ -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 <sys/cdefs.h> -__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 <sys/cdefs.h> -__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 <sys/types.h> #include <sys/module.h> @@ -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 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.849 2005/04/25 15:32:58 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.852 2005/05/02 05:56:30 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -330,7 +330,7 @@ in the &man.acpi.4; driver. These can individually be disabled by setting device hints such as <varname>hint.<replaceable>ichss</replaceable>.0.disabled="1"</varname>.</para> - <para arch="amd64,i386">The &man.hwpmc.4;, hardware performance + <para arch="amd64,i386">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 @@ <para>The &man.ixgb.4; driver is now MPSAFE.</para> + <para>The musycc driver, for the LanMedia LMC1504 T1/E1 + network interface card, has been removed due to + disuse.</para> + + <para arch="i386,amd64">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;.</para> + <para arch="amd64">The &man.ndis.4; device driver wrapper now supports &windows;/x86-64 binaries on amd64 systems. &merged;</para> @@ -511,7 +523,7 @@ when the <literal>gid</literal>, <literal>jail</literal>, and/or <literal>uid</literal> rule options are used. &merged;</para> - <para>The &man.ipfw.4; and &man.dummynet.4; system now + <para>The &man.ipfw.4; and &man.dummynet.4; systems now support IPv6.</para> <para>&man.ipfw.8; now supports classification and tagging @@ -549,7 +561,7 @@ <para>The new sysctl <varname>net.link.tap.user_open</varname> has been implemented. This allows unprivileged access to - &man.tap.4; device nodes based on the file system permission.</para> + &man.tap.4; device nodes based on file system permissions.</para> <para>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 @@ <varname>debug.mpsafenet</varname> sysctl variable may be set to <literal>1</literal>).</para> - <para>The Unix domain socket now supports + <para>Unix domain sockets now support the <literal>LOCAL_CREDS</literal> and - <literal>LOCAL_CONNWAIT</literal>. + <literal>LOCAL_CONNWAIT</literal> options. The <literal>LOCAL_CREDS</literal> option provides a mechanism for the receiver to receive the credentials of the process as a &man.recvmsg.2; control message. The <literal>LOCAL_CONNWAIT</literal> 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.</para> + For more details, see the &man.unix.4; manual page.</para> </sect3> <sect3 id="disks"> @@ -698,7 +710,7 @@ <command>eject</command>) to take place after fixating a disk.</para> - <para arch="amd64">The machine-specific optimized version of + <para arch="amd64">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.</para> @@ -758,7 +770,7 @@ <para>The on-disk format of <literal>LC_CTYPE</literal> files has been changed to be machine-independent.</para> - <para>The &man.mixer.8; utility now supports <option>-S</option> + <para>The &man.mixer.8; utility now supports the <option>-S</option> option. This is the same as the <option>-s</option> option but does not output mixing field separators.</para> @@ -975,10 +987,10 @@ run out of buffer space due to a local denial-of-service attack. &merged;</para> - <para>The &man.syslogd.8; now supports <option>-S</option> option + <para>The &man.syslogd.8; now supports the <option>-S</option> 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 (<filename>/var/run/log</filename> and <filename>/var/run/logpriv</filename> are used by default). &merged;</para> @@ -1067,15 +1079,24 @@ <para><application>BIND</application> has been updated from version 9.3.0 to version 9.3.1. &merged;</para> + <para><application>bsnmp</application> has been updated from 1.7 + to 1.9.</para> + <para><application>FILE</application> has been updated from 4.10 to 4.12.</para> <para><application>GNU readline</application> has been updated from version 4.3 to version 5.0.</para> + <para><application>IPFilter</application> has been updated from + 3.4.35 to 4.1.18.</para> + <para><application>Heimdal</application> has been updated from 0.6.1 to 0.6.3. &merged;</para> + <para><application>libz</application> has been updated from 1.2.1 + to 1.2.2.</para> + <para><application>lukemftp</application> has been updated from a 26 April 2004 snapshot from OpenBSD's sources to a snapshot as of 19 February 2005.</para> @@ -1096,6 +1117,9 @@ <para><application>sendmail</application> has been updated from version 8.13.1 to version 8.13.3. &merged;</para> + <para><application>tcsh</application> has been updated from + 6.13.00 to 6.14.00.</para> + <para>The timezone database has been updated from the <application>tzdata2004e</application> release to the <application>tzdata2004g</application> release. &merged;</para> @@ -1206,8 +1230,8 @@ <title>Documentation</title> <para>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.</para> + have been added. These explain the kernel options <literal>SCHED_4BSD</literal> + and <literal>SCHED_ULE</literal>, as well as some applicable sysctl variables.</para> <para>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 @@ <!-- The FreeBSD Simplified Chinese Project - Original revision: 1.845 + Original revision: 1.849 --> <articleinfo> <title>&os;/&arch; &release.current; ·¢ÐÐ˵Ã÷</title> <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.4 2005/04/18 16:55:48 delphij Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.5 2005/05/01 15:07:58 delphij Exp $</pubdate> <copyright> <year>2000</year> @@ -143,6 +143,12 @@ <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:04.ifconf.asc">FreeBSD-SA-05:04.ifconf</ulink>¡£ &merged;</para> + <para>ÐÞÕýÁË &man.cvs.1; ÖеĶദ³ÌÐòÉè¼ÆÎÊÌ⣬ ÕâЩÎÊÌâ¿ÉÄܵ¼ÖÂÔÚ + CVS ·þÎñÆ÷ÉÏÖ´ÐÐÈÎÒâ´úÂë¡£ + ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ + <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:05.cvs.asc">FreeBSD-SA-05:05.cvs</ulink>¡£ + &merged;</para> + </sect2> <sect2 id="kernel"> @@ -297,6 +303,12 @@ <varname>hint.<replaceable>ichss</replaceable>.0.disabled="1"</varname> À´½ûÓá£</para> + <para arch="amd64,i386">¼ÓÈëÁËÓÃÓÚÓ²¼þÐÔÄܼàÊÓ¼ÆÊýÆ÷µÄ &man.hwpmc.4; + Çý¶¯¡£ Õâ¸öÇý¶¯³éÏóÁËÐÂʽ CPU ÖÐÌṩµÄÓ²¼þÐÔÄܼàÊÓ»úÖÆ£¬ + ²¢ÌṩÁËÔÚÓû§½ø³ÌÖÐÀûÓÃÕâЩ»úÖƵÄÖ§³Ö¡£ ÒªÁ˽â¸ü¶àµÄϸ½Ú£¬ + Çë²Î¼û &man.hwpmc.4; µÄÁª»úÊֲᡢ Ïà¹ØÁªµÄº¯Êý¿â£¬ + ÒÔ¼°ÓйصÄÆäËû¹¤¾ß¡£</para> + <para arch="i386">ɾȥÁ˶ÔÓÚ OLDCARD ×ÓϵͳµÄÖ§³Ö¡£ ÏÖÔÚ£¬ NEWCARD ϵͳ±»ÓÃÓÚÖ§³ÖËùÓÐµÄ PCCARD É豸ÁË¡£</para> @@ -385,6 +397,12 @@ <para>&man.hme.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£ &merged;</para> + <para>¼ÓÈëÁË &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) + Çý¶¯¡£</para> + <para>&man.ixgb.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£</para> <para arch="amd64">ÏÖÔÚ &man.ndis.4; É豸Çý¶¯ wrapper @@ -450,6 +468,8 @@ µ±Ê¹ÓÃÁË <literal>gid</literal>, <literal>jail</literal>, ºÍ/»ò <literal>uid</literal> ¹æÔòÑ¡ÏîʱÕý³£¹¤×÷ÁË¡£ &merged;</para> + <para>&man.ipfw.4; ºÍ &man.dummynet.4; ϵͳÄܹ»Ö§³Ö IPv6 ÁË¡£</para> + <para>&man.ipfw.8; ÏÖÔÚÖ§³Öͨ¹ýת·¢ socket£¬ ÒÔ¼° TCP Êý¾Ý³¤¶ÈÀ´Çø·Ö²¢±ê¼Ç &man.altq.4; °üÁË¡£</para> @@ -481,6 +501,10 @@ <para>&man.sppp.4; Çý¶¯ÏÖÔÚ MPSAFE ÁË¡£</para> + <para>ʵÏÖÁËÒ»¸öÐ嵀 sysctl <varname>net.link.tap.user_open</varname>¡£ + ËüÔÊÐí»ùÓÚÎļþϵͳȨÏÞ¶Ô + &man.tap.4; É豸½øÐзÇÌØȨ·ÃÎÊ¡£</para> + <para>ÐÞÕýÁË TCP µÄÒ»´¦ÎÊÌ⣬ ÕâÒ»ÎÊÌâÓÐʱ»áµ¼Öµ±½ÓÊÕ´°¿Ú´óСΪÁãʱ£¬ RST °ü±»ºöÂÔµÄÎÊÌâ¡£ &merged;</para> @@ -523,6 +547,15 @@ <varname>debug.mpsafenet</varname> sysctl ±äÁ¿ÉèÖÃΪ <literal>1</literal>)¡£</para> + <para>ÏÖÔÚ Unix domain socket ÌṩÁË + <literal>LOCAL_CREDS</literal> ºÍ + <literal>LOCAL_CONNWAIT</literal>¡£ + ÆäÖУ¬ <literal>LOCAL_CREDS</literal> Ñ¡ÏîÌṩÁËÒ»ÖÖ»úÖÆ£¬ + ʹµÃ½ÓÊÕ·½Äܹ»ÒÔ &man.recvmsg.2; ¿ØÖÆÏûÏ¢µÄÐÎʽ£¬ + ÊÕµ½·¢ËÍÕߵĽø³Ìƾ¾Ý¡£ + ¶ø <literal>LOCAL_CONNWAIT</literal> Ôò½«Èà &man.connect.2; + º¯Êý×èÈû£¬ Ö±µ½ÔÚ¼àÌý socket ÉÏÖ´ÐÐÁË &man.accept.2; Ϊֹ¡£ + ÓûÁ˽â½øÒ»²½µÄÇé¿ö£¬ Çë²Î¼û &man.unix.4; Áª»úÊֲᡣ</para> </sect3> <sect3 id="disks"> @@ -555,6 +588,8 @@ <para>ɾȥÁË¾ÉµÄ vinum(4) ×Óϵͳ£¬ еĻùÓÚ &man.geom.4; µÄ°æ±¾ÌṩÁ˸üºÃµÄ¹¦ÄÜ¡£</para> + <para>&man.twa.4; Çý¶¯¸üе½ÁËÀ´×Ô 3ware ÍøÕ¾µÄ 9.2 °æ (ÓÃÓÚ &os; 5.2.1)</para> + <para arch="pc98">ɾȥÁË &man.wd.4; Çý¶¯¡£ &man.ata.4; Çý¶¯ÒѾÄܹ»ÔÚ pc98 ƽ̨ÉϺܺõŤ×÷£¬ Òò¶ø²»ÔÙÐèÒª¾ÉµÄ &man.wd.4; @@ -601,6 +636,11 @@ <para>ÏÖÔÚ &man.burncd.8; ¹¤¾ßÄܹ»ÔÚ¹âÅ̶¨ÐÍÖ®ºóÖ´ÐÐÃüÁîÁË (ÀýÈç <command>eject</command>)¡£</para> + <para arch="amd64">ʵÏÖÁËÕë¶Ô±¾Æ½Ì¨ÓÅ»¯µÄ + &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; °æ±¾¡£</para> + <para>ÏÖÔÚ &man.ftpd.8; ³ÌÐò»áÕýÈ·µØΪĿ¼ºÍÎļþµÄ״̬ʹÓà <literal>212</literal> ºÍ <literal>213</literal> ״̬´úÂëÁË (¹ýÈ¥µÄ°æ±¾£¬ Ôø¾³¤ÆÚʹÓà <literal>211</literal>)¡£ @@ -628,6 +668,12 @@ ÒÔÇ¿ÖÆ´´½¨ GPT£¬ ¼´Ê¹´ÅÅÌÉÏÔÏÈÒѾ´æÔÚÁË MBR ¼Ç¼¡£ &merged;</para> + <para>ÏÖÔÚ &man.getprotoent.3;£¬ &man.getprotobyname.3;£¬ ÒÔ¼° + &man.getprotobynumber.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£</para> + + <para>ÏÖÔÚ &man.getservent.3;£¬ &man.getservbyname.3;£¬ ÒÔ¼° + &man.getservbyport.3; º¯ÊýÊÇḬ̈߳²È«µÄÁË¡£</para> + <para>gvinum(8) ¹¤¾ßÏÖÔÚÖ§³Ö <command>checkparity</command>¡¢ <command>rebuildparity</command>£¬ ÒÔ¼° @@ -645,6 +691,10 @@ <para>´ÅÅÌÉ쵀 <literal>LC_CTYPE</literal> Îļþ¸ñʽ£¬ ÏÖÔÚÒѾ¸ÄΪ»úÆ÷Î޹صĸñʽÁË¡£</para> + <para>&man.mixer.8; ¹¤¾ßÐÂÔöÁË <option>-S</option> + ²ÎÊý¡£ ËüµÄ¹¦ÄÜºÍ <option>-s</option> Ò»Ñù£¬ + µ«²¢²»Êä³ö»ìÒô×ֶμä¸ô·û¡£</para> + <para>ÐÞÕýÁË <filename>libalias</filename> º¯Êý¿âÖеÄÒ»´¦ÎÊÌ⣬ ¸ÃÎÊÌâ¿ÉÄܵ¼ÖÂʹÓà &man.natd.8; µÄ <option>-reverse</option> Ñ¡Ïîʱ³öÏÖ core dump¡£</para> @@ -787,7 +837,7 @@ ÏÖÔÚʹÓà &man.bsdtar.1; ´úÌæÁË GNU tar¡£</para> <para>&man.restore.8; ¹¤¾ßÓÖÄܹ»´¦Àí - &os; °æ±¾ 1 µÄת´¢´Å´øÁË¡£</para> + &os; °æ±¾ 1 µÄת´¢´Å´øÁË¡£ &merged;</para> <para>ÐÞÕýÁËÒ»¸öµ¼Ö &man.rexecd.8; ¹¤¾ß×ÜÊÇÒÔ <option>-i</option> ²ÎÊýÔËÐеÄÎÊÌâ¡£ &merged;</para> @@ -804,6 +854,10 @@ <para>¼ÓÈëÁËÓÃÓÚ¼ì²é×Ö·û´®ÊÇ·ñÊǵ±Ç° locale µÄ±àÂëµÄ &man.rpmatch.3; ¿âº¯Êý¡£</para> + <para>ÏÂÁÐ ISO/IEC 9899:1999 ±ê×¼º¯ÊýµÃÒÔʵÏÖ£º <function>roundl()</function>¡¢ + <function>lroundl()</function>¡¢ <function>llroundl()</function>¡¢ + <function>truncl()</function>£¬ ÒÔ¼° <function>floorl()</function>¡£</para> + <para>&man.rtld.1; ¶¯Ì¬Á¬½ÓÆ÷ÏÖÔÚÖ§³Öͨ¹ý <varname>LD_LIBMAP</varname> »·¾³±äÁ¿À´Ö¸¶¨¿âÓ³Éä¹ØϵÁË¡£ ÕâһѡÏîÄܹ»¸²¸Ç &man.libmap.conf.5; µÄÉèÖᣠ&merged;</para> @@ -824,9 +878,15 @@ Õß±ÜÃâÁË·¢Éú±¾µØµÄ¾Ü¾ø·þÎñ¹¥»÷ʱ£¬ ÌØȨ³ÌÐòÓÉÓÚÓò socket µÄ»º³åÇøºÄ¾¡¶øËÀËø¡£ &merged;</para> + <para>&man.syslogd.8; ÐÂÔöÁË <option>-S</option> Ñ¡Ï + ÓÃÒԸıäÌØȨ socket µÄ·¾¶Ãû¡£ Èç¹ûÄú²»Ï£Íû·þÎñ½ÓÊÜÀ´×Ô±¾µØ socket + µÄÏûÏ¢ (ĬÈÏʹÓõÄÊÇ <filename>/var/run/log</filename> ºÍ + <filename>/var/run/logpriv</filename>) ʱ£¬ Õâ¸öÑ¡Ïî¾ÍºÜÓÐÓÃÁË¡£ + &merged;</para> + <para>&man.syslogd.8; ¹¤¾ßÏÖÔÚÔÊÐíÔÚÖ÷»úÃû±êʶ·ûÖÐʹÓà <literal>:</literal> ºÍ <literal>%</literal> - ÕâÁ½¸ö×Ö·ûÁË¡£ ÕâЩ×Ö·û±» IPv6 µØÖ·ºÍ scope ID ʹÓá£</para> + ÕâÁ½¸ö×Ö·ûÁË¡£ ÕâЩ×Ö·û±» IPv6 µØÖ·ºÍ scope ID ʹÓᣠ&merged;</para> <para>ÏÖÔÚ &man.systat.1; <option>-netstat</option> µÄÏÔʾҲ°üÀ¨ÁË IPv6 µÄÊý¾Ý¡£ &merged;</para> @@ -860,6 +920,9 @@ <sect3 id="rc-scripts"> <title><filename>/etc/rc.d</filename> ½Å±¾</title> + <para>¼ÓÈëÁËÓÃÓÚÆô¶¯ &man.bsnmpd.1; µÄÆô¶¯½Å±¾£¬ + <filename>rc.d/bsnmpd</filename>¡£</para> + <para>&man.rc.conf.5; ÏÖÔÚÖ§³ÖÔÚÒýµ¼Ê±ÐÞ¸ÄÍøÂç½Ó¿ÚµÄÃû×ÖÁË¡£ &merged; ÀýÈ磺</para> @@ -1026,6 +1089,12 @@ <sect2 id="doc"> <title>Îĵµ</title> + <para>ÐÂÔöÁË &man.sched.4bsd.4; ºÍ &man.sched.ule.4; Áª»úÊֲᡣ + ËüÃǽéÉÜÁËÄÚºËÑ¡Ïî SCHED_4BSD ºÍ SCHED_ULE ÒÔ¼°ËûÃǸ÷×ÔÊÊÓÃµÄ sysctl¡£</para> + + <para>ÐÂÔöÁË &man.ataraid.4; Áª»úÊֲᡣ Ëü½éÉÜÁË &man.ata.4; Èí¼þ + RAID Çý¶¯¡£</para> + <para>¶ÔÓÚ»ù±¾ÏµÍ³µÄÁª»úÊÖ²áÖеÄÄÚÈݺͱí´ï·½Ê½½øÐÐÁË´óÁ¿µÄÕûÀí¡£ ½»²æÒýÓøü¼Ó׼ȷºÍÒ»Ö£¬ ±ê׼С½ÚµÄ±êÌâ¹á´©Ê¼ÖÕ£¬ ¶øʹÓõķûºÅÒ²½øÐÐÁËÇåÀí¡£</para> ==== //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 <ctype.h> #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 <sys/param.h> @@ -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 <sys/cdefs.h> -__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 <sys/disk.h> #include <sys/disklabel.h> @@ -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) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505022321.j42NLhpv085358>