Date: Fri, 6 Jun 2008 13:15:07 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 143026 for review Message-ID: <200806061315.m56DF7vm043329@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=143026 Change 143026 by piso@piso_ferret on 2008/06/06 13:14:50 backout latest changes: IFC@142382 Affected files ... .. //depot/projects/soc2005/libalias/MAINTAINERS#12 edit .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#33 edit .. //depot/projects/soc2005/libalias/UPDATING#29 edit .. //depot/projects/soc2005/libalias/bin/sh/parser.c#6 edit .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/coff-mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/cpu-mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elf32-mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elf64-mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elfn32-mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elfxx-mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elfxx-mips.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/hosts/mipsbsd.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/hosts/mipsmach3.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/hosts/news-mips.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/mipsbsd.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/pe-mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/pei-mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/e-mipsecoff.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/e-mipself.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/itbl-mips.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/tc-mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/tc-mips.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/te-tmips.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/gas/doc/c-mips.texi#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/gprof/mips.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/include/coff/mips.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/include/coff/mipspe.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/include/opcode/mips.h#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32btsmip.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32ltsmip.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf64btsmip.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf64ltsmip.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsbig.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsbsd.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsidt.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsidtl.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipslit.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipslnews.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipspe.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emultempl/mipsecoff.em#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emultempl/mipself.em#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/scripttempl/mips.sc#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/ld/scripttempl/mipsbsd.sc#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/mips-dis.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/mips-opc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/mips16-opc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/FREEBSD-vendor#4 edit .. //depot/projects/soc2005/libalias/etc/defaults/bluetooth.device.conf#3 edit .. //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#6 edit .. //depot/projects/soc2005/libalias/lib/libc/sys/Symbol.map#12 edit .. //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#3 edit .. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_fcntl.c#4 edit .. //depot/projects/soc2005/libalias/lib/libkse/thread/thr_fcntl.c#4 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#14 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutex.c#15 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_once.c#4 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#17 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_syscalls.c#7 edit .. //depot/projects/soc2005/libalias/piso_libalias.patch#1 add .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/readme/article.sgml#6 edit .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#16 edit .. //depot/projects/soc2005/libalias/release/doc/share/sgml/release.ent#7 edit .. //depot/projects/soc2005/libalias/sbin/mount/mount.8#9 edit .. //depot/projects/soc2005/libalias/sbin/ping6/ping6.8#4 edit .. //depot/projects/soc2005/libalias/sbin/ping6/ping6.c#6 edit .. //depot/projects/soc2005/libalias/share/man/man4/snd_emu10kx.4#6 edit .. //depot/projects/soc2005/libalias/share/man/man4/ubsa.4#7 edit .. //depot/projects/soc2005/libalias/share/man/man5/bluetooth.device.conf.5#5 edit .. //depot/projects/soc2005/libalias/share/sendmail/Makefile#3 edit .. //depot/projects/soc2005/libalias/share/syscons/keymaps/INDEX.keymaps#5 edit .. //depot/projects/soc2005/libalias/share/syscons/keymaps/Makefile#5 edit .. //depot/projects/soc2005/libalias/share/syscons/keymaps/colemak.iso15.acc.kbd#2 delete .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#24 edit .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_twi.c#9 edit .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 edit .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#3 edit .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_mib.c#5 edit .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_stats.c#10 edit .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_util.c#6 edit .. //depot/projects/soc2005/libalias/sys/compat/ndis/subr_ntoskrnl.c#8 edit .. //depot/projects/soc2005/libalias/sys/dev/ath/ah_osdep.h#5 edit .. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath.c#19 edit .. //depot/projects/soc2005/libalias/sys/dev/ath/if_athvar.h#14 edit .. //depot/projects/soc2005/libalias/sys/dev/atkbdc/psm.c#9 edit .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#20 edit .. //depot/projects/soc2005/libalias/sys/dev/cnw/if_cnw.c#5 edit .. //depot/projects/soc2005/libalias/sys/dev/cs/if_cs.c#4 edit .. //depot/projects/soc2005/libalias/sys/dev/fe/if_fe.c#5 edit .. //depot/projects/soc2005/libalias/sys/dev/fe/if_fe_pccard.c#3 edit .. //depot/projects/soc2005/libalias/sys/dev/fe/if_fevar.h#3 edit .. //depot/projects/soc2005/libalias/sys/dev/ie/if_ie.c#3 edit .. //depot/projects/soc2005/libalias/sys/dev/ie/if_ie_isa.c#4 edit .. //depot/projects/soc2005/libalias/sys/dev/ie/if_ievar.h#3 edit .. //depot/projects/soc2005/libalias/sys/dev/ieee488/upd7210.c#3 edit .. //depot/projects/soc2005/libalias/sys/dev/if_ndis/if_ndis.c#12 edit .. //depot/projects/soc2005/libalias/sys/dev/if_ndis/if_ndisvar.h#7 edit .. //depot/projects/soc2005/libalias/sys/dev/led/led.c#4 edit .. //depot/projects/soc2005/libalias/sys/dev/md/md.c#9 edit .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#19 edit .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi_ioctl.h#7 edit .. //depot/projects/soc2005/libalias/sys/dev/nve/if_nve.c#7 edit .. //depot/projects/soc2005/libalias/sys/dev/nve/if_nvereg.h#4 edit .. //depot/projects/soc2005/libalias/sys/dev/pccard/pccard_cis.c#5 edit .. //depot/projects/soc2005/libalias/sys/dev/puc/pucdata.c#8 edit .. //depot/projects/soc2005/libalias/sys/dev/snc/dp83932.c#3 edit .. //depot/projects/soc2005/libalias/sys/dev/snc/dp83932subr.c#3 edit .. //depot/projects/soc2005/libalias/sys/dev/snc/dp83932var.h#3 edit .. //depot/projects/soc2005/libalias/sys/dev/snc/if_sncreg.h#3 edit .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_dev_ns8250.c#6 edit .. //depot/projects/soc2005/libalias/sys/dev/usb/ubsa.c#12 edit .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#22 edit .. //depot/projects/soc2005/libalias/sys/dev/xe/if_xe.c#4 edit .. //depot/projects/soc2005/libalias/sys/dev/xe/if_xe_pccard.c#3 edit .. //depot/projects/soc2005/libalias/sys/dev/xe/if_xevar.h#3 edit .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_vnops.c#15 edit .. //depot/projects/soc2005/libalias/sys/geom/geom_dev.c#6 edit .. //depot/projects/soc2005/libalias/sys/i386/cpufreq/est.c#7 edit .. //depot/projects/soc2005/libalias/sys/ia64/include/atomic.h#6 edit .. //depot/projects/soc2005/libalias/sys/kern/kern_conf.c#14 edit .. //depot/projects/soc2005/libalias/sys/kern/kern_descrip.c#19 edit .. //depot/projects/soc2005/libalias/sys/kern/kern_umtx.c#18 edit .. //depot/projects/soc2005/libalias/sys/kern/tty_tty.c#7 edit .. //depot/projects/soc2005/libalias/sys/net/radix_mpath.c#4 edit .. //depot/projects/soc2005/libalias/sys/net/radix_mpath.h#4 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211.c#13 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto.c#7 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto.h#7 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_ccmp.c#6 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_tkip.c#6 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto_wep.c#6 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ddb.c#3 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_freebsd.h#10 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ioctl.c#12 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_node.c#12 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#15 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_proto.c#13 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_proto.h#10 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_scan.c#5 edit .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_var.h#13 edit .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#17 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_carp.c#11 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#12 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#82 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#33 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#35 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#34 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#28 edit .. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#19 edit .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.c#10 edit .. //depot/projects/soc2005/libalias/sys/netinet/udp_usrreq.c#16 edit .. //depot/projects/soc2005/libalias/sys/netinet6/udp6_usrreq.c#12 edit .. //depot/projects/soc2005/libalias/sys/netipx/spx_usrreq.c#6 edit .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_serv.c#13 edit .. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_impl.c#6 edit .. //depot/projects/soc2005/libalias/sys/pci/if_xl.c#10 edit .. //depot/projects/soc2005/libalias/sys/pci/if_xlreg.h#6 edit .. //depot/projects/soc2005/libalias/sys/powerpc/aim/trap.c#5 edit .. //depot/projects/soc2005/libalias/sys/security/audit/audit.c#17 edit .. //depot/projects/soc2005/libalias/sys/security/mac/mac_inet.c#15 edit .. //depot/projects/soc2005/libalias/sys/sys/conf.h#10 edit .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.1#4 edit .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.cc#5 edit .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest_run.sh#3 edit .. //depot/projects/soc2005/libalias/usr.bin/comm/comm.c#3 edit .. //depot/projects/soc2005/libalias/usr.bin/shar/shar.sh#3 edit .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/jexec/jexec.8#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/jexec/jexec.c#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/Makefile#6 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/add/main.c#8 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/add/pkg_add.1#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/create/main.c#6 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/create/pkg_create.1#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/delete/main.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/delete/pkg_delete.1#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/main.c#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/pkg_info.1#6 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/lib/lib.h#8 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/updating/main.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/updating/pkg_updating.1#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/version/main.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/version/pkg_version.1#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/pw/pw_user.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd.c#11 edit .. //depot/projects/soc2005/libalias/usr.sbin/sicontrol/sicontrol.c#3 edit .. //depot/projects/soc2005/libalias/usr.sbin/timed/timed/timed.c#3 edit .. //depot/projects/soc2005/libalias/usr.sbin/tzsetup/paths.h#3 add .. //depot/projects/soc2005/libalias/usr.sbin/tzsetup/tzsetup.c#3 edit .. //depot/projects/soc2005/libalias/usr.sbin/wlandebug/wlandebug.c#5 edit Differences ... ==== //depot/projects/soc2005/libalias/MAINTAINERS#12 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.149 2008/06/04 07:37:26 rafan Exp $ +$FreeBSD: src/MAINTAINERS,v 1.147 2008/05/27 06:50:46 peter Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -71,6 +71,7 @@ ps gad I am working on a number of changes to this. Would like advance notice of major changes planned to it. cvs peter Heads-up appreciated, try not to break it. +ncurses peter Heads-up appreciated, try not to break it. nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. @@ -126,7 +127,6 @@ gnu/usr.bin/send-pr bugmaster Pre-commit review requested. BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. usb core Please contact core@ before any major changes -ncurses rafan Heads-up appreciated, try not to break it. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#33 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.141 2008/05/27 21:05:49 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.139 2008/05/26 10:39:45 bz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -128,26 +128,6 @@ OLD_DIRS+=usr/share/examples/isdn OLD_FILES+=usr/share/examples/ppp/isdnd.rc OLD_FILES+=usr/share/examples/ppp/ppp.conf.isdn -# 20080525: ng_atmpif removed -OLD_FILES+=usr/include/netgraph/atm/ng_atmpif.h -OLD_FILES+=usr/share/man/man4/ng_atmpif.4.gz -# 20080522: pmap_addr_hint removed -OLD_FILES+=usr/share/man/man9/pmap_addr_hint.9.gz -# 20080517: ipsec_osdep.h removed -OLD_FILES+=usr/include/netipsec/ipsec_osdep.h -# 20080507: heimdal 1.1 import -OLD_LIBS+=usr/lib/libasn1.so.9 -OLD_LIBS+=usr/lib/libgssapi.so.9 -OLD_LIBS+=usr/lib/libgssapi_krb5.so.9 -OLD_LIBS+=usr/lib/libhdb.so.9 -OLD_LIBS+=usr/lib/libkadm5clnt.so.9 -OLD_LIBS+=usr/lib/libkadm5srv.so.9 -OLD_LIBS+=usr/lib/libkafs5.so.9 -OLD_LIBS+=usr/lib/libkrb5.so.9 -OLD_LIBS+=usr/lib/libroken.so.9 -.if ${TARGET_ARCH} == "amd64" -OLD_LIBS+=usr/lib32/libgssapi.so.9 -.endif # 20080420: Symbol card support dropped OLD_FILES+=usr/include/dev/wi/spectrum24t_cf.h # 20080420: awi removal @@ -230,7 +210,7 @@ .endif # 20070801: fast_ipsec.4 gone OLD_FILES+=usr/share/man/man4/fast_ipsec.4.gz -# 20070715: netatm temporarily disconnected (removed 20080525) +# 20070715: netatm temporarily disconnected OLD_FILES+=rescue/atm OLD_FILES+=rescue/fore_dnld OLD_FILES+=rescue/ilmid @@ -318,7 +298,7 @@ OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h OLD_FILES+=usr/include/machine/i4b_trace.h .endif -# 20070704: I4B 'modules' temporary disconnected (removed 20080525) +# 20070704: I4B 'modules' temporary disconnected .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/share/man/man4/i4bing.4.gz OLD_FILES+=usr/share/man/man4/i4bipr.4.gz ==== //depot/projects/soc2005/libalias/UPDATING#29 (text+ko) ==== @@ -22,12 +22,6 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) -20080603: - The version that Linuxulator emulates was changed from 2.4.2 - to 2.6.16. If you experience any problems with Linux binaries - please try to set sysctl compat.linux.osrelease to 2.4.2 and - if it fixes the problem contact emulation mailing list. - 20080525: ISDN4BSD (I4B) was removed from the src tree. You may need to update a your kernel configuration and remove relevant entries. @@ -1049,4 +1043,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.531 2008/06/03 18:09:10 rdivacky Exp $ +$FreeBSD: src/UPDATING,v 1.529 2008/05/26 10:39:45 bz Exp $ ==== //depot/projects/soc2005/libalias/bin/sh/parser.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.60 2008/05/28 21:44:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.59 2008/05/15 19:55:27 stefanf Exp $"); #include <stdlib.h> #include <unistd.h> @@ -1188,7 +1188,6 @@ int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ int i; int linno; - int length; c = pgetc(); if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) && @@ -1221,14 +1220,12 @@ subtype = 0; } if (!is_eof(c) && is_name(c)) { - length = 0; + p = out; do { STPUTC(c, out); c = pgetc(); - length++; } while (!is_eof(c) && is_in_name(c)); - if (length == 6 && - strncmp(out - length, "LINENO", length) == 0) { + if (out - p == 6 && strncmp(p, "LINENO", 6) == 0) { /* Replace the variable name with the * current line number. */ linno = plinno; ==== //depot/projects/soc2005/libalias/contrib/ncurses/FREEBSD-vendor#4 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/contrib/ncurses/FREEBSD-vendor,v 1.3 2008/06/04 07:38:38 rafan Exp $ +# $FreeBSD: src/contrib/ncurses/FREEBSD-vendor,v 1.2 2008/05/09 02:30:24 rafan Exp $ Project: Ncurses (new curses) library ProjectURL: http://www.gnu.org/software/ncurses/ Version: 5.6-20080503 snapshot VendorTag: NCURSES VersionTag: v5_6_20080503 License: MIT-like -Maintainer: rafan +Maintainer: peter, rafan ==== //depot/projects/soc2005/libalias/etc/defaults/bluetooth.device.conf#3 (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/defaults/bluetooth.device.conf,v 1.2 2008/05/27 17:46:32 emax Exp $ +# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.1 2005/11/10 19:09:22 emax Exp $ # The authentication_enable parameter controls if the device requires to # authenticate the remote device at connection setup. At connection setup, @@ -39,7 +39,8 @@ # The class parameter is used to indicate the capabilities of the device to # other devices. # -# For more details see "Assigned Numbers - Bluetooth Baseband" document +# For more details see +# https://www.bluetooth.org/foundry/assignnumb/document/baseband # # Possible value: # @@ -100,7 +101,7 @@ # The role_switch parameter controls whether the local device should perform # role switch. By default, if role switch is supported, the local device will # try to perform role switch and become Master on incoming connection. Some -# devices do not support role switch and thus incoming connections from such +# devices do not support role switch and thus incomming connections from such # devices will fail. If role switch is disabled then accepting device will # remain Slave. # ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#6 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.46 2008/05/31 18:07:16 remko Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.45 2007/12/08 00:20:33 dougb Exp $ % Any user that is a member of the wheel group can use "su -" to simulate a root login. You can add a user to the wheel group by editing /etc/group. @@ -402,6 +402,16 @@ as root. This will install a collection of packages that is appropriate for running a "generic" server. % +You can get a good standard workstation install by using the +instant-workstation port/package. If you have ports installed, you can +install it by doing + + # cd /usr/ports/misc/instant-workstation + # make install && make clean + +as root. This will install a collection of packages that is convenient to +have on a workstation. +% You can install extra packages for FreeBSD by using the ports system. If you have installed it, you can download, compile, and install software by just typing ==== //depot/projects/soc2005/libalias/lib/libc/sys/Symbol.map#12 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.16 2008/05/30 14:47:40 dfr Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.15 2008/05/09 23:00:20 julian Exp $ */ /* @@ -522,7 +522,6 @@ __sys_fchown; _fcntl; __sys_fcntl; - __fcntl_compat; _fhopen; __sys_fhopen; _fhstat; ==== //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.3 2008/05/30 14:47:40 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.1 2008/04/04 09:43:03 dfr Exp $"); #include <fcntl.h> #include <stdarg.h> @@ -34,10 +34,8 @@ #include <sys/syscall.h> #include "libc_private.h" -__weak_reference(__fcntl_compat, fcntl); - int -__fcntl_compat(int fd, int cmd, ...) +fcntl(int fd, int cmd, ...) { va_list args; long arg; ==== //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_fcntl.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.17 2008/05/30 14:47:41 dfr Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.16 2007/01/12 07:25:25 imp Exp $ */ #include <stdarg.h> #include <unistd.h> @@ -36,8 +36,6 @@ __weak_reference(__fcntl, fcntl); -extern int __fcntl_compat(int fd, int cmd, ...); - int _fcntl(int fd, int cmd,...) { @@ -126,7 +124,7 @@ break; default: /* Might want to make va_arg use a union */ - ret = __fcntl_compat(fd, cmd, va_arg(ap, void *)); + ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); break; } ==== //depot/projects/soc2005/libalias/lib/libkse/thread/thr_fcntl.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.25 2008/05/30 14:47:42 dfr Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.24 2007/12/16 23:29:55 deischen Exp $ */ #include "namespace.h" @@ -37,7 +37,6 @@ #include "thr_private.h" int __fcntl(int fd, int cmd,...); -extern int __fcntl_compat(int fd, int cmd,...); __weak_reference(__fcntl, fcntl); @@ -69,7 +68,7 @@ ret = __sys_fcntl(fd, cmd); break; default: - ret = __fcntl_compat(fd, cmd, va_arg(ap, void *)); + ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); } va_end(ap); ==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.51 2008/05/29 07:57:33 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.50 2008/04/16 03:19:11 davidxu Exp $ */ #include "namespace.h" @@ -89,7 +89,8 @@ struct pthread_mutex_attr _pthread_mutexattr_default = { .m_type = PTHREAD_MUTEX_DEFAULT, .m_protocol = PTHREAD_PRIO_NONE, - .m_ceiling = 0 + .m_ceiling = 0, + .m_flags = 0 }; /* Default condition variable attributes: */ ==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutex.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.74 2008/05/29 07:57:33 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.73 2008/04/26 13:19:07 kris Exp $ */ #include "namespace.h" @@ -51,12 +51,12 @@ (m)->m_qe.tqe_next = NULL; \ } while (0) #define MUTEX_ASSERT_IS_OWNED(m) do { \ - if (__predict_false((m)->m_qe.tqe_prev == NULL))\ + if ((m)->m_qe.tqe_prev == NULL) \ PANIC("mutex is not on list"); \ } while (0) #define MUTEX_ASSERT_NOT_OWNED(m) do { \ - if (__predict_false((m)->m_qe.tqe_prev != NULL || \ - (m)->m_qe.tqe_next != NULL)) \ + if (((m)->m_qe.tqe_prev != NULL) || \ + ((m)->m_qe.tqe_next != NULL)) \ PANIC("mutex is on list"); \ } while (0) #else @@ -95,13 +95,9 @@ static int mutex_unlock_common(pthread_mutex_t *); __weak_reference(__pthread_mutex_init, pthread_mutex_init); -__strong_reference(__pthread_mutex_init, _pthread_mutex_init); __weak_reference(__pthread_mutex_lock, pthread_mutex_lock); -__strong_reference(__pthread_mutex_lock, _pthread_mutex_lock); __weak_reference(__pthread_mutex_timedlock, pthread_mutex_timedlock); -__strong_reference(__pthread_mutex_timedlock, _pthread_mutex_timedlock); __weak_reference(__pthread_mutex_trylock, pthread_mutex_trylock); -__strong_reference(__pthread_mutex_trylock, _pthread_mutex_trylock); /* Single underscore versions provided for libc internal usage: */ /* No difference between libc and application usage of these: */ @@ -112,17 +108,15 @@ __weak_reference(_pthread_mutex_setprioceiling, pthread_mutex_setprioceiling); __weak_reference(__pthread_mutex_setspinloops_np, pthread_mutex_setspinloops_np); -__strong_reference(__pthread_mutex_setspinloops_np, _pthread_mutex_setspinloops_np); __weak_reference(_pthread_mutex_getspinloops_np, pthread_mutex_getspinloops_np); __weak_reference(__pthread_mutex_setyieldloops_np, pthread_mutex_setyieldloops_np); -__strong_reference(__pthread_mutex_setyieldloops_np, _pthread_mutex_setyieldloops_np); __weak_reference(_pthread_mutex_getyieldloops_np, pthread_mutex_getyieldloops_np); __weak_reference(_pthread_mutex_isowned_np, pthread_mutex_isowned_np); static int mutex_init(pthread_mutex_t *mutex, - const pthread_mutexattr_t *mutex_attr, + const pthread_mutexattr_t *mutex_attr, int private, void *(calloc_cb)(size_t, size_t)) { const struct pthread_mutex_attr *attr; @@ -145,6 +139,9 @@ pmutex->m_type = attr->m_type; pmutex->m_owner = NULL; + pmutex->m_flags = attr->m_flags | MUTEX_FLAGS_INITED; + if (private) + pmutex->m_flags |= MUTEX_FLAGS_PRIVATE; pmutex->m_count = 0; pmutex->m_refcount = 0; pmutex->m_spinloops = 0; @@ -183,7 +180,24 @@ THR_LOCK_ACQUIRE(thread, &_mutex_static_lock); if (*mutex == NULL) - ret = mutex_init(mutex, NULL, calloc); + ret = mutex_init(mutex, NULL, 0, calloc); + else + ret = 0; + + THR_LOCK_RELEASE(thread, &_mutex_static_lock); + + return (ret); +} + +static int +init_static_private(struct pthread *thread, pthread_mutex_t *mutex) +{ + int ret; + + THR_LOCK_ACQUIRE(thread, &_mutex_static_lock); + + if (*mutex == NULL) + ret = mutex_init(mutex, NULL, 1, calloc); else ret = 0; @@ -205,10 +219,17 @@ } int +_pthread_mutex_init(pthread_mutex_t *mutex, + const pthread_mutexattr_t *mutex_attr) +{ + return mutex_init(mutex, mutex_attr, 1, calloc); +} + +int __pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutex_attr) { - return mutex_init(mutex, mutex_attr, calloc); + return mutex_init(mutex, mutex_attr, 0, calloc); } /* This function is used internally by malloc. */ @@ -219,11 +240,12 @@ static const struct pthread_mutex_attr attr = { .m_type = PTHREAD_MUTEX_NORMAL, .m_protocol = PTHREAD_PRIO_NONE, - .m_ceiling = 0 + .m_ceiling = 0, + .m_flags = 0 }; static const struct pthread_mutex_attr *pattr = &attr; - return mutex_init(mutex, (pthread_mutexattr_t *)&pattr, calloc_cb); + return mutex_init(mutex, (pthread_mutexattr_t *)&pattr, 0, calloc_cb); } void @@ -297,6 +319,7 @@ return (ret); } + #define ENQUEUE_MUTEX(curthread, m) \ do { \ (m)->m_owner = curthread; \ @@ -345,95 +368,124 @@ return (mutex_trylock_common(curthread, mutex)); } +int +_pthread_mutex_trylock(pthread_mutex_t *mutex) +{ + struct pthread *curthread = _get_curthread(); + int ret; + + /* + * If the mutex is statically initialized, perform the dynamic + * initialization marking the mutex private (delete safe): + */ + if (__predict_false(*mutex == NULL)) { + ret = init_static_private(curthread, mutex); + if (__predict_false(ret)) + return (ret); + } + return (mutex_trylock_common(curthread, mutex)); +} + static int -mutex_lock_sleep(struct pthread *curthread, pthread_mutex_t m, +mutex_lock_common(struct pthread *curthread, pthread_mutex_t *mutex, const struct timespec * abstime) { struct timespec ts, ts2; + struct pthread_mutex *m; uint32_t id; int ret; int count; id = TID(curthread); - if (__predict_false(m->m_owner == curthread)) - return mutex_self_lock(m, abstime); + m = *mutex; + ret = _thr_umutex_trylock2(&m->m_lock, id); + if (ret == 0) { + ENQUEUE_MUTEX(curthread, m); + } else if (m->m_owner == curthread) { + ret = mutex_self_lock(m, abstime); + } else { + /* + * For adaptive mutexes, spin for a bit in the expectation + * that if the application requests this mutex type then + * the lock is likely to be released quickly and it is + * faster than entering the kernel + */ + if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) + goto sleep_in_kernel; - /* - * For adaptive mutexes, spin for a bit in the expectation - * that if the application requests this mutex type then - * the lock is likely to be released quickly and it is - * faster than entering the kernel - */ - if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) - goto sleep_in_kernel; + if (!_thr_is_smp) + goto yield_loop; - if (!_thr_is_smp) - goto yield_loop; + count = m->m_spinloops; + while (count--) { + if (m->m_lock.m_owner == UMUTEX_UNOWNED) { + ret = _thr_umutex_trylock2(&m->m_lock, id); + if (ret == 0) + goto done; + } + CPU_SPINWAIT; + } - count = m->m_spinloops; - while (count--) { - if (m->m_lock.m_owner == UMUTEX_UNOWNED) { +yield_loop: + count = m->m_yieldloops; + while (count--) { + _sched_yield(); ret = _thr_umutex_trylock2(&m->m_lock, id); if (ret == 0) goto done; } - CPU_SPINWAIT; - } -yield_loop: - count = m->m_yieldloops; - while (count--) { - _sched_yield(); - ret = _thr_umutex_trylock2(&m->m_lock, id); +sleep_in_kernel: + if (abstime == NULL) { + ret = __thr_umutex_lock(&m->m_lock); + } else if (__predict_false( + abstime->tv_sec < 0 || abstime->tv_nsec < 0 || + abstime->tv_nsec >= 1000000000)) { + ret = EINVAL; + } else { + clock_gettime(CLOCK_REALTIME, &ts); + TIMESPEC_SUB(&ts2, abstime, &ts); + ret = __thr_umutex_timedlock(&m->m_lock, &ts2); + /* + * Timed out wait is not restarted if + * it was interrupted, not worth to do it. + */ + if (ret == EINTR) + ret = ETIMEDOUT; + } +done: if (ret == 0) - goto done; - } - -sleep_in_kernel: - if (abstime == NULL) { - ret = __thr_umutex_lock(&m->m_lock); - } else if (__predict_false( - abstime->tv_sec < 0 || abstime->tv_nsec < 0 || - abstime->tv_nsec >= 1000000000)) { - ret = EINVAL; - } else { - clock_gettime(CLOCK_REALTIME, &ts); - TIMESPEC_SUB(&ts2, abstime, &ts); - ret = __thr_umutex_timedlock(&m->m_lock, &ts2); - /* - * Timed out wait is not restarted if - * it was interrupted, not worth to do it. - */ - if (ret == EINTR) - ret = ETIMEDOUT; + ENQUEUE_MUTEX(curthread, m); } -done: - if (ret == 0) - ENQUEUE_MUTEX(curthread, m); return (ret); } -static inline int -mutex_lock_common(struct pthread *curthread, struct pthread_mutex *m, - const struct timespec * abstime) +int +__pthread_mutex_lock(pthread_mutex_t *m) { - uint32_t id; + struct pthread *curthread; int ret; - id = TID(curthread); - ret = _thr_umutex_trylock2(&m->m_lock, id); - if (ret == 0) - ENQUEUE_MUTEX(curthread, m); - else - ret = mutex_lock_sleep(curthread, m, abstime); - return (ret); + _thr_check_init(); + + curthread = _get_curthread(); + + /* + * If the mutex is statically initialized, perform the dynamic + * initialization: + */ + if (__predict_false(*m == NULL)) { + ret = init_static(curthread, m); + if (__predict_false(ret)) + return (ret); + } + return (mutex_lock_common(curthread, m, NULL)); } int -__pthread_mutex_lock(pthread_mutex_t *mutex) +_pthread_mutex_lock(pthread_mutex_t *m) { struct pthread *curthread; - struct pthread_mutex *m; int ret; _thr_check_init(); @@ -442,22 +494,20 @@ /* * If the mutex is statically initialized, perform the dynamic - * initialization: + * initialization marking it private (delete safe): */ - if (__predict_false((m = *mutex) == NULL)) { - ret = init_static(curthread, mutex); + if (__predict_false(*m == NULL)) { + ret = init_static_private(curthread, m); if (__predict_false(ret)) return (ret); - m = *mutex; } return (mutex_lock_common(curthread, m, NULL)); } int -__pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *abstime) +__pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *abstime) { struct pthread *curthread; - struct pthread_mutex *m; int ret; _thr_check_init(); @@ -468,11 +518,32 @@ * If the mutex is statically initialized, perform the dynamic * initialization: */ - if (__predict_false((m = *mutex) == NULL)) { - ret = init_static(curthread, mutex); + if (__predict_false(*m == NULL)) { + ret = init_static(curthread, m); + if (__predict_false(ret)) + return (ret); + } + return (mutex_lock_common(curthread, m, abstime)); +} + +int +_pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *abstime) +{ + struct pthread *curthread; + int ret; + + _thr_check_init(); + + curthread = _get_curthread(); + + /* + * If the mutex is statically initialized, perform the dynamic + * initialization marking it private (delete safe): + */ + if (__predict_false(*m == NULL)) { + ret = init_static_private(curthread, m); if (__predict_false(ret)) return (ret); - m = *mutex; } return (mutex_lock_common(curthread, m, abstime)); } @@ -488,7 +559,7 @@ { int ret; - ret = mutex_lock_common(_get_curthread(), *m, NULL); + ret = mutex_lock_common(_get_curthread(), m, NULL); if (ret == 0) { (*m)->m_refcount--; (*m)->m_count += count; @@ -534,15 +605,10 @@ case PTHREAD_MUTEX_ERRORCHECK: case PTHREAD_MUTEX_ADAPTIVE_NP: if (abstime) { - if (abstime->tv_sec < 0 || abstime->tv_nsec < 0 || - abstime->tv_nsec >= 1000000000) { - ret = EINVAL; - } else { - clock_gettime(CLOCK_REALTIME, &ts1); - TIMESPEC_SUB(&ts2, abstime, &ts1); - __sys_nanosleep(&ts2, NULL); - ret = ETIMEDOUT; - } + clock_gettime(CLOCK_REALTIME, &ts1); + TIMESPEC_SUB(&ts2, abstime, &ts1); + __sys_nanosleep(&ts2, NULL); + ret = ETIMEDOUT; } else { /* * POSIX specifies that mutexes should return @@ -559,15 +625,10 @@ */ ret = 0; if (abstime) { - if (abstime->tv_sec < 0 || abstime->tv_nsec < 0 || - abstime->tv_nsec >= 1000000000) { - ret = EINVAL; - } else { - clock_gettime(CLOCK_REALTIME, &ts1); - TIMESPEC_SUB(&ts2, abstime, &ts1); - __sys_nanosleep(&ts2, NULL); - ret = ETIMEDOUT; - } + clock_gettime(CLOCK_REALTIME, &ts1); + TIMESPEC_SUB(&ts2, abstime, &ts1); + __sys_nanosleep(&ts2, NULL); + ret = ETIMEDOUT; } else { ts1.tv_sec = 30; ts1.tv_nsec = 0; @@ -665,6 +726,17 @@ return (0); } +void +_mutex_unlock_private(pthread_t pthread) +{ + struct pthread_mutex *m, *m_next; + + TAILQ_FOREACH_SAFE(m, &pthread->mutexq, m_qe, m_next) { + if ((m->m_flags & MUTEX_FLAGS_PRIVATE) != 0) + _pthread_mutex_unlock(&m); + } +} + int _pthread_mutex_getprioceiling(pthread_mutex_t *mutex, int *prioceiling) @@ -728,6 +800,21 @@ } int +_pthread_mutex_setspinloops_np(pthread_mutex_t *mutex, int count) +{ + struct pthread *curthread = _get_curthread(); + int ret; + + if (__predict_false(*mutex == NULL)) { + ret = init_static_private(curthread, mutex); + if (__predict_false(ret)) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806061315.m56DF7vm043329>