Date: Mon, 22 Sep 2008 06:13:17 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 150256 for review Message-ID: <200809220613.m8M6DHhl096364@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150256 Change 150256 by imp@imp_paco-paco on 2008/09/22 06:12:42 IFC @150254 Affected files ... .. //depot/projects/mips2/src/ObsoleteFiles.inc#23 integrate .. //depot/projects/mips2/src/crypto/openssl/FREEBSD-Xlist#3 delete .. //depot/projects/mips2/src/crypto/openssl/FREEBSD-upgrade#2 delete .. //depot/projects/mips2/src/etc/Makefile#9 integrate .. //depot/projects/mips2/src/etc/periodic/daily/Makefile#4 integrate .. //depot/projects/mips2/src/etc/periodic/monthly/Makefile#2 integrate .. //depot/projects/mips2/src/etc/periodic/security/Makefile#3 integrate .. //depot/projects/mips2/src/etc/periodic/weekly/Makefile#3 integrate .. //depot/projects/mips2/src/gnu/usr.bin/Makefile#9 integrate .. //depot/projects/mips2/src/lib/Makefile#16 integrate .. //depot/projects/mips2/src/libexec/Makefile#5 integrate .. //depot/projects/mips2/src/sbin/Makefile#8 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.8#13 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifieee80211.c#10 integrate .. //depot/projects/mips2/src/sbin/ifconfig/regdomain.c#4 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#12 integrate .. //depot/projects/mips2/src/share/Makefile#4 integrate .. //depot/projects/mips2/src/share/mk/bsd.own.mk#13 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_ath.c#13 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_devs.c#8 integrate .. //depot/projects/mips2/src/sys/kern/subr_clist.c#3 integrate .. //depot/projects/mips2/src/sys/kern/tty_pts.c#7 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211.h#12 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_crypto.c#6 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_crypto.h#6 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_freebsd.h#9 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ht.c#10 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ht.h#7 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_node.c#9 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_node.h#7 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_output.c#11 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/mips2/src/sys/sys/clist.h#3 integrate .. //depot/projects/mips2/src/sys/sys/param.h#22 integrate .. //depot/projects/mips2/src/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/mips2/src/tools/build/options/WITHOUT_ACCT#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_AMD#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_APM#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_AT#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_CTM#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_IPFW#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_JAIL#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_LOCATE#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_MAIL#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_MAKE#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_NDIS#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_NETGRAPH#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_NTP#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_PKGTOOLS#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_PMC#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_PORTSNAP#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_PPP#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_QUOTAS#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_ROUTED#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_SLIP#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_SYSINSTALL#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_TELNET#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_TEXTPROC#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_WIRELESS#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/nanobsd.sh#12 integrate .. //depot/projects/mips2/src/usr.bin/Makefile#17 integrate .. //depot/projects/mips2/src/usr.bin/netstat/Makefile#5 integrate .. //depot/projects/mips2/src/usr.bin/netstat/main.c#7 integrate .. //depot/projects/mips2/src/usr.bin/netstat/netstat.h#7 integrate .. //depot/projects/mips2/src/usr.sbin/Makefile#16 integrate Differences ... ==== //depot/projects/mips2/src/ObsoleteFiles.inc#23 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.161 2008/09/17 15:49:44 attilio Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -15,7 +15,8 @@ # # 20080917: removal of manpage for axed kernel primitive suser(9) -OLD_FILES+=usr/share/man/man9/suser.9 +OLD_FILES+=usr/share/man/man9/suser.9.gz +OLD_FILES+=usr/share/man/man9/suser_cred.9.gz # 20080913: pax removed from rescue OLD_FILES+=rescue/pax # 20080823: removal of unneeded pt_chown, to implement grantpt(3) ==== //depot/projects/mips2/src/etc/Makefile#9 (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.369 2008/09/21 22:02:26 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,18 @@ 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 + # -rwxr-xr-x root:wheel, for the new cron root:wheel BIN2= netstart pccard_ether rc.suspend rc.resume @@ -112,7 +147,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 +201,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 +213,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/mips2/src/etc/periodic/daily/Makefile#4 (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/mips2/src/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/mips2/src/etc/periodic/security/Makefile#3 (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/mips2/src/etc/periodic/weekly/Makefile#3 (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/mips2/src/gnu/usr.bin/Makefile#9 (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/mips2/src/lib/Makefile#16 (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,24 +115,27 @@ _libsmb= libsmb .endif -.if ${MK_LIBTHR} != "no" -_libthr= libthr +.if ${MK_OPENSSL} != "no" +_libmp= libmp .endif -.if ${MACHINE_ARCH} != "mips" -_libthread_db= libthread_db +.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/mips2/src/libexec/Makefile#5 (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/mips2/src/sbin/Makefile#8 (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/mips2/src/sbin/ifconfig/ifconfig.8#13 (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/mips2/src/sbin/ifconfig/ifieee80211.c#10 (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) +{ + set80211(s, IEEE80211_IOC_RIFS, d, 0, NULL); +} + static int regdomain_sort(const void *a, const void *b) { @@ -2093,7 +2110,18 @@ if (flags & IEEE80211_NODE_WPS) *cp++ = 'W'; if (flags & IEEE80211_NODE_TSN) + *cp++ = 'N'; + if (flags & IEEE80211_NODE_AMPDU_TX) *cp++ = 'T'; + if (flags & IEEE80211_NODE_AMPDU_RX) + *cp++ = 'R'; + if (flags & IEEE80211_NODE_MIMO_PS) { + *cp++ = 'M'; + if (flags & IEEE80211_NODE_MIMO_RTS) + *cp++ = '+'; + } + if (flags & IEEE80211_NODE_RIFS) + *cp++ = 'I'; *cp = '\0'; return flagstring; } @@ -4048,7 +4076,7 @@ switch (val) { case IEEE80211_HTCAP_MPDUDENSITY_NA: if (verbose) - LINE_CHECK("ampdudensity -"); + LINE_CHECK("ampdudensity NA"); break; case IEEE80211_HTCAP_MPDUDENSITY_025: LINE_CHECK("ampdudensity .25"); @@ -4111,6 +4139,20 @@ else if (verbose) LINE_CHECK("-puren"); } + if (get80211val(s, IEEE80211_IOC_SMPS, &val) != -1) { + if (val == IEEE80211_HTCAP_SMPS_DYNAMIC) + LINE_CHECK("smpsdyn"); + else if (val == IEEE80211_HTCAP_SMPS_ENA) + LINE_CHECK("smps"); + else if (verbose) + LINE_CHECK("-smps"); + } + if (get80211val(s, IEEE80211_IOC_RIFS, &val) != -1) { + if (val) + LINE_CHECK("rifs"); + else if (verbose) + LINE_CHECK("-rifs"); + } } if (get80211val(s, IEEE80211_IOC_WME, &wme) != -1) { @@ -4593,6 +4635,11 @@ DEF_CMD("-ht40", 0, set80211htconf), DEF_CMD("ht", 3, set80211htconf), /* NB: 20+40 */ DEF_CMD("-ht", 0, set80211htconf), + DEF_CMD("rifs", 1, set80211rifs), + DEF_CMD("-rifs", 0, set80211rifs), + DEF_CMD("smps", IEEE80211_HTCAP_SMPS_ENA, set80211smps), + DEF_CMD("smpsdyn", IEEE80211_HTCAP_SMPS_DYNAMIC, set80211smps), + DEF_CMD("-smps", IEEE80211_HTCAP_SMPS_OFF, set80211smps), /* XXX for testing */ DEF_CMD_ARG("chanswitch", set80211chanswitch), ==== //depot/projects/mips2/src/sbin/ifconfig/regdomain.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef lint -static const char rcsid[] = "$FreeBSD: src/sbin/ifconfig/regdomain.c,v 1.3 2008/08/09 11:14:05 des Exp $"; +static const char rcsid[] = "$FreeBSD: src/sbin/ifconfig/regdomain.c,v 1.4 2008/09/21 22:16:03 sam Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -390,7 +390,7 @@ struct freqband *fp; struct netband *nb; const void *id; - int i; + int i, errors; memset(rdp, 0, sizeof(struct regdata)); mt = calloc(1, sizeof(struct mystate)); @@ -415,6 +415,8 @@ if (rdp->ident == NULL) return ENOMEM; free(mt); + + errors = 0; i = 0; LIST_FOREACH(dp, &rdp->domains, next) { rdp->ident[i].id = dp->name; @@ -440,26 +442,71 @@ if (dp->cc != NULL) { id = dp->cc; dp->cc = findid(rdp, id, COUNTRY); + if (dp->cc == NULL) { + warnx("undefined country \"%s\"", + __DECONST(char *, id)); + errors++; + } free(__DECONST(char *, id)); } - LIST_FOREACH(nb, &dp->bands_11b, next) - nb->band = findid(rdp, nb->band, FREQBAND); - LIST_FOREACH(nb, &dp->bands_11g, next) - nb->band = findid(rdp, nb->band, FREQBAND); - LIST_FOREACH(nb, &dp->bands_11a, next) - nb->band = findid(rdp, nb->band, FREQBAND); - LIST_FOREACH(nb, &dp->bands_11ng, next) - nb->band = findid(rdp, nb->band, FREQBAND); - LIST_FOREACH(nb, &dp->bands_11na, next) - nb->band = findid(rdp, nb->band, FREQBAND); + LIST_FOREACH(nb, &dp->bands_11b, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11b band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } + LIST_FOREACH(nb, &dp->bands_11g, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11g band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } + LIST_FOREACH(nb, &dp->bands_11a, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11a band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } + LIST_FOREACH(nb, &dp->bands_11ng, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11ng band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } + LIST_FOREACH(nb, &dp->bands_11na, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11na band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } } LIST_FOREACH(cp, &rdp->countries, next) { id = cp->rd; cp->rd = findid(rdp, id, DOMAIN); + if (cp->rd == NULL) { + warnx("undefined country \"%s\"", + __DECONST(char *, id)); + errors++; + } free(__DECONST(char *, id)); } - return 0; + return errors ? EINVAL : 0; } static void >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809220613.m8M6DHhl096364>