PERFORCE change 140443 for review
Sam Leffler
sam at FreeBSD.org
Wed Apr 23 03:53:52 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140443
Change 140443 by sam at sam_ebb on 2008/04/23 03:53:00
IFC @ 140442
Affected files ...
.. //depot/projects/vap/ObsoleteFiles.inc#9 integrate
.. //depot/projects/vap/UPDATING#8 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/libintl.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/zone.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.c#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/misc/mkdirp.c#2 integrate
.. //depot/projects/vap/contrib/gcc/gthr-posix.h#3 integrate
.. //depot/projects/vap/contrib/hostapd/driver_wired.c#3 delete
.. //depot/projects/vap/contrib/netcat/FREEBSD-upgrade#3 integrate
.. //depot/projects/vap/contrib/netcat/FREEBSD-vendor#1 branch
.. //depot/projects/vap/contrib/netcat/atomicio.c#3 integrate
.. //depot/projects/vap/contrib/netcat/atomicio.h#3 integrate
.. //depot/projects/vap/contrib/netcat/nc.1#4 integrate
.. //depot/projects/vap/etc/Makefile#5 integrate
.. //depot/projects/vap/etc/defaults/rc.conf#10 integrate
.. //depot/projects/vap/etc/network.subr#8 integrate
.. //depot/projects/vap/etc/rc.d/hostapd#4 integrate
.. //depot/projects/vap/etc/rc.d/initrandom#3 integrate
.. //depot/projects/vap/etc/rc.d/netif#7 integrate
.. //depot/projects/vap/etc/rc.d/wpa_supplicant#9 integrate
.. //depot/projects/vap/lib/libc/stdio/fopen.c#5 integrate
.. //depot/projects/vap/lib/libc/sys/cpuset.2#2 integrate
.. //depot/projects/vap/lib/libc/sys/cpuset_getaffinity.2#2 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_rtld.c#5 integrate
.. //depot/projects/vap/lib/libutil/Makefile#3 integrate
.. //depot/projects/vap/lib/libutil/gr_util.c#1 branch
.. //depot/projects/vap/lib/libutil/libutil.h#3 integrate
.. //depot/projects/vap/release/amd64/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate
.. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate
.. //depot/projects/vap/release/doc/share/misc/dev.archlist.txt#7 integrate
.. //depot/projects/vap/release/doc/share/sgml/release.dsl#3 integrate
.. //depot/projects/vap/release/doc/share/sgml/release.ent#3 integrate
.. //depot/projects/vap/release/i386/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/ia64/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/pc98/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/picobsd/bridge/crunch.conf#3 integrate
.. //depot/projects/vap/release/powerpc/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/sparc64/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/sun4v/boot_crunch.conf#4 integrate
.. //depot/projects/vap/sbin/ifconfig/Makefile#8 integrate
.. //depot/projects/vap/sbin/ifconfig/ifconfig.8#12 integrate
.. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#19 integrate
.. //depot/projects/vap/sbin/ifconfig/ifmedia.c#6 integrate
.. //depot/projects/vap/share/man/man4/Makefile#12 integrate
.. //depot/projects/vap/share/man/man4/altq.4#3 integrate
.. //depot/projects/vap/share/man/man4/ath.4#5 integrate
.. //depot/projects/vap/share/man/man4/cnw.4#3 integrate
.. //depot/projects/vap/share/man/man4/ipw.4#5 integrate
.. //depot/projects/vap/share/man/man4/iwi.4#5 integrate
.. //depot/projects/vap/share/man/man4/malo.4#3 integrate
.. //depot/projects/vap/share/man/man4/ral.4#4 integrate
.. //depot/projects/vap/share/man/man4/rum.4#4 integrate
.. //depot/projects/vap/share/man/man4/textdump.4#2 integrate
.. //depot/projects/vap/share/man/man4/ural.4#5 integrate
.. //depot/projects/vap/share/man/man4/wi.4#5 integrate
.. //depot/projects/vap/share/man/man4/wlan.4#4 integrate
.. //depot/projects/vap/share/man/man4/wlan_acl.4#4 integrate
.. //depot/projects/vap/share/man/man4/wlan_amrr.4#4 integrate
.. //depot/projects/vap/share/man/man4/wlan_xauth.4#4 integrate
.. //depot/projects/vap/share/man/man4/wpi.4#4 integrate
.. //depot/projects/vap/share/man/man4/zyd.4#4 integrate
.. //depot/projects/vap/share/man/man5/Makefile#4 integrate
.. //depot/projects/vap/share/misc/committers-doc.dot#4 integrate
.. //depot/projects/vap/sys/amd64/amd64/machdep.c#10 integrate
.. //depot/projects/vap/sys/amd64/conf/GENERIC#13 integrate
.. //depot/projects/vap/sys/amd64/include/clock.h#7 integrate
.. //depot/projects/vap/sys/amd64/isa/clock.c#9 integrate
.. //depot/projects/vap/sys/arm/arm/intr.c#8 integrate
.. //depot/projects/vap/sys/arm/at91/at91.c#4 integrate
.. //depot/projects/vap/sys/arm/conf/AVILA#10 integrate
.. //depot/projects/vap/sys/arm/conf/BWCT#5 integrate
.. //depot/projects/vap/sys/arm/conf/CRB#5 integrate
.. //depot/projects/vap/sys/arm/conf/EP80219#5 integrate
.. //depot/projects/vap/sys/arm/conf/HL200#7 integrate
.. //depot/projects/vap/sys/arm/conf/IQ31244#7 integrate
.. //depot/projects/vap/sys/arm/conf/KB920X#7 integrate
.. //depot/projects/vap/sys/arm/conf/SIMICS#7 integrate
.. //depot/projects/vap/sys/arm/conf/SKYEYE#5 integrate
.. //depot/projects/vap/sys/arm/include/intr.h#6 integrate
.. //depot/projects/vap/sys/arm/sa11x0/sa11x0_ost.c#5 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/acl.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/bitmap.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/callb.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cpupart.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/dkio.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/objfs.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 integrate
.. //depot/projects/vap/sys/compat/svr4/svr4_misc.c#7 integrate
.. //depot/projects/vap/sys/conf/NOTES#15 integrate
.. //depot/projects/vap/sys/conf/files#33 integrate
.. //depot/projects/vap/sys/conf/files.amd64#10 integrate
.. //depot/projects/vap/sys/conf/files.i386#10 integrate
.. //depot/projects/vap/sys/conf/files.pc98#9 integrate
.. //depot/projects/vap/sys/conf/options#20 integrate
.. //depot/projects/vap/sys/dev/ata/ata-all.c#9 integrate
.. //depot/projects/vap/sys/dev/ata/ata-chipset.c#11 integrate
.. //depot/projects/vap/sys/dev/ata/ata-pci.c#8 integrate
.. //depot/projects/vap/sys/dev/ata/ata-pci.h#8 integrate
.. //depot/projects/vap/sys/dev/ata/ata-queue.c#8 integrate
.. //depot/projects/vap/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/vap/sys/dev/ath/ah_osdep.h#4 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#9 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.h#5 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#12 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.h#8 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#11 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#7 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath.c#63 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath_pci.c#7 integrate
.. //depot/projects/vap/sys/dev/ath/if_athioctl.h#7 integrate
.. //depot/projects/vap/sys/dev/ath/if_athrate.h#9 integrate
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#21 integrate
.. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#15 integrate
.. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#11 integrate
.. //depot/projects/vap/sys/dev/ipw/if_ipw.c#14 integrate
.. //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#10 integrate
.. //depot/projects/vap/sys/dev/iwi/if_iwi.c#27 integrate
.. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#15 integrate
.. //depot/projects/vap/sys/dev/k8temp/k8temp.c#3 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo.c#7 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo.h#4 integrate
.. //depot/projects/vap/sys/dev/ral/if_ral_pci.c#8 integrate
.. //depot/projects/vap/sys/dev/ral/rt2560.c#29 integrate
.. //depot/projects/vap/sys/dev/ral/rt2560reg.h#6 integrate
.. //depot/projects/vap/sys/dev/ral/rt2560var.h#17 integrate
.. //depot/projects/vap/sys/dev/ral/rt2661.c#27 integrate
.. //depot/projects/vap/sys/dev/ral/rt2661var.h#13 integrate
.. //depot/projects/vap/sys/dev/usb/if_rum.c#17 integrate
.. //depot/projects/vap/sys/dev/usb/if_rumvar.h#10 integrate
.. //depot/projects/vap/sys/dev/usb/if_ural.c#19 integrate
.. //depot/projects/vap/sys/dev/usb/if_uralvar.h#12 integrate
.. //depot/projects/vap/sys/dev/usb/if_zyd.c#17 integrate
.. //depot/projects/vap/sys/dev/usb/if_zydreg.h#9 integrate
.. //depot/projects/vap/sys/dev/usb/uipaq.c#4 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#14 integrate
.. //depot/projects/vap/sys/dev/wi/if_wavelan_ieee.h#6 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi.c#27 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi_pccard.c#7 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi_pci.c#8 integrate
.. //depot/projects/vap/sys/dev/wi/if_wivar.h#17 integrate
.. //depot/projects/vap/sys/dev/wpi/if_wpi.c#20 integrate
.. //depot/projects/vap/sys/dev/wpi/if_wpivar.h#8 integrate
.. //depot/projects/vap/sys/i386/bios/apm.c#7 integrate
.. //depot/projects/vap/sys/i386/conf/GENERIC#13 integrate
.. //depot/projects/vap/sys/i386/conf/PAE#7 integrate
.. //depot/projects/vap/sys/i386/i386/machdep.c#8 integrate
.. //depot/projects/vap/sys/i386/include/clock.h#8 integrate
.. //depot/projects/vap/sys/i386/isa/clock.c#9 integrate
.. //depot/projects/vap/sys/i386/isa/pmtimer.c#5 integrate
.. //depot/projects/vap/sys/ia64/conf/DEFAULTS#6 integrate
.. //depot/projects/vap/sys/ia64/ia64/clock.c#7 integrate
.. //depot/projects/vap/sys/ia64/ia64/machdep.c#13 integrate
.. //depot/projects/vap/sys/kern/kern_linker.c#9 integrate
.. //depot/projects/vap/sys/kern/subr_clock.c#6 integrate
.. //depot/projects/vap/sys/kern/subr_rtc.c#3 integrate
.. //depot/projects/vap/sys/kern/vfs_mount.c#13 integrate
.. //depot/projects/vap/sys/mips/conf/ADM5120#2 integrate
.. //depot/projects/vap/sys/mips/conf/IDT#3 integrate
.. //depot/projects/vap/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/vap/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/vap/sys/mips/conf/SENTRY5#3 integrate
.. //depot/projects/vap/sys/modules/Makefile#21 integrate
.. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/malo/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/ral/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/wlan/Makefile#9 integrate
.. //depot/projects/vap/sys/modules/wlan_acl/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_amrr/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_ccmp/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_tkip/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_wep/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_xauth/Makefile#4 integrate
.. //depot/projects/vap/sys/net80211/_ieee80211.h#10 integrate
.. //depot/projects/vap/sys/net80211/ieee80211.c#39 integrate
.. //depot/projects/vap/sys/net80211/ieee80211.h#9 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_acl.c#10 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_amrr.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_amrr.h#6 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#14 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto.h#13 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_ccmp.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_none.c#12 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_wep.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#28 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#26 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#21 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ht.h#12 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_input.c#30 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#56 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#20 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_node.c#30 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_node.h#20 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_output.c#49 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_power.c#12 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_power.h#7 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_proto.c#30 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_proto.h#20 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#13 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.h#7 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_scan.c#21 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_scan.h#13 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#24 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_var.h#40 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_xauth.c#10 integrate
.. //depot/projects/vap/sys/netinet/ip_divert.c#6 integrate
.. //depot/projects/vap/sys/netinet/raw_ip.c#7 integrate
.. //depot/projects/vap/sys/netinet/tcp_var.h#8 integrate
.. //depot/projects/vap/sys/netinet6/icmp6.c#8 integrate
.. //depot/projects/vap/sys/netinet6/raw_ip6.c#9 integrate
.. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#8 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#11 integrate
.. //depot/projects/vap/sys/pc98/cbus/clock.c#6 integrate
.. //depot/projects/vap/sys/pc98/conf/GENERIC#11 integrate
.. //depot/projects/vap/sys/pc98/pc98/machdep.c#7 integrate
.. //depot/projects/vap/sys/powerpc/aim/clock.c#3 integrate
.. //depot/projects/vap/sys/powerpc/aim/machdep.c#6 integrate
.. //depot/projects/vap/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/vap/sys/powerpc/booke/clock.c#4 integrate
.. //depot/projects/vap/sys/powerpc/conf/DEFAULTS#4 integrate
.. //depot/projects/vap/sys/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/vap/sys/sparc64/conf/GENERIC#12 integrate
.. //depot/projects/vap/sys/sparc64/conf/NOTES#6 integrate
.. //depot/projects/vap/sys/sun4v/conf/DEFAULTS#3 integrate
.. //depot/projects/vap/sys/sun4v/conf/NOTES#3 integrate
.. //depot/projects/vap/sys/sys/clock.h#5 integrate
.. //depot/projects/vap/sys/sys/param.h#19 integrate
.. //depot/projects/vap/sys/sys/time.h#8 integrate
.. //depot/projects/vap/sys/ufs/ufs/inode.h#7 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_lookup.c#8 integrate
.. //depot/projects/vap/tools/regression/environ/envctl.c#4 integrate
.. //depot/projects/vap/tools/regression/environ/envtest.t#3 integrate
.. //depot/projects/vap/tools/regression/lib/libutil/Makefile#3 integrate
.. //depot/projects/vap/tools/regression/lib/libutil/test-grp.c#1 branch
.. //depot/projects/vap/tools/regression/lib/libutil/test-grp.t#1 branch
.. //depot/projects/vap/tools/tools/nanobsd/Files/root/save_cfg#1 branch
.. //depot/projects/vap/tools/tools/net80211/Makefile#4 integrate
.. //depot/projects/vap/tools/tools/net80211/wlanstats/main.c#6 integrate
.. //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#9 integrate
.. //depot/projects/vap/usr.bin/calendar/calendars/calendar.freebsd#7 integrate
.. //depot/projects/vap/usr.bin/procstat/procstat.1#3 integrate
.. //depot/projects/vap/usr.sbin/ancontrol/ancontrol.c#3 integrate
.. //depot/projects/vap/usr.sbin/wlandebug/wlandebug.c#5 integrate
.. //depot/projects/vap/usr.sbin/wpa/hostapd/Makefile#4 integrate
.. //depot/projects/vap/usr.sbin/wpa/hostapd/driver_freebsd.c#6 integrate
.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Packet32.c#4 integrate
.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#10 integrate
Differences ...
==== //depot/projects/vap/ObsoleteFiles.inc#9 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.137 2008/04/20 16:03:19 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -19,6 +19,22 @@
OLD_FILES+=usr/sbin/pkg_sign
OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
+# 20080325: tzdata2008b import
+OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
+OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
+# 20080314: stack_print(9) mlink fixed
+OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
+# 20080312: libkse removal
+OLD_FILES+=usr/include/sys/kse.h
+OLD_FILES+=usr/lib/libkse.so
+OLD_LIBS+=usr/lib/libkse.so.3
+OLD_FILES+=usr/share/man/man2/kse.2.gz
+OLD_FILES+=usr/share/man/man2/kse_create.2.gz
+OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
+OLD_FILES+=usr/share/man/man2/kse_release.2.gz
+OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
+OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
+OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
==== //depot/projects/vap/UPDATING#8 (text+ko) ====
@@ -22,6 +22,16 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080420:
+ The 802.11 wireless support was redone to enable multi-bss
+ operation on devices that are capable. The underlying device
+ is no longer used directly but instead wlanX devices are
+ cloned with ifconfig. This requires changes to rc.conf files.
+
+ As part of the multi-bss changes the wlan_scan_ap and wlan_scan_sta
+ modules were merged into the base wlan module. All references
+ to these modules (e.g. in kernel config files) must be removed.
+
20080408:
psm(4) has gained write(2) support in native operation level.
Arbitrary commands can be written to /dev/psm%d and status can
@@ -1014,4 +1024,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $
+$FreeBSD: src/UPDATING,v 1.525 2008/04/20 21:25:37 sam Exp $
==== //depot/projects/vap/cddl/compat/opensolaris/include/devid.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.4 2008/04/22 07:42:58 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/vap/cddl/compat/opensolaris/include/libintl.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _LIBINTL_H_
#define _LIBINTL_H_
==== //depot/projects/vap/cddl/compat/opensolaris/include/mnttab.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _OPENSOLARIS_MNTTAB_H_
#define _OPENSOLARIS_MNTTAB_H_
==== //depot/projects/vap/cddl/compat/opensolaris/include/priv.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _OPENSOLARIS_PRIV_H_
#define _OPENSOLARIS_PRIV_H_
==== //depot/projects/vap/cddl/compat/opensolaris/include/solaris.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _SOLARIS_H_
#define _SOLARIS_H_
==== //depot/projects/vap/cddl/compat/opensolaris/include/zone.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _ZONE_H_
#define _ZONE_H_
==== //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.c#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Ricardo Correia. All rights reserved.
==== //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/vap/cddl/compat/opensolaris/misc/mkdirp.c#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/* Copyright (c) 1988 AT&T */
==== //depot/projects/vap/contrib/gcc/gthr-posix.h#3 (text+ko) ====
@@ -152,9 +152,12 @@
it is passed so we cannot pretend that the interface is active if -pthreads
is not specified. On Solaris 2.5.1, the interface is not exposed at all so
we need to play the usual game with weak symbols. On Solaris 10 and up, a
- working interface is always exposed. */
+ working interface is always exposed. On FreeBSD 6 and later, libc also
+ exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up
+ to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc,
+ which means the alternate __gthread_active_p below cannot be used there. */
-#if defined(__sun) && defined(__svr4__)
+#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__))
static volatile int __gthread_active = -1;
@@ -197,7 +200,7 @@
return __gthread_active_latest_value != 0;
}
-#else /* not Solaris */
+#else /* neither FreeBSD nor Solaris */
static inline int
__gthread_active_p (void)
@@ -207,7 +210,7 @@
return __gthread_active_ptr != 0;
}
-#endif /* Solaris */
+#endif /* FreeBSD or Solaris */
#else /* not SUPPORTS_WEAK */
==== //depot/projects/vap/contrib/netcat/FREEBSD-upgrade#3 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.1 2005/02/06 15:26:44 delphij Exp $
+$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.2 2008/04/21 18:37:08 delphij Exp $
1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc").
2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist
@@ -9,9 +9,11 @@
6. If there is conflicits, try to resolve them.
7. do build in f-nc/../../usr.bin/nc
8. If everything seems ok, do the actual import in v-nc:
- cvs -n import src/contrib/netcat OPENBSD OPENBSD_<date>
+ cvs -n import src/contrib/netcat OPENBSD OPENBSD_<release>
Everything appears be Ok? Do:
- cvs import src/contrib/netcat OPENBSD OPENBSD_<date>
+ cvs import src/contrib/netcat OPENBSD OPENBSD_<release>
+ (note: recently we import from OpenBSD's release branches
+ rather than importing -HEAD snapshots)
9. Resolve the conflicits with the patchset obtained in step 6.
-delphij at FreeBSD.org - 06 Feb 2005
+delphij at FreeBSD.org - 21 Apr 2008
==== //depot/projects/vap/contrib/netcat/atomicio.c#3 (text+ko) ====
@@ -1,7 +1,7 @@
-/* $OpenBSD: atomicio.c,v 1.8 2006/02/11 19:31:18 otto Exp $ */
-
+/* $OpenBSD: atomicio.c,v 1.9 2007/09/07 14:50:44 tobias Exp $ */
/*
- * Copyright (c) 2005 Anil Madhavapeddy. All rights served.
+ * Copyright (c) 2006 Damien Miller. All rights reserved.
+ * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
* Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
* All rights reserved.
*
@@ -26,32 +26,37 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
-#include <sys/uio.h>
+#include <sys/param.h>
+
#include <errno.h>
+#include <poll.h>
#include <unistd.h>
+
#include "atomicio.h"
/*
* ensure all of data on socket comes through. f==read || f==vwrite
*/
size_t
-atomicio(f, fd, _s, n)
- ssize_t (*f) (int, void *, size_t);
- int fd;
- void *_s;
- size_t n;
+atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
{
char *s = _s;
size_t pos = 0;
ssize_t res;
+ struct pollfd pfd;
+ pfd.fd = fd;
+ pfd.events = f == read ? POLLIN : POLLOUT;
while (n > pos) {
res = (f) (fd, s + pos, n - pos);
switch (res) {
case -1:
- if (errno == EINTR || errno == EAGAIN)
+ if (errno == EINTR)
+ continue;
+ if (errno == EAGAIN) {
+ (void)poll(&pfd, 1, -1);
continue;
+ }
return 0;
case 0:
errno = EPIPE;
@@ -60,5 +65,5 @@
pos += (size_t)res;
}
}
- return pos;
+ return (pos);
}
==== //depot/projects/vap/contrib/netcat/atomicio.h#3 (text) ====
@@ -1,6 +1,7 @@
-/* $OpenBSD: atomicio.h,v 1.1 2005/05/24 20:13:28 avsm Exp $ */
+/* $OpenBSD: atomicio.h,v 1.2 2007/09/07 14:50:44 tobias Exp $ */
/*
+ * Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
* All rights reserved.
*
@@ -25,9 +26,14 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _ATOMICIO_H
+#define _ATOMICIO_H
+
/*
* Ensure all of data on socket comes through. f==read || f==vwrite
*/
size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
#define vwrite (ssize_t (*)(int, void *, size_t))write
+
+#endif /* _ATOMICIO_H */
==== //depot/projects/vap/contrib/netcat/nc.1#4 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.44 2006/12/02 01:08:30 jmc Exp $
+.\" $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $
.\"
.\" Copyright (c) 1996 David Sacerdote
.\" All rights reserved.
@@ -25,9 +25,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.8 2008/04/01 13:54:24 bms Exp $
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.9 2008/04/21 18:31:50 delphij Exp $
.\"
-.Dd April 2, 2008
+.Dd $Mdocdate$
.Dt NC 1
.Os
.Sh NAME
==== //depot/projects/vap/etc/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $
+# $FreeBSD: src/etc/Makefile,v 1.367 2008/04/20 20:37:02 sam Exp $
.include <bsd.own.mk>
==== //depot/projects/vap/etc/defaults/rc.conf#10 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.332 2008/04/21 18:17:48 brooks Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -33,7 +33,7 @@
apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO).
apmd_enable="NO" # Run apmd to handle APM event from userland.
apmd_flags="" # Flags to apmd (if enabled).
-ddb_enable="NO" # Set to YES to load ddb scripts at boot.
+ddb_enable="YES" # Load ddb scripts at boot.
ddb_config="/etc/ddb.conf" # ddb(8) config file.
devd_enable="YES" # Run devd, to trigger programs on device tree changes.
devd_flags="" # Additional flags for devd(8).
==== //depot/projects/vap/etc/network.subr#8 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.182 2008/03/28 06:50:06 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.183 2008/04/20 20:37:20 sam Exp $
#
#
==== //depot/projects/vap/etc/rc.d/hostapd#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/hostapd,v 1.2 2007/11/14 21:19:15 brix Exp $
+# $FreeBSD: src/etc/rc.d/hostapd,v 1.3 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: hostapd
==== //depot/projects/vap/etc/rc.d/initrandom#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/initrandom,v 1.7 2007/05/24 05:58:20 rse Exp $
+# $FreeBSD: src/etc/rc.d/initrandom,v 1.8 2008/04/22 15:18:47 ru Exp $
#
# PROVIDE: initrandom
@@ -28,24 +28,26 @@
if [ \! -z "${soft_random_generator}" ] ; then
- if checkyesno harvest_interrupt; then
- if [ -w /dev/random ]; then
+ if [ -w /dev/random ]; then
+ if checkyesno harvest_interrupt; then
${SYSCTL_W} kern.random.sys.harvest.interrupt=1 >/dev/null
echo -n ' interrupts'
+ else
+ ${SYSCTL_W} kern.random.sys.harvest.interrupt=0 >/dev/null
fi
- fi
- if checkyesno harvest_ethernet; then
- if [ -w /dev/random ]; then
+ if checkyesno harvest_ethernet; then
${SYSCTL_W} kern.random.sys.harvest.ethernet=1 >/dev/null
echo -n ' ethernet'
+ else
+ ${SYSCTL_W} kern.random.sys.harvest.ethernet=0 >/dev/null
fi
- fi
- if checkyesno harvest_p_to_p; then
- if [ -w /dev/random ]; then
- ${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
+ if checkyesno harvest_p_to_p; then
+ ${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
echo -n ' point_to_point'
+ else
+ ${SYSCTL_W} kern.random.sys.harvest.point_to_point=0 >/dev/null
fi
fi
==== //depot/projects/vap/etc/rc.d/netif#7 (text+ko) ====
@@ -22,7 +22,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/netif,v 1.25 2008/01/26 11:22:12 mtm Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.26 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: netif
==== //depot/projects/vap/etc/rc.d/wpa_supplicant#9 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $
+# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.6 2008/04/20 20:37:21 sam Exp $
#
# PROVIDE: wpa_supplicant
==== //depot/projects/vap/lib/libc/stdio/fopen.c#5 (text+ko) ====
@@ -34,7 +34,7 @@
static char sccsid[] = "@(#)fopen.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.13 2008/02/27 21:25:19 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.14 2008/04/22 17:03:32 jhb Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -73,6 +73,7 @@
* open.
*/
if (f > SHRT_MAX) {
+ fp->_flags = 0; /* release */
_close(f);
errno = EMFILE;
return (NULL);
==== //depot/projects/vap/lib/libc/sys/cpuset.2#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/libc/sys/cpuset.2,v 1.1 2008/03/29 10:06:30 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -36,6 +36,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset "cpusetid_t *setid"
==== //depot/projects/vap/lib/libc/sys/cpuset_getaffinity.2#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/libc/sys/cpuset_getaffinity.2,v 1.1 2008/03/29 10:26:29 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -35,6 +35,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset_getaffinity "cpulevel_t level" "cpuwhich_t which" "id_t id" "size_t setsize" "cpuset_t *mask"
==== //depot/projects/vap/lib/libthr/thread/thr_rtld.c#5 (text) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.7 2008/04/02 07:41:24 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.8 2008/04/22 06:44:11 davidxu Exp $
*
*/
@@ -40,8 +40,6 @@
extern int errno;
#define CACHE_LINE_SIZE 64
-#define WAFLAG 0x1
-#define RC_INCR 0x2
static int _thr_rtld_clr_flag(int);
static void *_thr_rtld_lock_create(void);
@@ -52,11 +50,7 @@
static void _thr_rtld_wlock_acquire(void *);
struct rtld_lock {
- volatile int lock;
- volatile int rd_waiters;
- volatile int wr_waiters;
- volatile long rd_cv;
- volatile long wr_cv;
+ struct urwlock lock;
void *base;
};
@@ -67,19 +61,22 @@
char *p;
uintptr_t r;
struct rtld_lock *l;
+ size_t size;
- THR_ASSERT(sizeof(struct rtld_lock) <= CACHE_LINE_SIZE,
- "rtld_lock too large");
- base = calloc(1, CACHE_LINE_SIZE);
+ size = CACHE_LINE_SIZE;
+ while (size < sizeof(struct rtld_lock))
+ size <<= 1;
+ base = calloc(1, size);
p = (char *)base;
if ((uintptr_t)p % CACHE_LINE_SIZE != 0) {
free(base);
- base = calloc(1, 2 * CACHE_LINE_SIZE);
+ base = calloc(1, size + CACHE_LINE_SIZE);
p = (char *)base;
if ((r = (uintptr_t)p % CACHE_LINE_SIZE) != 0)
p += CACHE_LINE_SIZE - r;
}
l = (struct rtld_lock *)p;
+ l->lock.rw_flags = URWLOCK_PREFER_READER;
l->base = base;
return (l);
}
@@ -110,7 +107,6 @@
{
struct pthread *curthread;
struct rtld_lock *l;
- long v;
int errsave;
curthread = _get_curthread();
@@ -118,18 +114,8 @@
l = (struct rtld_lock *)lock;
THR_CRITICAL_ENTER(curthread);
- atomic_add_acq_int(&l->lock, RC_INCR);
- if (!(l->lock & WAFLAG)) {
- RESTORE_ERRNO();
- return;
- }
- v = l->rd_cv;
- atomic_add_int(&l->rd_waiters, 1);
- while (l->lock & WAFLAG) {
- _thr_umtx_wait(&l->rd_cv, v, NULL);
- v = l->rd_cv;
- }
- atomic_add_int(&l->rd_waiters, -1);
+ while (_thr_rwlock_rdlock(&l->lock, 0, NULL) != 0)
+ ;
RESTORE_ERRNO();
}
@@ -138,7 +124,6 @@
{
struct pthread *curthread;
struct rtld_lock *l;
- long v;
int errsave;
curthread = _get_curthread();
@@ -146,19 +131,9 @@
l = (struct rtld_lock *)lock;
_thr_signal_block(curthread);
- for (;;) {
- if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) {
- RESTORE_ERRNO();
- return;
- }
- v = l->wr_cv;
- atomic_add_int(&l->wr_waiters, 1);
- while (l->lock != 0) {
- _thr_umtx_wait(&l->wr_cv, v, NULL);
- v = l->wr_cv;
- }
- atomic_add_int(&l->wr_waiters, -1);
- }
+ while (_thr_rwlock_wrlock(&l->lock, NULL) != 0)
+ ;
+ RESTORE_ERRNO();
}
static void
@@ -166,29 +141,20 @@
{
struct pthread *curthread;
struct rtld_lock *l;
+ int32_t state;
int errsave;
curthread = _get_curthread();
SAVE_ERRNO();
l = (struct rtld_lock *)lock;
- if ((l->lock & WAFLAG) == 0) {
- atomic_add_rel_int(&l->lock, -RC_INCR);
- if (l->lock == 0 && l->wr_waiters) {
- atomic_add_long(&l->wr_cv, 1);
- _thr_umtx_wake(&l->wr_cv, l->wr_waiters);
+ state = l->lock.rw_state;
+ if (_thr_rwlock_unlock(&l->lock) == 0) {
+ if ((state & URWLOCK_WRITE_OWNER) == 0) {
+ THR_CRITICAL_LEAVE(curthread);
+ } else {
+ _thr_signal_unblock(curthread);
}
- THR_CRITICAL_LEAVE(curthread);
- } else {
- atomic_add_rel_int(&l->lock, -WAFLAG);
- if (l->lock == 0 && l->wr_waiters) {
- atomic_add_long(&l->wr_cv, 1);
- _thr_umtx_wake(&l->wr_cv, l->wr_waiters);
- } else if (l->rd_waiters) {
- atomic_add_long(&l->rd_cv, 1);
- _thr_umtx_wake(&l->rd_cv, l->rd_waiters);
- }
- _thr_signal_unblock(curthread);
}
RESTORE_ERRNO();
}
==== //depot/projects/vap/lib/libutil/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libutil/Makefile,v 1.66 2007/09/01 06:19:11 pjd Exp $
+# $FreeBSD: src/lib/libutil/Makefile,v 1.67 2008/04/23 00:49:12 scf Exp $
SHLIBDIR?= /lib
@@ -8,7 +8,7 @@
LIB= util
SHLIB_MAJOR= 7
-SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c \
+SRCS= _secure_path.c auth.c gr_util.c expand_number.c flopen.c fparseln.c \
humanize_number.c kld.c login.c login_auth.c login_cap.c login_class.c \
login_crypt.c login_ok.c login_times.c login_tty.c logout.c \
logwtmp.c pidfile.c property.c pty.c pw_util.c realhostname.c \
==== //depot/projects/vap/lib/libutil/libutil.h#3 (text+ko) ====
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libutil/libutil.h,v 1.46 2007/11/18 02:20:02 jb Exp $
+ * $FreeBSD: src/lib/libutil/libutil.h,v 1.47 2008/04/23 00:49:12 scf Exp $
*/
#ifndef _LIBUTIL_H_
@@ -119,6 +119,13 @@
int pw_tmp(int _mfd);
#endif
+#ifdef _GRP_H_
+int gr_equal(const struct group *gr1, const struct group *gr2);
+char *gr_make(const struct group *gr);
+struct group *gr_dup(const struct group *gr);
+struct group *gr_scan(const char *line);
+#endif
+
#ifdef _SYS_PARAM_H_
struct pidfh *pidfile_open(const char *path, mode_t mode, pid_t *pidptr);
int pidfile_write(struct pidfh *pfh);
==== //depot/projects/vap/release/amd64/boot_crunch.conf#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.62 2008/01/22 16:35:08 kensmith Exp $
+# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.63 2008/04/22 18:20:03 thompsa Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -44,3 +44,4 @@
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
+libs -lbsdxml
==== //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list