Date: Mon, 22 Sep 2008 18:50:42 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 150291 for review Message-ID: <200809221850.m8MIogSS062092@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150291 Change 150291 by ed@ed_dull on 2008/09/22 18:50:03 IFC, so I can continue importing the TTY hooks interface. Affected files ... .. //depot/projects/mpsafetty/etc/Makefile#2 integrate .. //depot/projects/mpsafetty/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/mpsafetty/etc/periodic/monthly/Makefile#2 integrate .. //depot/projects/mpsafetty/etc/periodic/security/Makefile#2 integrate .. //depot/projects/mpsafetty/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/mpsafetty/lib/Makefile#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.3#4 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc_allocate.3#2 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc_disable.3#2 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc_start.3#2 integrate .. //depot/projects/mpsafetty/libexec/Makefile#4 integrate .. //depot/projects/mpsafetty/sbin/Makefile#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/regdomain.c#3 integrate .. //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/mpsafetty/share/Makefile#2 integrate .. //depot/projects/mpsafetty/share/examples/drivers/make_pseudo_driver.sh#2 integrate .. //depot/projects/mpsafetty/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/mpsafetty/share/mk/bsd.own.mk#2 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/mpsafetty/sys/conf/files.amd64#3 integrate .. //depot/projects/mpsafetty/sys/conf/files.ia64#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/pmckern.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/tty.h#18 integrate .. //depot/projects/mpsafetty/sys/sys/ttydevsw.h#11 integrate .. //depot/projects/mpsafetty/sys/sys/ttydisc.h#10 integrate .. //depot/projects/mpsafetty/sys/sys/ttyqueue.h#11 integrate .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_ACCT#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_AMD#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_APM#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_AT#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_CTM#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_IPFW#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_JAIL#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_LOCATE#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_MAIL#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_MAKE#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_NDIS#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_NETGRAPH#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_NTP#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_PKGTOOLS#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_PMC#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_PORTSNAP#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_PPP#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_QUOTAS#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_ROUTED#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_SLIP#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_SYSINSTALL#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_TELNET#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_TEXTPROC#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_WIRELESS#1 branch .. //depot/projects/mpsafetty/usr.bin/Makefile#4 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/main.c#3 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/mpsafetty/usr.sbin/Makefile#7 integrate Differences ... ==== //depot/projects/mpsafetty/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.368 2008/05/26 10:39:45 bz Exp $ +# $FreeBSD: src/etc/Makefile,v 1.370 2008/09/22 15:37:47 sam Exp $ .include <bsd.own.mk> @@ -7,22 +7,19 @@ SUBDIR= sendmail .endif -BIN1= amd.map apmd.conf auth.conf \ +BIN1= auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab \ ftpusers gettytab group \ - hosts hosts.allow hosts.equiv hosts.lpd \ + hosts hosts.allow hosts.equiv \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ - portsnap.conf pf.os phones profile protocols \ + phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ - rc.subr regdomain.xml remote rpc services shells \ - snmpd.config sysctl.conf syslog.conf \ - etc.${MACHINE_ARCH}/ttys \ - ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ - ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ - ${.CURDIR}/../usr.bin/locate/locate/locate.rc + rc.subr remote rpc services shells \ + sysctl.conf syslog.conf \ + etc.${MACHINE_ARCH}/ttys OPENBSMDIR= ${.CURDIR}/../contrib/openbsm BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \ @@ -32,12 +29,38 @@ BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn BSM_ETC_DIR= ${DESTDIR}/etc/security +# NB: keep these sorted by MK_* knobs + +.if ${MK_AMD} != "no" +BIN1+= amd.map +.endif + +.if ${MK_APM} != "no" +BIN1+= apmd.conf +.endif + +.if ${MK_BSNMP} != "no" +BIN1+= snmpd.config +.endif + +.if ${MK_FREEBSD_UPDATE} != "no" +BIN1+= freebsd-update.conf +.endif + +.if ${MK_LOCATE} != "no" +BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc +.endif + .if ${MK_LPR} != "no" -BIN1+= printcap +BIN1+= hosts.lpd printcap +.endif + +.if ${MK_MAIL} != "no" +BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc .endif -.if ${MK_NS_CACHING} != "no" -BIN1+= nscd.conf +.if ${MK_MAN} != "no" +BIN1+= ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config .endif .if ${MK_OPENSSH} != "no" @@ -49,6 +72,22 @@ SSL= ${.CURDIR}/../crypto/openssl/apps/openssl.cnf .endif +.if ${MK_NS_CACHING} != "no" +BIN1+= nscd.conf +.endif + +.if ${MK_PORTSNAP} != "no" +BIN1+= portsnap.conf +.endif + +.if ${MK_PF} != "no" +BIN1+= pf.os +.endif + +.if ${MK_WIRELESS} != "no" +BIN1+= regdomain.xml +.endif + # -rwxr-xr-x root:wheel, for the new cron root:wheel BIN2= netstart pccard_ether rc.suspend rc.resume @@ -112,7 +151,9 @@ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ ${DESTDIR}/etc/master.passwd +.if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install +.endif ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install @@ -164,8 +205,11 @@ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree +.if ${MK_PPP} != "no" cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp +.endif +.if ${MK_MAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${ETCMAIL} ${DESTDIR}/etc/mail @if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ @@ -173,6 +217,7 @@ set -x; \ ln -s mail/aliases ${DESTDIR}/etc/aliases; \ fi +.endif ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \ ${DESTDIR}/etc/dumpdates ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \ ==== //depot/projects/mpsafetty/etc/periodic/daily/Makefile#2 (text+ko) ==== @@ -1,15 +1,11 @@ -# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.16 2007/05/14 17:34:59 maxim Exp $ +# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.17 2008/09/21 22:02:26 sam Exp $ + +.include <bsd.own.mk> FILES= 100.clean-disks \ 110.clean-tmps \ 120.clean-preserve \ - 130.clean-msgs \ - 140.clean-rwho \ - 150.clean-hoststat \ 200.backup-passwd \ - 210.backup-aliases \ - 300.calendar \ - 310.accounting \ 330.news \ 400.status-disks \ 404.status-zfs \ @@ -19,13 +15,42 @@ 408.status-gstripe \ 409.status-gconcat \ 420.status-network \ - 430.status-rwho \ + 450.status-security \ + 999.local + +# NB: keep these sorted by MK_* knobs + +.if ${MK_ACCT} != "no" +FILES+= 310.accounting +.endif + +.if ${MK_BIND_NAMED} != "no" +FILES+= 470.status-named +.endif + +.if ${MK_CALENDAR} != "no" +FILES+= 300.calendar +.endif + +.if ${MK_MAIL} != "no" +FILES+= 130.clean-msgs +.endif + +.if ${MK_NTP} != "no" +FILES+= 480.status-ntpd +.endif + +.if ${MK_RCMDS} != "no" +FILES+= 140.clean-rwho \ + 430.status-rwho +.endif + +.if ${MK_SENDMAIL} != "no" +FILES+= 150.clean-hoststat \ + 210.backup-aliases \ 440.status-mailq \ - 450.status-security \ 460.status-mail-rejects \ - 470.status-named \ - 480.status-ntpd \ - 500.queuerun \ - 999.local + 500.queuerun +.endif .include <bsd.prog.mk> ==== //depot/projects/mpsafetty/etc/periodic/monthly/Makefile#2 (text+ko) ==== @@ -1,6 +1,13 @@ -# $FreeBSD: src/etc/periodic/monthly/Makefile,v 1.3 2002/07/18 12:32:57 ru Exp $ +# $FreeBSD: src/etc/periodic/monthly/Makefile,v 1.4 2008/09/21 22:02:26 sam Exp $ + +.include <bsd.own.mk> + +FILES= 999.local + +# NB: keep these sorted by MK_* knobs -FILES= 200.accounting \ - 999.local +.if ${MK_ACCT} != "no" +FILES+= 200.accounting +.endif .include <bsd.prog.mk> ==== //depot/projects/mpsafetty/etc/periodic/security/Makefile#2 (text+ko) ==== @@ -1,17 +1,30 @@ -# $FreeBSD: src/etc/periodic/security/Makefile,v 1.6 2006/08/25 07:34:36 trhodes Exp $ +# $FreeBSD: src/etc/periodic/security/Makefile,v 1.7 2008/09/21 22:02:26 sam Exp $ + +.include <bsd.own.mk> FILES= 100.chksetuid \ 200.chkmounts \ 300.chkuid0 \ 400.passwdless \ 410.logincheck \ - 500.ipfwdenied \ - 510.ipfdenied \ - 520.pfdenied \ - 550.ipfwlimit \ 700.kernelmsg \ 800.loginfail \ 900.tcpwrap \ security.functions +# NB: keep these sorted by MK_* knobs + +.if ${MK_IPFILTER} != "no" +FILES+= 510.ipfdenied +.endif + +.if ${MK_IPFW} != "no" +FILES+= 500.ipfwdenied \ + 550.ipfwlimit +.endif + +.if ${MK_PF} != "no" +FILES+= 520.pfdenied +.endif + .include <bsd.prog.mk> ==== //depot/projects/mpsafetty/etc/periodic/weekly/Makefile#2 (text+ko) ==== @@ -1,10 +1,22 @@ -# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.9 2006/08/29 08:49:57 ru Exp $ +# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.10 2008/09/21 22:02:26 sam Exp $ + +.include <bsd.own.mk> -FILES= 310.locate \ - 320.whatis \ - 330.catman \ - 340.noid \ - 400.status-pkg \ +FILES= 340.noid \ 999.local +# NB: keep these sorted by MK_* knobs + +.if ${MK_LOCATE} != "no" +FILES+= 310.locate +.endif + +.if ${MK_MAN} != "no" +FILES+= 320.whatis 330.catman +.endif + +.if ${MK_PKGTOOLS} != "no" +FLES+= 400.status-pkg +.endif + .include <bsd.prog.mk> ==== //depot/projects/mpsafetty/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.98 2008/09/01 18:18:19 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.99 2008/09/21 22:02:26 sam Exp $ .include <bsd.own.mk> @@ -46,12 +46,16 @@ _grep= grep .endif +.if ${MK_INFO} != "no" +_texinfo= texinfo +.endif + .if ${MK_MAN} != "no" _man= man .endif -.if ${MK_INFO} != "no" -_texinfo= texinfo +.if ${MK_RCS} != "no" +_rcs= rcs .endif .if ${MK_TOOLCHAIN} != "no" @@ -61,8 +65,5 @@ _gdb= gdb .endif .endif -.if ${MK_RCS} != "no" -_rcs= rcs -.endif .include <bsd.subdir.mk> ==== //depot/projects/mpsafetty/lib/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.232 2008/08/06 14:02:05 dfr Exp $ +# $FreeBSD: src/lib/Makefile,v 1.233 2008/09/21 22:02:26 sam Exp $ .include <bsd.own.mk> @@ -27,17 +27,17 @@ # Otherwise, the SUBDIR list should be in alphabetical order. SUBDIR= ${_csu} libc libbsm libcom_err libcrypt libelf libkvm msun libmd \ - ncurses libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ - ${_libypclnt} libalias libarchive ${_libatm} \ - libbegemot ${_libbluetooth} libbsnmp libbz2 \ + ncurses ${_libnetgraph} libradius librpcsvc libsbuf \ + libtacplus libutil ${_libypclnt} libalias libarchive ${_libatm} \ + libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ ${_libgssapi} ${_librpcsec_gss} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ + ${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ - ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ + ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -48,6 +48,8 @@ _csu=csu .endif +# NB: keep these sorted by MK_* knobs + .if ${MK_ATM} != "no" _libngatm= libngatm .endif @@ -61,6 +63,14 @@ _libsdp= libsdp .endif +.if ${MK_BSNMP} != "no" +_libbsnmp= libbsnmp +.endif + +.if ${MK_GPIB} != "no" +_libgpib= libgpib +.endif + .if ${MK_GSSAPI} != "no" _libgssapi= libgssapi _librpcsec_gss= librpcsec_gss @@ -70,6 +80,18 @@ _libipx= libipx .endif +.if ${MK_LIBTHR} != "no" +_libthr= libthr +.endif + +.if ${MK_NETGRAPH} != "no" +_libnetgraph= libnetgraph +.endif + +.if ${MK_NIS} != "no" +_libypclnt= libypclnt +.endif + .if ${MACHINE_ARCH} == "i386" .if ${MK_NCP} != "no" _libncp= libncp @@ -82,17 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_SENDMAIL} != "no" -_libmilter= libmilter -_libsm= libsm -_libsmdb= libsmdb -_libsmutil= libsmutil -.endif - -.if ${MK_OPENSSL} != "no" -_libmp= libmp -.endif - .if ${MACHINE_ARCH} == "amd64" .if ${MK_NCP} != "no" _libncp= libncp @@ -104,20 +115,27 @@ _libsmb= libsmb .endif -.if ${MK_LIBTHR} != "no" -_libthr= libthr +.if ${MK_OPENSSL} != "no" +_libmp= libmp +.endif + +.if ${MK_PMC} != "no" +_libpmc= libpmc .endif -.if ${MK_USB} != "no" -_libusbhid= libusbhid +.if ${MK_SENDMAIL} != "no" +_libmilter= libmilter +_libsm= libsm +_libsmdb= libsmdb +_libsmutil= libsmutil .endif -.if ${MK_NIS} != "no" -_libypclnt= libypclnt +.if ${MK_TELNET} != "no" +_libtelnet= libtelnet .endif -.if ${MK_GPIB} != "no" -_libgpib= libgpib +.if ${MK_USB} != "no" +_libusbhid= libusbhid .endif .include <bsd.subdir.mk> ==== //depot/projects/mpsafetty/lib/libpmc/pmc.3#4 (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.21 2008/09/19 13:21:23 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.22 2008/09/22 14:31:24 jkoshy Exp $ .\" .Dd September 16, 2008 .Os @@ -261,7 +261,14 @@ .It Li PMC_CAP_WRITE The ability to write to performance counters. .El -.Ss Functional Grouping +.Ss CPU Naming Conventions +CPUs are named using small integers from zero uptil, but +excluding, the value returned by function +.Fn pmc_ncpu . +On platforms supporting sparsely numbered CPUs not all the numbers in +this range will denote valid CPUs. +Operations on non-existent CPUs will return an error. +.Ss Functional Grouping of the API This section contains a brief overview of the available functionality in the PMC library. Each function listed here is described further in its own manual page. @@ -342,7 +349,7 @@ Retrieve statistics maintained by .Xr hwpmc 4 . .It Fn pmc_ncpu -Determine the number of CPUs in the system. +Determine the greatest possible CPU number on the system. .It Fn pmc_npmc Return the number of hardware PMCs present in a given CPU. .It Fn pmc_pmcinfo ==== //depot/projects/mpsafetty/lib/libpmc/pmc_allocate.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2007-2008 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc_allocate.3,v 1.1 2007/11/23 11:46:08 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc_allocate.3,v 1.2 2008/09/22 14:31:24 jkoshy Exp $ .\" -.Dd November 20, 2007 +.Dd September 22, 2008 .Os .Dt PMC_ALLOCATE 3 .Sh NAME @@ -156,7 +156,7 @@ .It Bq Er ENXIO Function .Fn pmc_allocate -requested the use of a hardware resource that was previously +requested the use of a hardware resource that was absent or administratively disabled. .It Bq Er EOPNOTSUPP The underlying hardware does not support the capabilities needed for ==== //depot/projects/mpsafetty/lib/libpmc/pmc_capabilities.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2007-2008 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc_capabilities.3,v 1.2 2008/03/12 15:48:59 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc_capabilities.3,v 1.3 2008/09/22 14:31:24 jkoshy Exp $ .\" -.Dd November 24, 2007 +.Dd September 22, 2008 .Os .Dt PMC_CAPABILITIES 3 .Sh NAME @@ -96,8 +96,11 @@ .Pp Function .Fn pmc_ncpu -is a convenience function that returns the number of CPUs in the -system. +is a convenience function that returns the maximum CPU number in +the system. +On systems that support sparsely numbered CPUs, not all CPUs may +be physically present. +Applications need to be prepared to deal with nonexistent CPUs. .Pp Function .Fn pmc_npmc @@ -201,11 +204,11 @@ .It Bq Er EINVAL The argument .Fa cpu -specified a non-existent CPU. +was invalid. .It Bq Er ENXIO The argument .Fa cpu -specified a disabled CPU. +specified a disabled or absent CPU. .El .Pp A call to function ==== //depot/projects/mpsafetty/lib/libpmc/pmc_disable.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2007-2008 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc_disable.3,v 1.1 2007/11/23 12:21:34 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc_disable.3,v 1.2 2008/09/22 14:31:24 jkoshy Exp $ .\" -.Dd November 20, 2007 +.Dd September 22, 2008 .Os .Dt PMC_ENABLE 3 .Sh NAME @@ -85,7 +85,7 @@ .It Bq Er ENXIO Argument .Fa cpu -specified a disabled CPU. +specified a disabled or absent CPU. .It Bq Er EPERM The current process lacks sufficient privilege to perform this operation. @@ -96,4 +96,4 @@ .Xr pmc_pmcinfo 3 , .Xr hwpmc 4 , .Xr pmccontrol 8 , -.Xr priv_check 9+.Xr priv_check 9 ==== //depot/projects/mpsafetty/lib/libpmc/pmc_start.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2007-2008 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc_start.3,v 1.1 2007/11/25 06:38:55 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc_start.3,v 1.2 2008/09/22 14:31:24 jkoshy Exp $ .\" -.Dd November 25, 2007 +.Dd September 22, 2008 .Os .Dt PMC_START 3 .Sh NAME @@ -69,7 +69,8 @@ .Fn pmc_stop specified a PMC that was never started. .It Bq Er ENXIO -The specified PMC had system scope and its associated CPU was disabled. +The specified PMC had system scope and its associated CPU was disabled or +absent. .El .Sh SEE ALSO .Xr pmc 3 , ==== //depot/projects/mpsafetty/libexec/Makefile#4 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.79 2008/08/24 10:01:22 ed Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.80 2008/09/21 22:02:26 sam Exp $ .include <bsd.own.mk> -SUBDIR= atrun \ +SUBDIR= ${_atrun} \ bootpd \ - comsat \ + ${_comsat} \ fingerd \ ftpd \ getty \ @@ -13,7 +13,7 @@ ${_mail.local} \ makekey \ ${_mknetid} \ - pppoed \ + ${_pppoed} \ rbootd \ revnetgroup \ ${_rlogind} \ @@ -28,16 +28,28 @@ ${_smrsh} \ talkd \ tcpd \ - telnetd \ + ${_telnetd} \ tftpd \ ${_tftp-proxy} \ ${_ypxfr} +.if ${MK_AT} != "no" +_atrun= atrun +.endif + +.if ${MK_MAIL} != "no" +_comsat= comsat +.endif + .if ${MK_NIS} != "no" _mknetid= mknetid _ypxfr= ypxfr .endif +.if ${MK_NETGRAPH} != "no" +_pppoed= pppoed +.endif + .if ${MK_PF} != "no" _tftp-proxy= tftp-proxy .endif @@ -53,7 +65,11 @@ .if ${MK_SENDMAIL} != "no" _mail.local= mail.local -_smrsh= smrsh +_smrsh= smrsh +.endif + +.if ${MK_TELNET} != "no" +_telnetd= telnetd .endif .include <bsd.subdir.mk> ==== //depot/projects/mpsafetty/sbin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.173 2008/07/06 20:57:35 marcel Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.174 2008/09/21 22:02:26 sam Exp $ .include <bsd.own.mk> @@ -40,7 +40,7 @@ ifconfig \ init \ ${_ipf} \ - ipfw \ + ${_ipfw} \ iscontrol \ kldconfig \ kldload \ @@ -61,7 +61,7 @@ mount_nullfs \ mount_udf \ mount_unionfs \ - natd \ + ${_natd} \ newfs \ newfs_msdos \ nfsiod \ @@ -70,13 +70,13 @@ ${_pflogd} \ ping \ ${_ping6} \ - quotacheck \ + ${_quotacheck} \ rcorder \ reboot \ recoverdisk \ restore \ route \ - routed \ + ${_routed} \ ${_rtsol} \ savecore \ ${_sconfig} \ @@ -84,7 +84,7 @@ shutdown \ slattach \ spppcontrol \ - startslip \ + ${_startslip} \ ${_sunlabel} \ swapon \ sysctl \ @@ -103,6 +103,11 @@ _ipf= ipf .endif +.if ${MK_IPFW} != "no" +_ipfw= ipfw +_natd= natd +.endif + .if ${MK_PF} != "no" _pfctl= pfctl _pflogd= pflogd @@ -117,6 +122,18 @@ _bsdlabel= bsdlabel .endif +.if ${MK_QUOTAS} != "no" +_quotacheck= quotacheck +.endif + +.if ${MK_ROUTED} != "no" +_routed= routed +.endif + +.if ${MK_SLIP} != "no" +_startslip= startslip +.endif + .if ${MACHINE_ARCH} == "i386" .if ${MACHINE} == "i386" _fdisk= fdisk ==== //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.8#7 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.153 2008/08/28 22:13:44 jfv Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.154 2008/09/22 00:30:26 sam Exp $ .\" -.Dd August 27, 2008 +.Dd September 5, 2008 .Dt IFCONFIG 8 .Os .Sh NAME @@ -1396,6 +1396,13 @@ .Cm outdoor , and .Cm anywhere . +.It Cm rifs +Enable use of Reduced InterFrame Spacing (RIFS) when operating in 802.11n +on an HT channel. +Note that RIFS must be supported by both the station and access point +for it to be used. +To disable RIFS use +.Fl rifs . .It Cm roam:rate Ar rate Set the threshold for controlling roaming when operating in a BSS. The @@ -1497,6 +1504,23 @@ NB: this currently enables Short GI on both HT40 and HT20 channels. To disable Short GI use .Fl shortgi . +.It Cm smps +Enable use of Static Spatial Multiplexing Power Save (SMPS) +when operating in 802.11n. +A station operating with Static SMPS maintains only a single +receive chain active (this can significantly reduce power consumption). +To disable SMPS use +.Fl smps . +.It Cm smpsdyn +Enable use of Dynamic Spatial Multiplexing Power Save (SMPS) +when operating in 802.11n. +A station operating with Dynamic SMPS maintains only a single +receive chain active but switches to multiple receive chains when it +receives an RTS frame (this can significantly reduce power consumption). +Note that stations cannot distinguish between RTS/CTS intended to +enable multiple receive chains and those used for other purposes. +To disable SMPS use +.Fl smps . .It Cm ssid Ar ssid Set the desired Service Set Identifier (aka network name). The SSID is a string up to 32 characters ==== //depot/projects/mpsafetty/sbin/ifconfig/ifieee80211.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.57 2008/08/14 03:49:14 thompsa Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.59 2008/09/22 00:30:26 sam Exp $ */ /*- @@ -112,6 +112,11 @@ #define IEEE80211_NODE_HTCOMPAT 0x0080 /* HT setup w/ vendor OUI's */ #define IEEE80211_NODE_WPS 0x0100 /* WPS association */ #define IEEE80211_NODE_TSN 0x0200 /* TSN association */ +#define IEEE80211_NODE_AMPDU_RX 0x0400 /* AMPDU rx enabled */ +#define IEEE80211_NODE_AMPDU_TX 0x0800 /* AMPDU tx enabled */ +#define IEEE80211_NODE_MIMO_PS 0x1000 /* MIMO power save enabled */ +#define IEEE80211_NODE_MIMO_RTS 0x2000 /* send RTS in MIMO PS */ +#define IEEE80211_NODE_RIFS 0x4000 /* RIFS enabled */ #endif #define MAXCOL 78 @@ -1598,7 +1603,7 @@ { int v; - if (isanyarg(val)) + if (isanyarg(val) || strcasecmp(val, "na") == 0) v = IEEE80211_HTCAP_MPDUDENSITY_NA; else switch ((int)(atof(val)*4)) { case 0: @@ -1695,6 +1700,18 @@ set80211(s, IEEE80211_IOC_DOTD, d, 0, NULL); } +static void +set80211smps(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_SMPS, d, 0, NULL); +} + +static void +set80211rifs(const char *val, int d, int s, const struct afswtch *rafp) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809221850.m8MIogSS062092>