Date: Thu, 7 Feb 2008 04:31:39 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 134951 for review Message-ID: <200802070431.m174Vdsp002441@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=134951 Change 134951 by kmacy@kmacy:storage:toehead on 2008/02/07 04:31:32 IFC 134950 Affected files ... .. //depot/projects/toehead/Makefile#4 integrate .. //depot/projects/toehead/Makefile.inc1#5 integrate .. //depot/projects/toehead/ObsoleteFiles.inc#4 integrate .. //depot/projects/toehead/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/toehead/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/toehead/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/toehead/contrib/file/Magdir/chi#2 delete .. //depot/projects/toehead/contrib/file/Magdir/cvs#2 delete .. //depot/projects/toehead/contrib/file/Magdir/hdf#2 delete .. //depot/projects/toehead/contrib/file/Magdir/impulse#2 delete .. //depot/projects/toehead/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/toehead/contrib/file/acconfig.h#2 delete .. //depot/projects/toehead/contrib/file/magic.c#3 integrate .. //depot/projects/toehead/contrib/file/missing#2 delete .. //depot/projects/toehead/contrib/file/stamp-h.in#2 delete .. //depot/projects/toehead/contrib/libiberty/cp-demangle.c#2 delete .. //depot/projects/toehead/contrib/openpam/FREEBSD-vendor#1 branch .. //depot/projects/toehead/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/toehead/crypto/openssh/FREEBSD-Xlist#2 integrate .. //depot/projects/toehead/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/toehead/crypto/openssh/FREEBSD-vendor#1 branch .. //depot/projects/toehead/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/toehead/etc/rc.d/dhclient#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#5 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/main.c#4 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#5 integrate .. //depot/projects/toehead/include/pthread_np.h#3 integrate .. //depot/projects/toehead/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/toehead/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/toehead/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/toehead/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/toehead/lib/libc/include/namespace.h#2 integrate .. //depot/projects/toehead/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/toehead/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/toehead/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/toehead/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/toehead/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/toehead/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/toehead/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/toehead/lib/libelf/gelf_fsize.3#2 integrate .. //depot/projects/toehead/lib/libfetch/http.c#4 integrate .. //depot/projects/toehead/lib/libkse/Makefile#2 integrate .. //depot/projects/toehead/lib/libkse/kse.map#2 integrate .. //depot/projects/toehead/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/toehead/lib/libkse/thread/thr_mutex.c#3 integrate .. //depot/projects/toehead/lib/libpmc/pmc.3#2 integrate .. //depot/projects/toehead/lib/librpcsvc/Makefile#2 integrate .. //depot/projects/toehead/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/toehead/lib/libthr/Makefile#3 integrate .. //depot/projects/toehead/lib/libthr/pthread.map#4 integrate .. //depot/projects/toehead/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/toehead/lib/msun/ld128/s_exp2l.c#2 integrate .. //depot/projects/toehead/lib/msun/ld80/s_exp2l.c#2 integrate .. //depot/projects/toehead/lib/msun/src/e_exp.c#2 integrate .. //depot/projects/toehead/lib/msun/src/e_expf.c#3 integrate .. //depot/projects/toehead/lib/msun/src/s_exp2.c#3 integrate .. //depot/projects/toehead/lib/msun/src/s_exp2f.c#4 integrate .. //depot/projects/toehead/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/toehead/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/toehead/release/fixit.profile#3 integrate .. //depot/projects/toehead/sbin/fsck_msdosfs/boot.c#3 integrate .. //depot/projects/toehead/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/toehead/sbin/geom/core/geom.8#2 integrate .. //depot/projects/toehead/sbin/geom/core/geom.c#2 integrate .. //depot/projects/toehead/sbin/gpt/gpt.8#2 integrate .. //depot/projects/toehead/sbin/gpt/gpt.c#2 integrate .. //depot/projects/toehead/sbin/gpt/migrate.c#2 integrate .. //depot/projects/toehead/sbin/gpt/show.c#2 integrate .. //depot/projects/toehead/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/toehead/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/toehead/sbin/mount/mount.c#2 integrate .. //depot/projects/toehead/sbin/natd/natd.8#5 integrate .. //depot/projects/toehead/share/colldef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/toehead/share/man/man4/Makefile#5 integrate .. //depot/projects/toehead/share/man/man4/atkbd.4#2 integrate .. //depot/projects/toehead/share/man/man4/hptiop.4#2 integrate .. //depot/projects/toehead/share/man/man4/hptrr.4#2 integrate .. //depot/projects/toehead/share/man/man4/rr232x.4#2 delete .. //depot/projects/toehead/share/man/man9/lock.9#4 integrate .. //depot/projects/toehead/share/man/man9/mbuf.9#2 integrate .. //depot/projects/toehead/share/misc/committers-src.dot#3 integrate .. //depot/projects/toehead/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/toehead/share/msgdef/Makefile#2 integrate .. //depot/projects/toehead/share/msgdef/ko_KR.UTF-8.src#1 branch .. //depot/projects/toehead/share/msgdef/ko_KR.eucKR.src#2 integrate .. //depot/projects/toehead/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/toehead/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/toehead/sys/amd64/conf/GENERIC#5 edit .. //depot/projects/toehead/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/toehead/sys/amd64/include/proc.h#2 integrate .. //depot/projects/toehead/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/toehead/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/toehead/sys/arm/arm/locore.S#2 integrate .. //depot/projects/toehead/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/toehead/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/toehead/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/toehead/sys/arm/include/atomic.h#2 integrate .. //depot/projects/toehead/sys/arm/include/pmap.h#2 integrate .. //depot/projects/toehead/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/toehead/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/toehead/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/toehead/sys/conf/Makefile.arm#2 integrate .. //depot/projects/toehead/sys/conf/files.amd64#3 integrate .. //depot/projects/toehead/sys/conf/files.i386#4 integrate .. //depot/projects/toehead/sys/conf/files.powerpc#4 integrate .. //depot/projects/toehead/sys/conf/kern.post.mk#2 integrate .. //depot/projects/toehead/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/toehead/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/toehead/sys/dev/amr/amrreg.h#3 integrate .. //depot/projects/toehead/sys/dev/cxgb/cxgb_adapter.h#4 edit .. //depot/projects/toehead/sys/dev/cxgb/cxgb_offload.c#6 edit .. //depot/projects/toehead/sys/dev/cxgb/cxgb_sge.c#8 edit .. //depot/projects/toehead/sys/dev/cxgb/sys/mvec.h#8 edit .. //depot/projects/toehead/sys/dev/cxgb/sys/uipc_mvec.c#4 edit .. //depot/projects/toehead/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/toehead/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/toehead/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/array.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/him.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/himfuncs.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/hptintf.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/hptrr_config.c#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/hptrr_config.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/toehead/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/list.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/toehead/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/toehead/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/toehead/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/toehead/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/toehead/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/toehead/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/toehead/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/toehead/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/toehead/sys/dev/pci/pci.c#2 integrate .. //depot/projects/toehead/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/toehead/sys/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/toehead/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/toehead/sys/dev/rr232x/LICENSE#2 delete .. //depot/projects/toehead/sys/dev/rr232x/README#2 delete .. //depot/projects/toehead/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/toehead/sys/dev/rr232x/array.h#2 delete .. //depot/projects/toehead/sys/dev/rr232x/him.h#2 delete .. //depot/projects/toehead/sys/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/toehead/sys/dev/rr232x/hptintf.h#2 delete .. //depot/projects/toehead/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/toehead/sys/dev/rr232x/ldm.h#2 delete .. //depot/projects/toehead/sys/dev/rr232x/list.h#2 delete .. //depot/projects/toehead/sys/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/toehead/sys/dev/rr232x/os_bsd.h#2 delete .. //depot/projects/toehead/sys/dev/rr232x/osm.h#2 delete .. //depot/projects/toehead/sys/dev/rr232x/osm_bsd.c#2 delete .. //depot/projects/toehead/sys/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/toehead/sys/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/toehead/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/toehead/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/toehead/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/toehead/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/toehead/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/toehead/sys/i386/conf/NOTES#4 integrate .. //depot/projects/toehead/sys/i386/include/proc.h#2 integrate .. //depot/projects/toehead/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/toehead/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/toehead/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/toehead/sys/kern/kern_lock.c#4 integrate .. //depot/projects/toehead/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/toehead/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/toehead/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/toehead/sys/kern/subr_lock.c#4 integrate .. //depot/projects/toehead/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/toehead/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/toehead/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/toehead/sys/kern/uipc_sockbuf.c#3 edit .. //depot/projects/toehead/sys/kern/uipc_socket.c#2 edit .. //depot/projects/toehead/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/toehead/sys/modules/Makefile#3 integrate .. //depot/projects/toehead/sys/modules/cxgb/cxgb/Makefile#5 edit .. //depot/projects/toehead/sys/modules/rr232x/Makefile#2 delete .. //depot/projects/toehead/sys/net/bpf.c#3 integrate .. //depot/projects/toehead/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/toehead/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/toehead/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/toehead/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/toehead/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/toehead/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/toehead/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/toehead/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/toehead/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/toehead/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/toehead/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/toehead/sys/netinet/if_ether.c#6 edit .. //depot/projects/toehead/sys/netinet/ip_id.c#2 integrate .. //depot/projects/toehead/sys/netinet/ip_output.c#2 integrate .. //depot/projects/toehead/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/toehead/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/toehead/sys/netinet/sctputil.c#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/toehead/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/toehead/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/toehead/sys/netipsec/ipsec6.h#2 integrate .. //depot/projects/toehead/sys/pci/if_wb.c#2 integrate .. //depot/projects/toehead/sys/sys/lockmgr.h#5 integrate .. //depot/projects/toehead/sys/sys/mbuf.h#4 integrate .. //depot/projects/toehead/sys/sys/param.h#5 integrate .. //depot/projects/toehead/sys/sys/proc.h#4 integrate .. //depot/projects/toehead/sys/sys/rwlock.h#2 integrate .. //depot/projects/toehead/sys/sys/socket.h#4 integrate .. //depot/projects/toehead/sys/sys/socketvar.h#3 integrate .. //depot/projects/toehead/sys/tools/embed_mfs.sh#1 branch .. //depot/projects/toehead/tools/regression/netinet/ip_id_period/ip_id_period.py#1 branch .. //depot/projects/toehead/tools/regression/pthread/mutex_isowned_np/Makefile#1 branch .. //depot/projects/toehead/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c#1 branch .. //depot/projects/toehead/tools/regression/sockets/unix_sorflush/Makefile#1 branch .. //depot/projects/toehead/tools/regression/sockets/unix_sorflush/unix_sorflush.c#1 branch .. //depot/projects/toehead/tools/tools/crypto/cryptostats.c#2 integrate .. //depot/projects/toehead/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/toehead/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/toehead/usr.bin/file/Makefile#2 integrate .. //depot/projects/toehead/usr.bin/file/file.1#2 delete .. //depot/projects/toehead/usr.bin/file/magic.5#2 delete .. //depot/projects/toehead/usr.bin/kdump/Makefile#2 integrate .. //depot/projects/toehead/usr.bin/kdump/mkioctls#2 integrate .. //depot/projects/toehead/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/toehead/usr.bin/logger/logger.c#2 integrate .. //depot/projects/toehead/usr.bin/truss/Makefile#2 integrate .. //depot/projects/toehead/usr.sbin/Makefile#2 integrate .. //depot/projects/toehead/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate .. //depot/projects/toehead/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/toehead/usr.sbin/kbdcontrol/kbdcontrol.1#2 integrate .. //depot/projects/toehead/usr.sbin/kbdcontrol/kbdmap.5#2 integrate .. //depot/projects/toehead/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/toehead/usr.sbin/ofwdump/Makefile#2 integrate .. //depot/projects/toehead/usr.sbin/ofwdump/ofwdump.8#2 integrate .. //depot/projects/toehead/usr.sbin/setfmac/setfmac.c#3 integrate .. //depot/projects/toehead/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/toehead/usr.sbin/watch/watch.c#2 integrate .. //depot/projects/toehead/usr.sbin/ypserv/yp_main.c#2 integrate .. //depot/projects/toehead/usr.sbin/ypserv/ypserv.8#2 integrate Differences ... ==== //depot/projects/toehead/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ +# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $ # # The user-driven targets are: # @@ -75,6 +75,8 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # +# For more information, see the build(7) manual page. +# TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check-old check-old-dirs check-old-files check-old-libs \ checkdpadd clean cleandepend cleandir \ ==== //depot/projects/toehead/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.596 2008/01/23 22:21:36 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -313,8 +313,9 @@ .endif .else rm -rf ${WORLDTMP}/legacy/usr/include -# XXX - These two can depend on any header file. +# XXX - These three can depend on any header file. rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c + rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ ==== //depot/projects/toehead/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.127 2008/01/26 20:23:25 brueffer Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.130 2008/02/06 19:45:25 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -3945,7 +3945,9 @@ .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" OLD_FILES+=usr/share/man/man8/boot_i386.8.gz .endif +.if ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "sparc64" OLD_FILES+=usr/share/man/man8/ofwdump.8.gz +.endif OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz OLD_FILES+=usr/share/man/man9/VFS_START.9.gz OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz ==== //depot/projects/toehead/contrib/binutils/libiberty/cp-demangle.c#2 (text+ko) ==== @@ -2396,6 +2396,8 @@ const char *s; type = cplus_demangle_type (di); + if (type == NULL) + return NULL; /* If we have a type we know how to print, we aren't going to print the type name itself. */ ==== //depot/projects/toehead/contrib/file/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,5 +1,5 @@ # ex:ts=8 -$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.7 2007/05/24 22:02:49 obrien Exp $ +$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.8 2008/01/30 02:48:24 obrien Exp $ Christos Zoulas `file' originals can be found at: ftp://ftp.astron.com/pub/file/ @@ -17,14 +17,14 @@ rm -f missing depcomp rm -f config.{guess,sub} - cvs import -m "Virgin import of Christos Zoulas's FILE 4.21." \ - src/contrib/file ZOULAS file_4_21 + cvs import -m "Virgin import of Christos Zoulas's FILE 4.23." \ + src/contrib/file ZOULAS file_4_23 Never make local changes to ZOULAS `file'. Christos is very willing to work with us to meet our FreeBSD needs. Thus submit any desired changes to him <christos@zoulas.com> and wait for the next release and vendor import to get them. - + obrien@NUXI.com 15-Sept-2002 ==== //depot/projects/toehead/contrib/file/magic.c#3 (text+ko) ==== @@ -218,6 +218,7 @@ */ #ifdef HAVE_UTIMES struct timeval utsbuf[2]; + memset(utsbuf, 0, sizeof(struct timeval) * 2); utsbuf[0].tv_sec = sb->st_atime; utsbuf[1].tv_sec = sb->st_mtime; @@ -225,6 +226,7 @@ #elif defined(HAVE_UTIME_H) || defined(HAVE_SYS_UTIME_H) struct utimbuf utbuf; + memset(&utbuf, 0, sizeof(struct utimbuf)); utbuf.actime = sb->st_atime; utbuf.modtime = sb->st_mtime; (void) utime(name, &utbuf); /* don't care if loses */ ==== //depot/projects/toehead/contrib/openpam/include/security/openpam_version.h#3 (text) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_version.h 409 2007-12-21 11:38:50Z des $ + * $Id: openpam_version.h 412 2008-01-29 19:31:46Z des $ */ #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED @@ -42,4 +42,7 @@ #define OPENPAM_VERSION 20071221 #define OPENPAM_RELEASE "Hydrangea" +/* violates reserved namespace, but can't be removed for legacy reasons */ +#define _OPENPAM + #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */ ==== //depot/projects/toehead/crypto/openssh/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,10 +1,9 @@ -$FreeBSD: src/crypto/openssh/FREEBSD-Xlist,v 1.3 2004/02/26 10:37:34 des Exp $ +$FreeBSD: src/crypto/openssh/FREEBSD-Xlist,v 1.4 2008/02/06 23:14:24 des Exp $ *.0 */.cvsignore -.cvsignore -autom4te* -config.h.in -configure -contrib -regress/*.[0-9] -stamp-h.in +*autom4te* +*config.h.in +*configure +*contrib +*regress/*.[0-9] +*stamp-h.in ==== //depot/projects/toehead/crypto/openssh/FREEBSD-upgrade#2 (text+ko) ==== @@ -12,12 +12,12 @@ 2) Unpack the tarball in a suitable directory. + $ tar xf openssh-X.YpZ.tar.gz \ + -X /usr/src/crypto/openssh/FREEBSD-Xlist + 3) Remove trash: - $ sh -c 'while read glob ; do rm -rvf $glob ; done' \ - </usr/src/crypto/openssh/FREEBSD-Xlist - - Make sure that took care of everything, and if it didn't, make sure + Make sure -X took care of everything, and if it didn't, make sure to update FREEBSD-Xlist so you won't miss it the next time. A good way to do this is to run a test import and see if any new files show up: @@ -134,4 +134,4 @@ -- des@FreeBSD.org -$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.12 2006/10/02 12:39:28 des Exp $ +$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.13 2008/02/06 23:14:24 des Exp $ ==== //depot/projects/toehead/etc/periodic/security/100.chksetuid#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.9 2007/11/23 13:00:31 ru Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.11 2008/02/03 00:33:05 des Exp $ # # If there is a global system configuration file, suck it in. @@ -43,22 +43,16 @@ [Yy][Ee][Ss]) echo "" echo 'Checking setuid files and devices:' - # XXX Note that there is the possibility of overrunning the args to ls - MP=`mount -t ufs,zfs | egrep -v " no(suid|exec)" | awk '{ print $3 }' | sort` - if [ -n "${MP}" ] - then - set ${MP} - while [ $# -ge 1 ]; do - mount=$1 - shift - find $mount -xdev -type f \ - \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ - \( -perm -u+s -or -perm -g+s \) -print0 - done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort -k 11 | - check_diff setuid - "${host} setuid diffs:" - rc=$? - fi;; - *) rc=0;; + MP=`mount -t ufs,zfs | awk '$0 !~ /no(suid|exec)/ { print $3 }'` + find -sx $MP /dev/null -type f \ + \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ + \( -perm -u+s -or -perm -g+s \) -exec ls -liTd \{\} \+ | + check_diff setuid - "${host} setuid diffs:" + rc=$? + ;; + *) + rc=0 + ;; esac exit $rc ==== //depot/projects/toehead/etc/rc.d/dhclient#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dhclient,v 1.30 2007/12/08 22:27:18 dougb Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.31 2008/02/01 23:43:58 brooks Exp $ # # PROVIDE: dhclient @@ -21,7 +21,11 @@ if [ -x /bin/pgrep ]; then pids=`/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then - exit 0 + sleep 1 + pids=`/bin/pgrep -f "dhclient: $ifn(\$| .*)"` + if [ -n "$pids" ]; then + exit 0 + fi fi fi ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#5 (text+ko) ==== @@ -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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.9 2008/01/28 21:40:10 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $ */ #ifndef _KGDB_H_ @@ -33,6 +33,7 @@ extern kvm_t *kvm; extern char *kernel; +extern bfd *kern_bfd; struct kthr { struct kthr *next; @@ -49,6 +50,7 @@ void kgdb_add_kld_cmd(char *, int); void kgdb_auto_load_klds(void); +void kgdb_kld_init(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); void kgdb_trgt_store_registers(int); ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ==== @@ -25,32 +25,39 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.3 2008/01/28 21:45:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6 2008/01/29 23:44:34 jhb Exp $"); #include <sys/param.h> #include <sys/stat.h> +#include <fcntl.h> +#include <kvm.h> #include <libgen.h> -#include <kvm.h> #include <defs.h> +#include <command.h> +#include <completer.h> +#include <environ.h> #include <frame-unwind.h> #include <inferior.h> #include <objfiles.h> #include <gdbcore.h> #include <language.h> +#include <solist.h> #include "kgdb.h" -/* - * TODO - * - * - Use 'target_read_memory()' instead of kvm_read(). - * - Hook into the solib stuff perhaps? - */ +struct lm_info { + CORE_ADDR base_address; +}; /* Offsets of fields in linker_file structure. */ static CORE_ADDR off_address, off_filename, off_pathname, off_next; +/* KVA of 'linker_path' which corresponds to the kern.module_path sysctl .*/ +static CORE_ADDR module_path_addr; + +static struct target_so_ops kld_so_ops; + static int kld_ok (char *path) { @@ -68,7 +75,6 @@ * - filename (e.g. foo.ko) */ static const char *kld_suffixes[] = { - ".symbols", ".debug", "", NULL @@ -102,7 +108,6 @@ static int find_kld_path (char *filename, char *path, size_t path_size) { - CORE_ADDR module_path_addr; char *module_path; char *kernel_dir, *module_dir, *cp; int error; @@ -113,7 +118,6 @@ if (check_kld_path(path, path_size)) return (1); } - module_path_addr = kgdb_parse("linker_path"); if (module_path_addr != 0) { target_read_string(module_path_addr, &module_path, PATH_MAX, &error); @@ -137,25 +141,12 @@ static CORE_ADDR read_pointer (CORE_ADDR address) { - union { - uint32_t d32; - uint64_t d64; - } val; + CORE_ADDR value; - switch (TARGET_PTR_BIT) { - case 32: - if (kvm_read(kvm, address, &val.d32, sizeof(val.d32)) != - sizeof(val.d32)) - return (0); - return (val.d32); - case 64: - if (kvm_read(kvm, address, &val.d64, sizeof(val.d64)) != - sizeof(val.d64)) - return (0); - return (val.d64); - default: - return (0); - } + if (target_read_memory(address, (char *)&value, TARGET_PTR_BIT / 8) != + 0) + return (0); + return (extract_unsigned_integer(&value, TARGET_PTR_BIT / 8)); } /* @@ -303,78 +294,159 @@ } static void -dummy_cleanup (void *arg) +kld_relocate_section_addresses (struct so_list *so, struct section_table *sec) +{ + + sec->addr += so->lm_info->base_address; + sec->endaddr += so->lm_info->base_address; +} + +static void +kld_free_so (struct so_list *so) +{ + + xfree(so->lm_info); +} + +static void +kld_clear_solib (void) +{ +} + +static void +kld_solib_create_inferior_hook (void) { } static void -load_single_kld (CORE_ADDR kld) +kld_special_symbol_handling (void) +{ +} + +static struct so_list * +kld_current_sos (void) { - CORE_ADDR address; - char kldpath[PATH_MAX]; - char *path, *filename; - int errcode, path_ok; + struct so_list *head, **prev, *new; + CORE_ADDR kld, kernel; + char *path; + int error; + + prev = &head; + + /* + * Walk the list of linker files creating so_list entries for + * each non-kernel file. + */ + kernel = kgdb_parse("linker_kernel_file"); + for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0; + kld = read_pointer(kld + off_next)) { + /* Skip the main kernel file. */ + if (kld == kernel) + continue; + + new = xmalloc(sizeof(*new)); + memset(new, 0, sizeof(*new)); - /* Try to read this linker file's filename. */ - target_read_string(read_pointer(kld + off_filename), &filename, - PATH_MAX, &errcode); - if (errcode) - error("Unable to read kld filename"); + new->lm_info = xmalloc(sizeof(*new->lm_info)); + new->lm_info->base_address = 0; - make_cleanup(xfree, filename); - path_ok = 0; + /* Read the base filename and store it in so_original_name. */ + target_read_string(read_pointer(kld + off_filename), + &path, sizeof(new->so_original_name), &error); + if (error != 0) { + warning("kld_current_sos: Can't read filename: %s\n", + safe_strerror(error)); + free_so(new); + continue; + } + strlcpy(new->so_original_name, path, + sizeof(new->so_original_name)); + xfree(path); - /* Try to read this linker file's pathname. */ - if (off_pathname != 0) { - target_read_string(read_pointer(kld + off_pathname), &path, - PATH_MAX, &errcode); - if (errcode == 0) { - make_cleanup(xfree, path); + /* + * Try to read the pathname (if it exists) and store + * it in so_name. + */ + if (off_pathname != 0) { + target_read_string(read_pointer(kld + off_pathname), + &path, sizeof(new->so_name), &error); + if (error != 0) { + warning( + "kld_current_sos: Can't read pathname for \"%s\": %s\n", + new->so_original_name, + safe_strerror(error)); + strlcpy(new->so_name, new->so_original_name, + sizeof(new->so_name)); + } else { + strlcpy(new->so_name, path, + sizeof(new->so_name)); + xfree(path); + } + } else + strlcpy(new->so_name, new->so_original_name, + sizeof(new->so_name)); - /* - * If we have a pathname, try to load the kld - * from there. - */ - strlcpy(kldpath, path, sizeof(kldpath)); - if (check_kld_path(kldpath, sizeof(kldpath))) - path_ok = 1; + /* Read this kld's base address. */ + new->lm_info->base_address = read_pointer(kld + off_address); + if (new->lm_info->base_address == 0) { + warning( + "kld_current_sos: Invalid address for kld \"%s\"", + new->so_original_name); + free_so(new); + continue; } + + /* Append to the list. */ + *prev = new; + prev = &new->next; } - /* - * If we didn't get a pathname from the linker file path, try - * to find this kld in the various search paths. - */ - if (!path_ok && !find_kld_path(filename, kldpath, sizeof(kldpath))) - error("Unable to find kld file for \"%s\".", filename); + return (head); +} + +static int +kld_open_symbol_file_object (void *from_ttyp) +{ - /* Read this kld's base address and add its symbols. */ - address = read_pointer(kld + off_address); - if (address == 0) - error("Invalid address for kld \"%s\"", filename); + return (0); +} - load_kld(kldpath, address, 0, 0); +static int +kld_in_dynsym_resolve_code (CORE_ADDR pc) +{ - printf_unfiltered("Loaded symbols for kld \"%s\" from \"%s\"\n", - filename, path); + return (0); } static int -load_kld_stub (void *arg) +kld_find_and_open_solib (char *solib, unsigned o_flags, char **temp_pathname) { - CORE_ADDR kld = *(CORE_ADDR *)arg; + char path[PATH_MAX]; + int fd; + + *temp_pathname = NULL; + if (!find_kld_path(solib, path, sizeof(path))) { + errno = ENOENT; + return (-1); + } + fd = open(path, o_flags, 0); + if (fd >= 0) + *temp_pathname = xstrdup(path); + return (fd); +} - load_single_kld(kld); +static int +load_klds_stub (void *arg) +{ - return (1); + SOLIB_ADD(NULL, 1, ¤t_target, auto_solib_add); + return (0); } void -kgdb_auto_load_klds (void) +kgdb_kld_init (void) { - struct cleanup *cleanup; - CORE_ADDR kld, kernel; - int loaded_kld; + struct cmd_list_element *c; /* Compute offsets of relevant members in struct linker_file. */ off_address = kgdb_parse("&((struct linker_file *)0)->address"); @@ -384,24 +456,24 @@ if (off_address == 0 || off_filename == 0 || off_next == 0) return; - /* Walk the list of linker files auto-loading klds. */ - cleanup = make_cleanup(dummy_cleanup, NULL); - loaded_kld = 0; - kld = kgdb_parse("linker_files.tqh_first"); - kernel = kgdb_parse("linker_kernel_file"); - for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0; - kld = read_pointer(kld + off_next)) { - /* Skip the main kernel file. */ - if (kld == kernel) - continue; + module_path_addr = kgdb_parse("linker_path"); + + kld_so_ops.relocate_section_addresses = kld_relocate_section_addresses; + kld_so_ops.free_so = kld_free_so; + kld_so_ops.clear_solib = kld_clear_solib; + kld_so_ops.solib_create_inferior_hook = kld_solib_create_inferior_hook; + kld_so_ops.special_symbol_handling = kld_special_symbol_handling; + kld_so_ops.current_sos = kld_current_sos; + kld_so_ops.open_symbol_file_object = kld_open_symbol_file_object; + kld_so_ops.in_dynsym_resolve_code = kld_in_dynsym_resolve_code; + kld_so_ops.find_and_open_solib = kld_find_and_open_solib; - if (catch_errors(load_kld_stub, &kld, - "Error while reading kld symbols:\n", RETURN_MASK_ALL)) - loaded_kld = 1; - } + current_target_so_ops = &kld_so_ops; - do_cleanups(cleanup); + catch_errors(load_klds_stub, NULL, NULL, RETURN_MASK_ALL); - if (loaded_kld) - reinit_frame_cache(); + c = add_com("add-kld", class_files, kgdb_add_kld_cmd, + "Usage: add-kld FILE\n\ +Load the symbols from the kernel loadable module FILE."); + set_cmd_completer(c, filename_completer); } ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/main.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.13 2008/01/28 20:31:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.14 2008/01/29 23:37:59 jhb Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -204,7 +204,6 @@ kgdb_init_target(void) { CORE_ADDR bufp; - bfd *kern_bfd; int size, rseq, wseq; int kern_desc; char c; @@ -228,7 +227,6 @@ } set_gdbarch_from_file (kern_bfd); - bfd_close(kern_bfd); symbol_file_add_main (kernel, 0); if (remote) ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#5 (text+ko) ==== @@ -25,16 +25,18 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.8 2008/01/28 21:40:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.10 2008/01/29 23:44:34 jhb Exp $"); #include <sys/param.h> #include <sys/proc.h> #include <sys/sysctl.h> #include <sys/user.h> +#include <err.h> #include <kvm.h> #include <defs.h> #include <command.h> +#include <exec.h> #include <frame-unwind.h> #include <gdbthread.h> #include <inferior.h> @@ -45,6 +47,8 @@ static struct target_ops kgdb_trgt_ops; +bfd *kern_bfd; + #define KERNOFF (kgdb_kernbase ()) #define INKERNEL(x) ((x) >= KERNOFF) @@ -81,11 +85,8 @@ static void kgdb_trgt_files_info(struct target_ops *target) { - struct target_ops *tb; - tb = find_target_beneath(target); - if (tb->to_files_info != NULL) - tb->to_files_info(tb); + print_section_info(target, kern_bfd); } static void @@ -207,7 +208,7 @@ kgdb_trgt_ops.to_magic = OPS_MAGIC; kgdb_trgt_ops.to_shortname = "kernel"; - kgdb_trgt_ops.to_longname = "kernel core files."; + kgdb_trgt_ops.to_longname = "kernel core files"; kgdb_trgt_ops.to_doc = "Kernel core files."; kgdb_trgt_ops.to_stratum = thread_stratum; kgdb_trgt_ops.to_has_memory = 1; @@ -222,6 +223,12 @@ kgdb_trgt_ops.to_store_registers = kgdb_trgt_store_registers; kgdb_trgt_ops.to_thread_alive = kgdb_trgt_thread_alive; kgdb_trgt_ops.to_xfer_memory = kgdb_trgt_xfer_memory; + + if (build_section_table(kern_bfd, &kgdb_trgt_ops.to_sections, + &kgdb_trgt_ops.to_sections_end) != 0) + errx(1, "\"%s\": can't find the file sections: %s", + kernel, bfd_errmsg(bfd_get_error())); + add_target(&kgdb_trgt_ops); push_target(&kgdb_trgt_ops); @@ -236,8 +243,5 @@ "Set current process context"); add_com ("tid", class_obscure, kgdb_set_tid_cmd, "Set current thread context"); - add_com ("add-kld", class_files, kgdb_add_kld_cmd, - "Usage: add-kld FILE\n\ -Load the symbols from the kernel loadable module FILE."); - kgdb_auto_load_klds(); + kgdb_kld_init(); } ==== //depot/projects/toehead/include/pthread_np.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802070431.m174Vdsp002441>