From owner-p4-projects@FreeBSD.ORG Mon Jan 5 15:34:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32EDC106566B; Mon, 5 Jan 2009 15:34:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD1CE106567D for ; Mon, 5 Jan 2009 15:34:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8B518FC13 for ; Mon, 5 Jan 2009 15:34:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05FY9AL018664 for ; Mon, 5 Jan 2009 15:34:09 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05FY9ig018662 for perforce@freebsd.org; Mon, 5 Jan 2009 15:34:09 GMT (envelope-from nwhitehorn@freebsd.org) Date: Mon, 5 Jan 2009 15:34:09 GMT Message-Id: <200901051534.n05FY9ig018662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 155654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jan 2009 15:34:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=155654 Change 155654 by nwhitehorn@nwhitehorn_trantor on 2009/01/05 15:33:51 IFC Affected files ... .. //depot/projects/ppc-g5/ObsoleteFiles.inc#7 integrate .. //depot/projects/ppc-g5/contrib/file/AUTHORS#1 branch .. //depot/projects/ppc-g5/contrib/file/COPYING#1 branch .. //depot/projects/ppc-g5/contrib/file/ChangeLog#2 integrate .. //depot/projects/ppc-g5/contrib/file/FREEBSD-upgrade#2 delete .. //depot/projects/ppc-g5/contrib/file/INSTALL#1 branch .. //depot/projects/ppc-g5/contrib/file/LEGAL.NOTICE#2 delete .. //depot/projects/ppc-g5/contrib/file/MAINT#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/animation#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/apple#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/archive#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/audio#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/c64#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/clarion#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/commands#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/compress#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/console#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/database#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/diff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/dump#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/elf#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/erlang#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/flash#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/frame#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/games#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/hp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/iff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/images#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/inform#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/java#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/kde#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/lex#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/linux#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/llvm#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/lua#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/luks#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mup#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/netware#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/os2#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/palm#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/perl#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/printer#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/psion#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/revision#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/riff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/ruby#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/sc#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/tex#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/troff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/warc#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/weak#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/windows#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/ppc-g5/contrib/file/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/file/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/file/Makefile.std#2 delete .. //depot/projects/ppc-g5/contrib/file/NEWS#1 branch .. //depot/projects/ppc-g5/contrib/file/PORTING#2 delete .. //depot/projects/ppc-g5/contrib/file/README#2 integrate .. //depot/projects/ppc-g5/contrib/file/TODO#1 branch .. //depot/projects/ppc-g5/contrib/file/acinclude.m4#2 integrate .. //depot/projects/ppc-g5/contrib/file/aclocal.m4#2 integrate .. //depot/projects/ppc-g5/contrib/file/apprentice.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/ascmagic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/asprintf.c#1 branch .. //depot/projects/ppc-g5/contrib/file/compile#1 branch .. //depot/projects/ppc-g5/contrib/file/compress.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/config.guess#1 branch .. //depot/projects/ppc-g5/contrib/file/config.h.in#2 integrate .. //depot/projects/ppc-g5/contrib/file/config.sub#1 branch .. //depot/projects/ppc-g5/contrib/file/configure#2 integrate .. //depot/projects/ppc-g5/contrib/file/configure.ac#1 branch .. //depot/projects/ppc-g5/contrib/file/configure.in#2 delete .. //depot/projects/ppc-g5/contrib/file/elfclass.h#1 branch .. //depot/projects/ppc-g5/contrib/file/file.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/file.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/file.man#2 integrate .. //depot/projects/ppc-g5/contrib/file/fsmagic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/funcs.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/getopt_long.c#1 branch .. //depot/projects/ppc-g5/contrib/file/is_tar.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/libmagic.man#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.man#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.mime#2 delete .. //depot/projects/ppc-g5/contrib/file/magic2mime#2 delete .. //depot/projects/ppc-g5/contrib/file/mkinstalldirs#2 delete .. //depot/projects/ppc-g5/contrib/file/mygetopt.h#1 branch .. //depot/projects/ppc-g5/contrib/file/names.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/patchlevel.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/print.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/readelf.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/readelf.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/softmagic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/tar.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/test.c#2 delete .. //depot/projects/ppc-g5/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/README#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/test.c#1 branch .. //depot/projects/ppc-g5/contrib/file/vasprintf.c#1 branch .. //depot/projects/ppc-g5/lib/libc/sys/socket.2#2 integrate .. //depot/projects/ppc-g5/lib/libelf/README#1 branch .. //depot/projects/ppc-g5/lib/libmagic/Makefile#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20_desc.c#3 integrate .. //depot/projects/ppc-g5/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/ppc-g5/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/ppc-g5/share/man/man4/ae.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/cpuctl.4#3 integrate .. //depot/projects/ppc-g5/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/domain.9#3 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_bus_subr.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_if.m#4 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_standard.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofwvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.h#8 integrate .. //depot/projects/ppc-g5/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/at91dci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/musb2_otg.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2_pci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_bus.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uss820dci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_busdma.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_core.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_handle_request.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axe2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/image/uscanner2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uvscom2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/sound/uaudio2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_ural2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/tty.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/ppc-g5/sys/modules/usb2/Makefile#4 integrate .. //depot/projects/ppc-g5/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/ppc-g5/sys/net/route.c#9 integrate .. //depot/projects/ppc-g5/sys/netinet/in.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_output.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#9 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#11 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/gracklevar.h#5 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#9 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#10 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#8 integrate .. //depot/projects/ppc-g5/sys/sys/elf_common.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/protosw.h#3 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.c#4 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.h#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/globals.h#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/job.c#4 integrate .. //depot/projects/ppc-g5/usr.bin/make/main.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/make.1#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/var.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/cpucontrol/cpucontrol.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.sh#4 integrate .. //depot/projects/ppc-g5/usr.sbin/pkg_install/add/pkg_add.1#2 integrate Differences ... ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 +OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed ==== //depot/projects/ppc-g5/contrib/file/ChangeLog#2 (text+ko) ==== @@ -1,4 +1,135 @@ -2007-12-28 15:06 Christos Zoulas +2008-08-30 12:54 Christos Zoulas + + * Don't eat trailing \n in magic enties. + + * Cast defines to allow compilation using a c++ compiler. + +2008-07-26 00:59 Reuben Thomas + + * Add MIME types for special files. + + * Use access to give more accurate information for files that + can't be opened. + + * Add a TODO list. + +2008-07-02 11:15 Christos Zoulas + + * add !:strength op to adjust magic strength (experimental) + +2008-06-16 21:41 Reuben Thomas + + * Fix automake error in configure.ac. + + * Add MIME type for Psion Sketch files. + +2008-06-05 08:59 Christos Zoulas + + * Don't print warnings about bad namesize in stripped + binaries with PT_NOTE is still there, and the actual + note is gone (Jakub Jelinek) + +2008-05-28 15:12 Robert Byrnes + + * magic/Magdir/elf: + Note invalid byte order for little-endian SPARC32PLUS. + Add SPARC V9 vendor extensions and memory model. + + * src/elfclass.h: + Pass target machine to doshn (for Solaris hardware capabilities). + + * src/readelf.c (doshn): + Add support for Solaris hardware/software capabilities. + + * src/readelf.h: + Ditto. + + * src/vasprintf.c (dispatch): + Add support for ll modifier. + +2008-05-16 10:25 Christos Zoulas + + * Fix compiler warnings. + + * remove stray printf, and fix a vprintf bug. (Martin Dorey) + +2008-05-06 00:13 Robert Byrnes + + * src/Makefile.am: + Ensure that getopt_long and [v]asprintf are included in libmagic, + as needed. + + Remove unnecessary EXTRA_DIST. + + * src/Makefile.in: + Rerun automake. + + * src/vasprintf.c (dispatch): + Fix variable precision bug: be sure to step past '*'. + + * src/vasprintf.c (core): + Remove unreachable code. + + * src/apprentice.c (set_test_type): + Add cast to avoid compiler warning. + +2008-04-22 23:45 Christos Zoulas + + * Add magic submission guidelines (Abel Cheung) + + * split msdos and windows magic (Abel Cheung) + +2008-04-04 11:00 Christos Zoulas + + * >= <= is not supported, so fix the magic and warn about it. + reported by: Thien-Thi Nguyen + +2008-03-27 16:16 Robert Byrnes + + * src/readelf.c (donote): + ELF core file command name/line bug fixes and enhancements: + + Try larger offsets first to avoid false matches + from earlier data that happen to look like strings; + this primarily affected SunOS 5.x 32-bit Intel core files. + + Add support for command line (instead of just short name) + for SunOS 5.x. + + Add information about NT_PSINFO for SunOS 5.x. + + Only trim whitespace from end of command line. + +2007-02-11 01:36 Reuben Thomas + + * Change strength of ! from MULT to 0, as it matches almost + anything (Reuben Thomas) + + * Debian fixes (Reuben Thomas) + +2007-02-11 00:17 Reuben Thomas + + * Clarify UTF-8 BOM message (Reuben Thomas) + + * Add HTML comment to token list in names.h + +2007-02-04 15:50 Christos Zoulas + + * Debian fixes (Reuben Thomas) + +2007-02-04 11:31 Christos Zoulas + + * !:mime annotations in magic files (Reuben Thomas) + +2007-01-29 15:35 Christos Zoulas + + * zero out utime/utimes structs (Gavin Atkinson) + +2007-01-26 13:45 Christos Zoulas + + * reduce writable data from Diego "Flameeyes" Petten + +2007-12-28 15:06 Christos Zoulas * strtof detection @@ -6,7 +137,7 @@ * better mismatch version message -2007-12-27 11:35 Christos Zoulas +2007-12-27 11:35 Christos Zoulas * bring back some fixes from OpenBSD @@ -14,46 +145,46 @@ * fix gcc warnings -2007-12-01 19:55 Christos Zoulas +2007-12-01 19:55 Christos Zoulas * make sure we have zlib.h and libz to compile the builtin decompress code -2007-10-28 20:48 Christos Zoulas +2007-10-28 20:48 Christos Zoulas * float and double magic support (Behan Webster) -2007-10-28 20:48 Christos Zoulas +2007-10-28 20:48 Christos Zoulas * Convert fortran to a soft test (Reuben Thomas) -2007-10-23 5:25 Christos Zoulas +2007-10-23 5:25 Christos Zoulas * Add --with-filename, and --no-filename (Reuben Thomas) -2007-10-23 3:59 Christos Zoulas +2007-10-23 3:59 Christos Zoulas * Rest of the mime split (Reuben Thomas) * Make usage message generated from the flags so that they stay consistent (Reuben Thomas) -2007-10-20 3:06 Christos Zoulas +2007-10-20 3:06 Christos Zoulas * typo in comment, missing ifdef QUICK, remove unneeded code (Charles Longeau) -2007-10-17 3:33 Christos Zoulas +2007-10-17 3:33 Christos Zoulas * Fix problem printing -\012 in some entries * Separate magic type and encoding flags (Reuben Thomas) -2007-10-09 3:55 Christos Zoulas +2007-10-09 3:55 Christos Zoulas * configure fix for int64 and strndup (Reuben Thomas) -2007-09-26 4:45 Christos Zoulas +2007-09-26 4:45 Christos Zoulas * Add magic_descriptor() function. @@ -62,7 +193,7 @@ * Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson) -2007-08-19 6:30 Christos Zoulas +2007-08-19 6:30 Christos Zoulas * Make mime format consistent so that it can be easily parsed: @@ -79,38 +210,38 @@ This work was done by Reuben Thomas -2007-05-24 10:00 Christos Zoulas +2007-05-24 10:00 Christos Zoulas * Fix another integer overflow (Colin Percival) -2007-03-26 13:58 Christos Zoulas +2007-03-26 13:58 Christos Zoulas * make sure that all of struct magic_set is initialized appropriately (Brett) -2007-03-25 17:44 Christos Zoulas +2007-03-25 17:44 Christos Zoulas * reset left bytes in the buffer (Dmitry V. Levin) * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS (Peter Avalos) -2007-03-15 10:51 Christos Zoulas +2007-03-15 10:51 Christos Zoulas * fix fortran and nroff reversed tests (Dmitry V. Levin) * fix exclude option (Dmitry V. Levin) -2007-02-08 17:30 Christos Zoulas +2007-02-08 17:30 Christos Zoulas * fix integer underflow in file_printf which can lead to to exploitable heap overflow (Jean-Sebastien Guay-Lero) -2007-02-05 11:35 Christos Zoulas +2007-02-05 11:35 Christos Zoulas * make socket/pipe reading more robust -2007-01-25 16:01 Christos Zoulas +2007-01-25 16:01 Christos Zoulas * Centralize all the tests in file_buffer. @@ -184,7 +315,7 @@ * make file.c compile with gcc warnings and pass lint -2006-12-11 16:49 Christos Zoulas +2006-12-11 16:49 Christos Zoulas * fix byteswapping issue @@ -193,7 +324,7 @@ * add a few missed cases in the strength routine -2006-12-08 16:32 Christos Zoulas +2006-12-08 16:32 Christos Zoulas * store and print the line number of the magic entry for debugging. @@ -210,7 +341,7 @@ * propagate the error return from match to file_softmagic. -2006-11-25 13:35 Christos Zoulas +2006-11-25 13:35 Christos Zoulas * Don't store the current offset in the magic struct, because it needs to be restored and @@ -221,12 +352,12 @@ print it as an additional separator; print it as the only separator. -2006-11-17 10:51 Christos Zoulas +2006-11-17 10:51 Christos Zoulas * Added a -0 option to print a '\0' separator Etienne Buira -2006-10-31 15:14 Christos Zoulas +2006-10-31 15:14 Christos Zoulas * Check offset before copying (Mike Frysinger) @@ -242,7 +373,7 @@ * use calloc to initialize the ascii buffers (Jos van den Oever) -2006-06-08 11:11 Christos Zoulas +2006-06-08 11:11 Christos Zoulas * QNX fixes (Mike Gorchak) @@ -256,7 +387,7 @@ * Magic format function improvent (Karl Chen) -2006-05-03 11:11 Christos Zoulas +2006-05-03 11:11 Christos Zoulas * Pick up some elf changes and some constant fixes from SUSE @@ -264,13 +395,13 @@ * When keep going, don't print spurious newlines (Radek Vokál) -2006-04-01 12:02 Christos Zoulas +2006-04-01 12:02 Christos Zoulas * Use calloc instead of malloc (Mike Frysinger) * Fix configure script to detect wctypes.h (Mike Frysinger) -2006-03-02 16:06 Christos Zoulas +2006-03-02 16:06 Christos Zoulas * Print empty if the file is (Mike Frysinger) @@ -278,21 +409,21 @@ * Sort magic entries by strength [experimental] -2005-11-29 13:26 Christos Zoulas +2005-11-29 13:26 Christos Zoulas * Use iswprint() to convert the output string. (Bastien Nocera) -2005-10-31 8:54 Christos Zoulas +2005-10-31 8:54 Christos Zoulas * Fix regression where the core info was not completely processed (Radek Vokál) -2005-10-20 11:15 Christos Zoulas +2005-10-20 11:15 Christos Zoulas * Middle Endian magic (Diomidis Spinellis) -2005-10-17 11:15 Christos Zoulas +2005-10-17 11:15 Christos Zoulas * Open with O_BINARY for CYGWIN (Corinna Vinschen) @@ -300,39 +431,39 @@ * Look for note sections in non executables. -2005-09-20 13:33 Christos Zoulas +2005-09-20 13:33 Christos Zoulas * Don't print SVR4 Style in core files multiple times (Radek Vokál) -2005-08-27 04:09 Christos Zoulas +2005-08-27 04:09 Christos Zoulas * Cygwin changes Corinna Vinschen -2005-08-18 09:53 Christos Zoulas +2005-08-18 09:53 Christos Zoulas * Remove erroreous mention of /etc/magic in the file man page This is gentoo bug 101639. (Mike Frysinger) * Cross-compile support and detection (Mike Frysinger) -2005-08-12 10:17 Christos Zoulas +2005-08-12 10:17 Christos Zoulas * Add -h flag and dereference symlinks if POSIXLY_CORRECT is set. -2005-07-29 13:57 Christos Zoulas +2005-07-29 13:57 Christos Zoulas * Avoid search and regex buffer overflows (Kelledin) -2005-07-12 11:48 Christos Zoulas +2005-07-12 11:48 Christos Zoulas * Provide stub implementations for {v,}nsprintf() for older OS's that don't have them. * Change mbstate_t autoconf detection macro from AC_MBSTATE_T to AC_TYPE_MBSTATE_T. -2005-06-25 11:48 Christos Zoulas +2005-06-25 11:48 Christos Zoulas * Dynamically allocate the string buffers and make the default read size 256K. @@ -361,43 +492,43 @@ With CRLF, the line length was not computed correctly, and even lines of length MAXLINELEN - 1 were treated as ``very long''. -2004-12-07 14:15 Christos Zoulas +2004-12-07 14:15 Christos Zoulas * bzip2 needs a lot of input buffer space on some files before it can begin uncompressing. This makes file -z fail on some bz2 files. Fix it by giving it a copy of the file descriptor to read as much as it wants if we - have access to it. + have access to it. -2004-11-24 12:39 Christos Zoulas +2004-11-24 12:39 Christos Zoulas * Stack smash fix, and ELF more conservative reading. Jakub Bogusz -2004-11-20 18:50 Christos Zoulas +2004-11-20 18:50 Christos Zoulas * New FreeBSD version parsing code: Jon Noack - * Hackish support for ucs16 strings + * Hackish support for ucs16 strings -2004-11-13 03:07 Christos Zoulas +2004-11-13 03:07 Christos Zoulas * print the file name and line number in syntax errors. -2004 10-12 10:50 Christos Zoulas +2004 10-12 10:50 Christos Zoulas * Fix stack overwriting on 0 length strings: Tim Waugh Ned Ludd -2004-09-27 11:30 Christos Zoulas +2004-09-27 11:30 Christos Zoulas * Remove 3rd and 4th copyright clause; approved by Ian Darwin. * Fix small memory leaks; caught by: Tamas Sarlos -2004-07-24 16:33 Christos Zoulas +2004-07-24 16:33 Christos Zoulas * magic.mime update Danny Milosavljevic @@ -407,19 +538,19 @@ * errors reading elf magic Jakub Bogusz -2004-04-12 10:55 Christos Zoulas +2004-04-12 10:55 Christos Zoulas * make sure that magic formats match magic types during compilation * fix broken sgi magic file -2004-04-06 20:36 Christos Zoulas +2004-04-06 20:36 Christos Zoulas * detect present of mbstate_t Petter Reinholdtsen * magic fixes -2004-03-22 15:25 Christos Zoulas +2004-03-22 15:25 Christos Zoulas * Lots of mime fixes (Joerg Ostertag) @@ -428,7 +559,7 @@ (Edwin Groothuis) * correct cleanup in all cases; don't just close the file. - (Christos Zoulas) + (Christos Zoulas) * add gettext message catalogue support (Michael Piefel) @@ -446,37 +577,37 @@ or name and description note sizes. Reported by (Mikael Magnusson) -2004-03-09 13:55 Christos Zoulas +2004-03-09 13:55 Christos Zoulas * Fix possible memory leak on error and add missing regfree (Dmitry V. Levin) -2003-12-23 12:12 Christos Zoulas +2003-12-23 12:12 Christos Zoulas * fix -k flag (Maciej W. Rozycki) -2003-11-18 14:10 Christos Zoulas +2003-11-18 14:10 Christos Zoulas * Try to give us much info as possible on corrupt elf files. (Willy Tarreau) * Updated python bindings (Brett Funderburg) -2003-11-11 15:03 Christos Zoulas +2003-11-11 15:03 Christos Zoulas * Include file.h first, because it includes config.h breaks largefile test macros otherwise. (Paul Eggert via Lars Hecking ) -2003-10-14 21:39 Christos Zoulas +2003-10-14 21:39 Christos Zoulas * Python bindings (Brett Funderburg) * Don't lookup past the end of the buffer (Chad Hanson) * Add MAGIC_ERROR and api on magic_errno() -2003-10-08 12:40 Christos Zoulas +2003-10-08 12:40 Christos Zoulas * handle error conditions from compile as fatal (Antti Kantee) @@ -486,32 +617,32 @@ * describe magic file handling (Bryan Henderson) -2003-09-12 15:09 Christos Zoulas +2003-09-12 15:09 Christos Zoulas * update magic files. * remove largefile support from file.h; it breaks things on most OS's -2003-08-10 10:25 Christos Zoulas +2003-08-10 10:25 Christos Zoulas * fix unmapping'ing of mmaped files. -2003-07-10 12:03 Christos Zoulas +2003-07-10 12:03 Christos Zoulas * don't exit with -1 on error; always exit 1 (Marty Leisner) * restore utimes code. -2003-06-10 17:03 Christos Zoulas +2003-06-10 17:03 Christos Zoulas * make sure we don't access uninitialized memory. * pass lint * #ifdef __cplusplus in magic.h -2003-05-25 19:23 Christos Zoulas +2003-05-25 19:23 Christos Zoulas * rename cvs magic file to revision to deal with case insensitive filesystems. -2003-05-23 17:03 Christos Zoulas +2003-05-23 17:03 Christos Zoulas * documentation fixes from Michael Piefel * magic fixes (various) @@ -521,30 +652,30 @@ close files Maciej W. Rozycki +2003-04-21 20:12 Christos Zoulas * fix zsh magic -2003-04-04 16:59 Christos Zoulas +2003-04-04 16:59 Christos Zoulas * fix operand sort order in string. -2003-04-02 17:30 Christos Zoulas +2003-04-02 17:30 Christos Zoulas * cleanup namespace in magic.h -2003-04-02 13:50 Christos Zoulas +2003-04-02 13:50 Christos Zoulas * Magic additions (Alex Ott) * Fix bug that broke VPATH compilation (Peter Breitenlohner) -2003-03-28 16:03 Christos Zoulas +2003-03-28 16:03 Christos Zoulas * remove packed attribute from magic struct. * make the magic struct properly aligned. * bump version number of compiled files to 2. -2003-03-27 13:10 Christos Zoulas +2003-03-27 13:10 Christos Zoulas * separate tar detection and run it before softmagic. * fix reversed symlink test. @@ -552,7 +683,7 @@ * make separator a string instead of a char. * update manual page and sort options. -2003-03-26 11:00 Christos Zoulas +2003-03-26 11:00 Christos Zoulas * Pass lint * make NULL in magic_file mean stdin ==== //depot/projects/ppc-g5/contrib/file/MAINT#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$File: MAINT,v 1.9 2007/01/19 21:15:27 christos Exp $ +$File: MAINT,v 1.10 2008/02/05 19:08:11 christos Exp $ Maintenance notes: @@ -41,5 +41,4 @@ readelf.c file_tryelf() "unknown" -Christos Zoulas -christos@astron.com +Christos Zoulas (see README for email address) ==== //depot/projects/ppc-g5/contrib/file/Magdir/adventure#2 (text+ko) ==== @@ -73,3 +73,13 @@ >10 belong 0x0A0D1A00 >>14 string >\0 %s saved game data +# Danny Milosavljevic +# this are adrift (adventure game standard) game files, extension .taf +# depending on version magic continues with 0x93453E6139FA (V 4.0) +# 0x9445376139FA (V 3.90) +# 0x9445366139FA (V 3.80) +# this is from source (http://www.adrift.org.uk/) and I have some taf +# files, and checked them. +#0 belong 0x3C423FC9 +#>4 belong 0x6A87C2CF Adrift game file +#!:mime application/x-adrift ==== //depot/projects/ppc-g5/contrib/file/Magdir/animation#2 (text+ko) ==== @@ -8,57 +8,78 @@ # SGI and Apple formats 0 string MOVI Silicon Graphics movie file +!:mime video/x-sgi-movie 4 string moov Apple QuickTime +!:mime video/quicktime >12 string mvhd \b movie (fast start) >12 string mdra \b URL >12 string cmov \b movie (fast start, compressed header) >12 string rmra \b multiple URLs 4 string mdat Apple QuickTime movie (unoptimized) -4 string wide Apple QuickTime movie (unoptimized) -4 string skip Apple QuickTime movie (modified) -4 string free Apple QuickTime movie (modified) +!:mime video/quicktime +#4 string wide Apple QuickTime movie (unoptimized) +#!:mime video/quicktime +#4 string skip Apple QuickTime movie (modified) +#!:mime video/quicktime +#4 string free Apple QuickTime movie (modified) +#!:mime video/quicktime 4 string idsc Apple QuickTime image (fast start) -4 string idat Apple QuickTime image (unoptimized) +!:mime image/x-quicktime +#4 string idat Apple QuickTime image (unoptimized) +#!:mime image/x-quicktime 4 string pckg Apple QuickTime compressed archive +!:mime application/x-quicktime-player 4 string/B jP JPEG 2000 image +!:mime image/jp2 4 string ftyp ISO Media >8 string isom \b, MPEG v4 system, version 1 +!:mime video/mp4 >8 string iso2 \b, MPEG v4 system, part 12 revision >8 string mp41 \b, MPEG v4 system, version 1 +!:mime video/mp4 >8 string mp42 \b, MPEG v4 system, version 2 +!:mime video/mp4 >8 string mp7t \b, MPEG v4 system, MPEG v7 XML >8 string mp7b \b, MPEG v4 system, MPEG v7 binary XML >8 string/B jp2 \b, JPEG 2000 +!:mime image/jp2 >8 string 3gp \b, MPEG v4 system, 3GPP +!:mime video/3gpp >>11 byte 4 \b v4 (H.263/AMR GSM 6.10) >>11 byte 5 \b v5 (H.263/AMR GSM 6.10) >>11 byte 6 \b v6 (ITU H.264/AMR GSM 6.10) >8 string mmp4 \b, MPEG v4 system, 3GPP Mobile +!:mime video/mp4 >8 string avc1 \b, MPEG v4 system, 3GPP JVT AVC +!:mime video/3gpp >8 string/B M4A \b, MPEG v4 system, iTunes AAC-LC +!:mime audio/mp4 +>8 string/B M4V \b, MPEG v4 system, iTunes AVC-LC +!:mime video/mp4 >8 string/B M4P \b, MPEG v4 system, iTunes AES encrypted >8 string/B M4B \b, MPEG v4 system, iTunes bookmarked >8 string/B qt \b, Apple QuickTime movie >>> TRUNCATED FOR MAIL (1000 lines) <<<