ftp-proxy: Update to OpenBSD 4.1

	ftp-proxy has been moved from libexec/ to usr.sbin/

• [DBH] libexec/Makefile
• [DBH] libexec/ftp-proxy/Makefile
• [DBH] libexec/ftp-proxy/ftp-proxy.8
• [DBH] libexec/ftp-proxy/ftp-proxy.c
• [DBH] libexec/ftp-proxy/getline.c
• [DBH] libexec/ftp-proxy/util.c
• [DBH] libexec/ftp-proxy/util.h
• [DBH] usr.sbin/Makefile
• [DBH] usr.sbin/ftp-proxy/.depend
• [DBH] usr.sbin/ftp-proxy/Makefile
• [DBH] usr.sbin/ftp-proxy/filter.c
• [DBH] usr.sbin/ftp-proxy/filter.h
• [DBH] usr.sbin/ftp-proxy/ftp-proxy.8
• [DBH] usr.sbin/ftp-proxy/ftp-proxy.c

pflogd: Update to OpenBSD 4.1

• [DBH] usr.sbin/pflogd/Makefile
• [DBH] usr.sbin/pflogd/pflogd.8
• [DBH] usr.sbin/pflogd/pflogd.c
• [DBH] usr.sbin/pflogd/pflogd.h
• [DBH] usr.sbin/pflogd/privsep.c
• [DBH] usr.sbin/pflogd/privsep_fdpass.c

PF: Update manpages

	pf.os(5)

• [DBH] usr.sbin/pfctl/pf.os.5

Merge branch 'master' into pf_update

• [DBH] share/man/man4/iwnfw.4
• [DBH] sys/conf/files
• [DBH] sys/config/LINT
• [DBH] sys/dev/netif/iwn/fw/Makefile
• [DBH] sys/dev/netif/iwn/fw/iwn6050/Makefile
• [DBH] sys/netproto/802_11/ieee80211.h

iwn.4: Miscellaneous adjustments.

* Add some words about iwn6050fw.

* Comment out information about building the firmwares separately into
  the kernel. We don't support that (yet).

• [DBH] share/man/man4/iwnfw.4

iwn(4): Add Makefile for building iwn6050fw.ko.

• [DBH] sys/dev/netif/iwn/fw/Makefile
• [DBH] sys/dev/netif/iwn/fw/iwn6050/Makefile

Add iwn(4) and iwnfw(4) to LINT.

• [DBH] sys/config/LINT

config - Fix typo in iwn6050 clean target.

• [DBH] sys/conf/files

Unbreak buildworld.

wlan_token shall be visible to the kernel only.

• [DBH] sys/netproto/802_11/ieee80211.h

Merge branch 'master' into pf_update

• [DBH] Makefile_upgrade.inc
• [DBH] etc/rc.d/lvm
• [DBH] include/unistd.h
• [DBH] lib/libc/sys/Makefile.inc
• [DBH] lib/libc/sys/mkdir.2
• [DBH] lib/libc/sys/mkfifo.2
• [DBH] lib/libc/sys/mknod.2
• [DBH] lib/libc/sys/readlink.2
• [DBH] lib/libc/sys/symlink.2
• [DBH] lib/libdevattr/udev_enumerate.3
• [DBH] lib/libdevattr/udev_monitor.3
• [DBH] sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu
• [DBH] sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu
• [DBH] sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu
• [DBH] sys/dev/netif/iwn/fw/iwn6000/Makefile
• [DBH] sys/dev/netif/iwn/if_iwn.c
• [DBH] sys/dev/netif/iwn/if_iwnvar.h
• [DBH] sys/dev/video/bktr/bktr_i2c.c
• [DBH] sys/kern/init_sysent.c
• [DBH] sys/kern/sys_generic.c
• [DBH] sys/kern/sys_pipe.c
• [DBH] sys/kern/syscalls.c
• [DBH] sys/kern/syscalls.master
• [DBH] sys/kern/vfs_syscalls.c
• [DBH] sys/netproto/802_11/ieee80211.h
• [DBH] sys/netproto/802_11/ieee80211_dragonfly.h
• [DBH] sys/netproto/802_11/wlan/ieee80211.c
• [DBH] sys/netproto/802_11/wlan/ieee80211_ioctl.c
• [DBH] sys/netproto/802_11/wlan/ieee80211_power.c
• [DBH] sys/netproto/802_11/wlan/ieee80211_proto.c
• [DBH] sys/netproto/802_11/wlan/ieee80211_scan.c
• [DBH] sys/sys/stat.h
• [DBH] sys/sys/syscall-hide.h
• [DBH] sys/sys/syscall.h
• [DBH] sys/sys/syscall.mk
• [DBH] sys/sys/sysproto.h
• [DBH] sys/sys/sysunion.h
• [DBH] test/stress/stress2/Makefile
• [DBH] test/stress/stress2/Makefile.gnu
• [DBH] test/stress/stress2/README
• [DBH] test/stress/stress2/all.cfg
• [DBH] test/stress/stress2/beaver1.sentex.ca
• [DBH] test/stress/stress2/creat.cfg
• [DBH] test/stress/stress2/default.cfg
• [DBH] test/stress/stress2/df.cfg
• [DBH] test/stress/stress2/disk.cfg
• [DBH] test/stress/stress2/doc/README
• [DBH] test/stress/stress2/doc/linuxforum06.pdf
• [DBH] test/stress/stress2/doc/stress.pdf
• [DBH] test/stress/stress2/hydra1.netperf.freebsd.org
• [DBH] test/stress/stress2/hydra2.netperf.freebsd.org
• [DBH] test/stress/stress2/include/stress.h
• [DBH] test/stress/stress2/io.cfg
• [DBH] test/stress/stress2/jeff.cfg
• [DBH] test/stress/stress2/lib/Makefile
• [DBH] test/stress/stress2/lib/main.c
• [DBH] test/stress/stress2/lib/options.c
• [DBH] test/stress/stress2/lib/random_int.c
• [DBH] test/stress/stress2/lib/resources.c
• [DBH] test/stress/stress2/link.cfg
• [DBH] test/stress/stress2/load.cfg
• [DBH] test/stress/stress2/lockf.cfg
• [DBH] test/stress/stress2/marcus.cfg
• [DBH] test/stress/stress2/misc/README
• [DBH] test/stress/stress2/misc/all.sh
• [DBH] test/stress/stress2/misc/altbufferflushes.sh
• [DBH] test/stress/stress2/misc/alternativeFlushPath.sh
• [DBH] test/stress/stress2/misc/backingstore.sh
• [DBH] test/stress/stress2/misc/backingstore2.sh
• [DBH] test/stress/stress2/misc/backingstore3.sh
• [DBH] test/stress/stress2/misc/cdevsw.sh
• [DBH] test/stress/stress2/misc/cleanup.sh
• [DBH] test/stress/stress2/misc/core.sh
• [DBH] test/stress/stress2/misc/crossmp.sh
• [DBH] test/stress/stress2/misc/crossmp2.sh
• [DBH] test/stress/stress2/misc/datamove.sh
• [DBH] test/stress/stress2/misc/datamove2.sh
• [DBH] test/stress/stress2/misc/datamove3.sh
• [DBH] test/stress/stress2/misc/devfs.sh
• [DBH] test/stress/stress2/misc/devfs2.sh
• [DBH] test/stress/stress2/misc/extattr.sh
• [DBH] test/stress/stress2/misc/extattrctl.sh
• [DBH] test/stress/stress2/misc/fdescfs.sh
• [DBH] test/stress/stress2/misc/fpclone.sh
• [DBH] test/stress/stress2/misc/fpclone2.sh
• [DBH] test/stress/stress2/misc/fpu.sh
• [DBH] test/stress/stress2/misc/fragments.sh
• [DBH] test/stress/stress2/misc/fs.sh
• [DBH] test/stress/stress2/misc/fullpath.sh
• [DBH] test/stress/stress2/misc/fuzz.sh
• [DBH] test/stress/stress2/misc/inversion.sh
• [DBH] test/stress/stress2/misc/isofs.sh
• [DBH] test/stress/stress2/misc/jail.sh
• [DBH] test/stress/stress2/misc/jail2.sh
• [DBH] test/stress/stress2/misc/jail3.sh
• [DBH] test/stress/stress2/misc/jail4.sh
• [DBH] test/stress/stress2/misc/kevent.sh
• [DBH] test/stress/stress2/misc/kevent2.sh
• [DBH] test/stress/stress2/misc/kevent3.sh
• [DBH] test/stress/stress2/misc/kevent4.sh
• [DBH] test/stress/stress2/misc/kevent5.sh
• [DBH] test/stress/stress2/misc/kinfo.sh
• [DBH] test/stress/stress2/misc/kinfo2.sh
• [DBH] test/stress/stress2/misc/kinfo3.sh
• [DBH] test/stress/stress2/misc/ldt.sh
• [DBH] test/stress/stress2/misc/ldt2.sh
• [DBH] test/stress/stress2/misc/libMicro.sh
• [DBH] test/stress/stress2/misc/lockf.sh
• [DBH] test/stress/stress2/misc/lookup_shared.sh
• [DBH] test/stress/stress2/misc/mac.sh
• [DBH] test/stress/stress2/misc/mac_chkexec.sh
• [DBH] test/stress/stress2/misc/md.sh
• [DBH] test/stress/stress2/misc/md2.sh
• [DBH] test/stress/stress2/misc/md3.sh
• [DBH] test/stress/stress2/misc/mlockall.sh
• [DBH] test/stress/stress2/misc/mmap.sh
• [DBH] test/stress/stress2/misc/mmap2.sh
• [DBH] test/stress/stress2/misc/mmap3.sh
• [DBH] test/stress/stress2/misc/mmap4.sh
• [DBH] test/stress/stress2/misc/mount.sh
• [DBH] test/stress/stress2/misc/mount2.sh
• [DBH] test/stress/stress2/misc/mountro.sh
• [DBH] test/stress/stress2/misc/mountro2.sh
• [DBH] test/stress/stress2/misc/mountro3.sh
• [DBH] test/stress/stress2/misc/msdos.sh
• [DBH] test/stress/stress2/misc/msdos2.sh
• [DBH] test/stress/stress2/misc/msdos3.sh
• [DBH] test/stress/stress2/misc/msdos4.sh
• [DBH] test/stress/stress2/misc/namecache.sh
• [DBH] test/stress/stress2/misc/nbufkv.sh
• [DBH] test/stress/stress2/misc/newfs.sh
• [DBH] test/stress/stress2/misc/newfs2.sh
• [DBH] test/stress/stress2/misc/newfs3.sh
• [DBH] test/stress/stress2/misc/newfs4.sh
• [DBH] test/stress/stress2/misc/nfs.sh
• [DBH] test/stress/stress2/misc/nfs2.sh
• [DBH] test/stress/stress2/misc/nfs3.sh
• [DBH] test/stress/stress2/misc/nfs4.sh
• [DBH] test/stress/stress2/misc/nfs5.sh
• [DBH] test/stress/stress2/misc/nfs6.sh
• [DBH] test/stress/stress2/misc/nfs7.sh
• [DBH] test/stress/stress2/misc/nfs8.sh
• [DBH] test/stress/stress2/misc/nfs9.sh
• [DBH] test/stress/stress2/misc/nfsrename.sh
• [DBH] test/stress/stress2/misc/nullfs.sh
• [DBH] test/stress/stress2/misc/nullfs2.sh
• [DBH] test/stress/stress2/misc/nullfs3.sh
• [DBH] test/stress/stress2/misc/nullfs4.sh
• [DBH] test/stress/stress2/misc/nullfs5.sh
• [DBH] test/stress/stress2/misc/nullfs6.sh
• [DBH] test/stress/stress2/misc/pmc.sh
• [DBH] test/stress/stress2/misc/procfs.sh
• [DBH] test/stress/stress2/misc/pthread.sh
• [DBH] test/stress/stress2/misc/quota1.sh
• [DBH] test/stress/stress2/misc/quota10.sh
• [DBH] test/stress/stress2/misc/quota2.sh
• [DBH] test/stress/stress2/misc/quota3.sh
• [DBH] test/stress/stress2/misc/quota4.sh
• [DBH] test/stress/stress2/misc/quota5.sh
• [DBH] test/stress/stress2/misc/quota6.sh
• [DBH] test/stress/stress2/misc/quota7.sh
• [DBH] test/stress/stress2/misc/quota8.sh
• [DBH] test/stress/stress2/misc/quota9.sh
• [DBH] test/stress/stress2/misc/recursiveflushes.sh
• [DBH] test/stress/stress2/misc/rename.sh
• [DBH] test/stress/stress2/misc/rename2.sh
• [DBH] test/stress/stress2/misc/rename3.sh
• [DBH] test/stress/stress2/misc/rename4.sh
• [DBH] test/stress/stress2/misc/revoke.sh
• [DBH] test/stress/stress2/misc/sem.sh
• [DBH] test/stress/stress2/misc/sendfile.sh
• [DBH] test/stress/stress2/misc/snap.sh
• [DBH] test/stress/stress2/misc/snap2-1.sh
• [DBH] test/stress/stress2/misc/snap2.sh
• [DBH] test/stress/stress2/misc/snap3.sh
• [DBH] test/stress/stress2/misc/snap4.sh
• [DBH] test/stress/stress2/misc/snap5-1.sh
• [DBH] test/stress/stress2/misc/snap5.sh
• [DBH] test/stress/stress2/misc/snap6.sh
• [DBH] test/stress/stress2/misc/snap7.sh
• [DBH] test/stress/stress2/misc/snap8.sh
• [DBH] test/stress/stress2/misc/snapbackup.sh
• [DBH] test/stress/stress2/misc/softupdate.sh
• [DBH] test/stress/stress2/misc/statfs.sh
• [DBH] test/stress/stress2/misc/suj.sh
• [DBH] test/stress/stress2/misc/symlink.sh
• [DBH] test/stress/stress2/misc/symlink2.sh
• [DBH] test/stress/stress2/misc/syscall.sh
• [DBH] test/stress/stress2/misc/syscall2.sh
• [DBH] test/stress/stress2/misc/tmpfs.sh
• [DBH] test/stress/stress2/misc/tmpfs2.sh
• [DBH] test/stress/stress2/misc/tmpfs3.sh
• [DBH] test/stress/stress2/misc/tmpfs4.sh
• [DBH] test/stress/stress2/misc/truncate.sh
• [DBH] test/stress/stress2/misc/truncate2.sh
• [DBH] test/stress/stress2/misc/ucom.sh
• [DBH] test/stress/stress2/misc/umount.sh
• [DBH] test/stress/stress2/misc/umountf.sh
• [DBH] test/stress/stress2/misc/umountf2.sh
• [DBH] test/stress/stress2/misc/umountf3.sh
• [DBH] test/stress/stress2/misc/umountf4.sh
• [DBH] test/stress/stress2/misc/union.sh
• [DBH] test/stress/stress2/misc/unionfs.sh
• [DBH] test/stress/stress2/misc/unionfs2.sh
• [DBH] test/stress/stress2/misc/unionfs3.sh
• [DBH] test/stress/stress2/misc/zfs.sh
• [DBH] test/stress/stress2/misc/zfs2.sh
• [DBH] test/stress/stress2/misc/zfs3.sh
• [DBH] test/stress/stress2/misc/zfs4.sh
• [DBH] test/stress/stress2/misc/zfs5.sh
• [DBH] test/stress/stress2/mkdir.cfg
• [DBH] test/stress/stress2/mkfifo.cfg
• [DBH] test/stress/stress2/norw.cfg
• [DBH] test/stress/stress2/noswap.cfg
• [DBH] test/stress/stress2/orangutan.netperf.freebsd.org
• [DBH] test/stress/stress2/pty.cfg
• [DBH] test/stress/stress2/run.sh
• [DBH] test/stress/stress2/rw.cfg
• [DBH] test/stress/stress2/syscall.cfg
• [DBH] test/stress/stress2/sysctl.cfg
• [DBH] test/stress/stress2/testcases/Makefile
• [DBH] test/stress/stress2/testcases/Makefile.inc
• [DBH] test/stress/stress2/testcases/README
• [DBH] test/stress/stress2/testcases/badcode/Makefile
• [DBH] test/stress/stress2/testcases/badcode/badcode.c
• [DBH] test/stress/stress2/testcases/creat/Makefile
• [DBH] test/stress/stress2/testcases/creat/creat.c
• [DBH] test/stress/stress2/testcases/fts/Makefile
• [DBH] test/stress/stress2/testcases/fts/fts.c
• [DBH] test/stress/stress2/testcases/link/Makefile
• [DBH] test/stress/stress2/testcases/link/link.c
• [DBH] test/stress/stress2/testcases/lockf/Makefile
• [DBH] test/stress/stress2/testcases/lockf/lockf.c
• [DBH] test/stress/stress2/testcases/lockf2/Makefile
• [DBH] test/stress/stress2/testcases/lockf2/lockf2.c
• [DBH] test/stress/stress2/testcases/mkdir/Makefile
• [DBH] test/stress/stress2/testcases/mkdir/mkdir.c
• [DBH] test/stress/stress2/testcases/mkfifo/Makefile
• [DBH] test/stress/stress2/testcases/mkfifo/mkfifo.c
• [DBH] test/stress/stress2/testcases/mmap/Makefile
• [DBH] test/stress/stress2/testcases/mmap/mmap.c
• [DBH] test/stress/stress2/testcases/openat/Makefile
• [DBH] test/stress/stress2/testcases/openat/doat.c
• [DBH] test/stress/stress2/testcases/openat/openat.c
• [DBH] test/stress/stress2/testcases/pty/Makefile
• [DBH] test/stress/stress2/testcases/pty/pty.c
• [DBH] test/stress/stress2/testcases/rename/Makefile
• [DBH] test/stress/stress2/testcases/rename/rename.c
• [DBH] test/stress/stress2/testcases/run/Makefile
• [DBH] test/stress/stress2/testcases/run/run.c
• [DBH] test/stress/stress2/testcases/rw/Makefile
• [DBH] test/stress/stress2/testcases/rw/rw.c
• [DBH] test/stress/stress2/testcases/shm/Makefile
• [DBH] test/stress/stress2/testcases/shm/shm.c
• [DBH] test/stress/stress2/testcases/socket/Makefile
• [DBH] test/stress/stress2/testcases/socket/socket.c
• [DBH] test/stress/stress2/testcases/swap/Makefile
• [DBH] test/stress/stress2/testcases/swap/swap.c
• [DBH] test/stress/stress2/testcases/symlink/Makefile
• [DBH] test/stress/stress2/testcases/symlink/symlink.c
• [DBH] test/stress/stress2/testcases/syscall/Makefile
• [DBH] test/stress/stress2/testcases/syscall/syscall.c
• [DBH] test/stress/stress2/testcases/sysctl/Makefile
• [DBH] test/stress/stress2/testcases/sysctl/sysctl.c
• [DBH] test/stress/stress2/testcases/tcp/Makefile
• [DBH] test/stress/stress2/testcases/tcp/tcp.c
• [DBH] test/stress/stress2/testcases/thr1/Makefile
• [DBH] test/stress/stress2/testcases/thr1/thr1.c
• [DBH] test/stress/stress2/testcases/thr2/Makefile
• [DBH] test/stress/stress2/testcases/thr2/thr2.c
• [DBH] test/stress/stress2/testcases/udp/Makefile
• [DBH] test/stress/stress2/testcases/udp/udp.c
• [DBH] test/stress/stress2/tools/df.sh
• [DBH] test/stress/stress2/tools/freeze.sh
• [DBH] test/stress/stress2/tools/freeze2.sh
• [DBH] test/stress/stress2/tools/fstool.c
• [DBH] test/stress/stress2/tools/iwatch.sh
• [DBH] test/stress/stress2/tools/l3.sh
• [DBH] test/stress/stress2/tools/leaks.sh
• [DBH] test/stress/stress2/tools/leaks2.sh
• [DBH] test/stress/stress2/tools/module/Makefile
• [DBH] test/stress/stress2/tools/module/ptest.c
• [DBH] test/stress/stress2/tools/monitor.sh
• [DBH] test/stress/stress2/tools/ptsleak.sh
• [DBH] test/stress/stress2/tools/ptyleak.sh
• [DBH] test/stress/stress2/tools/rwatch.sh
• [DBH] test/stress/stress2/udp.cfg
• [DBH] test/stress/stress2/vfs.cfg
• [DBH] usr.bin/gprof/arcs.c
• [DBH] usr.bin/gprof/gprof.callg
• [DBH] usr.bin/gprof/gprof.flat
• [DBH] usr.bin/gprof/printgprof.c

PF: more man page updates (pfsync(4))

• [DBH] share/man/man4/pfsync.4

iwn - Fix warning related to token work.

• [DBH] sys/dev/netif/iwn/if_iwn.c

iwn - Cleanup sysctl tree on detach.

• [DBH] sys/dev/netif/iwn/if_iwn.c

iwn - Clean up memory freeing.

* Mark variables with NULL after freeing.
* Properly free dma memory.

• [DBH] sys/dev/netif/iwn/if_iwn.c

iwn - Convert to use the new wlan layer's global token.

• [DBH] sys/dev/netif/iwn/if_iwn.c
• [DBH] sys/dev/netif/iwn/if_iwnvar.h

wlan - Convert lockmgr locking to a global token.

Use the lwkt_token API to synchronize the wlan layer entry points.

Discussed-With: dillon

• [DBH] sys/netproto/802_11/ieee80211.h
• [DBH] sys/netproto/802_11/ieee80211_dragonfly.h
• [DBH] sys/netproto/802_11/wlan/ieee80211.c
• [DBH] sys/netproto/802_11/wlan/ieee80211_ioctl.c
• [DBH] sys/netproto/802_11/wlan/ieee80211_power.c
• [DBH] sys/netproto/802_11/wlan/ieee80211_proto.c
• [DBH] sys/netproto/802_11/wlan/ieee80211_scan.c

iwn - Bring in recent changes from FreeBSD.

Taken-From: FreeBSD

• [DBH] sys/dev/netif/iwn/if_iwn.c

iwn - Lock callout iwn_timer_timeout().

• [DBH] sys/dev/netif/iwn/if_iwn.c

iwn - Update firmware for 6000 chipset.

• [DBH] sys/dev/netif/iwn/fw/iwn6000/Makefile

iwnfw - Update 6000 firmware and add 6050 firmware

• [DBH] sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu
• [DBH] sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu
• [DBH] sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu