Date: Sun, 24 Jan 2010 16:30:26 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 173640 for review Message-ID: <201001241630.o0OGUQPE071809@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=173640 Change 173640 by mav@mav_mavbook on 2010/01/24 16:29:40 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/Makefile.inc1#14 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#24 integrate .. //depot/projects/scottl-camlock/src/bin/date/date.1#3 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#6 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/netcat.c#5 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#8 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/devfs#2 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libsupc++/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_entry_from_file.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_zip.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#11 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getutxent.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/opendir.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/pututxline.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/ttyname.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/uname.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/utxdb.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/gl_ES.ISO8859-1.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/wait.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libfetch/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_lastlog/pam_lastlog.8#2 integrate .. //depot/projects/scottl-camlock/src/lib/libtacplus/taclib.c#4 integrate .. //depot/projects/scottl-camlock/src/libexec/comsat/comsat.8#2 integrate .. //depot/projects/scottl-camlock/src/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/scottl-camlock/src/release/i386/fixit_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/bridge/crunch.conf#5 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/qemu/crunch.conf#2 integrate .. //depot/projects/scottl-camlock/src/rescue/rescue/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#12 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#35 integrate .. //depot/projects/scottl-camlock/src/sbin/init/init.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mdconfig/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/mdconfig/mdconfig.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.8#5 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/reboot.8#2 integrate .. //depot/projects/scottl-camlock/src/share/doc/usd/05.dc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/share/doc/usd/06.bc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/share/doc/usd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_join.3#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/sysexits.3#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/hier.7#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#15 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/kthread.9#4 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.lib.mk#5 integrate .. //depot/projects/scottl-camlock/src/share/mk/sys.mk#3 integrate .. //depot/projects/scottl-camlock/src/share/security/lomac-policy.contexts#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#38 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#31 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/XENHVM#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_reg.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_syscall.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CRB#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#48 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/changes.txt#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adfile.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adisasm.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adwalk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmextern.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmrestag.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtable.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/getopt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompile.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asldefine.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslerror.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfiles.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfold.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslglobal.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllength.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllisting.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslload.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllookup.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmain.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asloperands.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslopt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslresource.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslstubs.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltransform.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltree.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltypes.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslutils.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbcmds.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbexec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbinput.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbstats.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmbuffer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmnames.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmresrcl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmresrcs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswexec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswload.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswscope.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswstate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evevent.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpeblk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evregion.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evrgnini.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evsci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evxfevnt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evxfregn.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exconfig.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exconvrt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/excreate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exdump.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exfield.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exfldio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exmutex.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exnames.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg1.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg2.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg3.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg6.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exprep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exregion.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exresnte.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exresolv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exresop.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exstore.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exstoren.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exstorob.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exsystem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwacpi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwgpe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwregs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwsleep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwtimer.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acapps.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/accommon.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acconfig.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdebug.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdisasm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdispat.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acevents.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acexcep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acglobal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/achware.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acinterp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/aclocal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acmacros.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acnames.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acnamesp.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acobject.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acopcode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acoutput.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acparser.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpi.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpiosxf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpixf.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpredef.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acresrc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acrestyp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acstruct.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actables.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl1.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl2.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actypes.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acutils.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/amlcode.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/amlresrc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/platform/acenv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/platform/acgcc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsaccess.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsalloc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsdump.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nseval.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsinit.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsload.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsnames.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsobject.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nspredef.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nswalk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfname.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/osunixxf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psargs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psloop.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psopcode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psparse.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psscope.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/pstree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/pswalk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psxface.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsaddr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rscalc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rscreate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsdump.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsinfo.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsirq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rslist.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsmemory.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbfadt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbfind.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbinstal.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbxfroot.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utalloc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utcache.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utdebug.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utdelete.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/uteval.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utglobal.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utids.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utinit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utlock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utmath.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utmisc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utmutex.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utobject.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utresrc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utstate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/uttrack.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_panasonic.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_wmi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdHardware.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSchedule.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_if.m#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_package.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_powerres.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_smbat.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata_if.m#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/pcii.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/tnt4882.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/upd7210.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/upd7210.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#30 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#40 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kthread.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/adm5120_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/alchemy_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_spi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/files.ar71xx#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/pcf2123_rtc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/pcf2123reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/obio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeonreg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_bus_octeonusart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_cpu_octeonusart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX.hints#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1-32#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1.hints#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/QEMU#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/idt/idt_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/elf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/md_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/trap.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/malta_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/db_trace.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_trampoline.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/locore.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_header.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsmount.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsnode.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#24 integrate .. //depot/projects/scottl-camlock/src/sys/pci/nfsmb.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#26 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#29 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/sys/cdefs.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kthread.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#40 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#31 integrate .. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#22 integrate .. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/at/at.man#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/USD.doc/bc#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/bc.1#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/bc.library#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/bc.y#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/extern.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/pathnames.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/scan.l#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/USD.doc/dc#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/bcode.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/bcode.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/dc.1#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/dc.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/extern.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/inout.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/mem.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/stack.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/getent/getent.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/last/last.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/last/last.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ncplist/ncplist.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/talk.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unifdef/unifdef.1#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unifdef/unifdef.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unifdef/unifdefall.sh#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/users/users.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/w.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/who.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ac/ac.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidb/acpidb.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/burncd/burncd.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm_smail/ctm_smail.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/extattr/rmextattr.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.sh#8 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/newsyslog.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/newsyslog.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/lib.h#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/updating/main.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/rwhod.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/yp_main.c#6 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.361 2010/01/11 17:58:15 bz Exp $ +# $FreeBSD: src/Makefile,v 1.363 2010/01/19 15:34:16 ed Exp $ # # The user-driven targets are: # ==== //depot/projects/scottl-camlock/src/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.637 2010/01/14 23:27:23 jilles Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.639 2010/01/23 19:29:42 antoine Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1114,7 +1114,7 @@ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus lib/libulog \ + lib/libradius lib/libsbuf lib/libtacplus \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} lib/libdwarf lib/libproc @@ -1136,14 +1136,16 @@ _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L -.if ${MK_OPENSSH} != "no" -_secure_lib_libssh= secure/lib/libssh -secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ lib/libcrypt__L +.endif +.if ${MK_OPENSSH} != "no" +_secure_lib_libssh= secure/lib/libssh +secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L .endif .endif @@ -1151,6 +1153,10 @@ _secure_lib= secure/lib .endif +.if ${MK_GSSAPI} != "no" +_lib_libgssapi= lib/libgssapi +.endif + .if ${MK_IPX} != "no" _lib_libipx= lib/libipx .endif @@ -1163,7 +1169,6 @@ _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm _kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5 -_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.222 2010/01/14 05:35:32 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.224 2010/01/22 23:19:48 delphij 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,16 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd +OLD_FILES+=usr/share/doc/papers/bc.ascii.gz +OLD_FILES+=usr/share/doc/papers/dc.ascii.gz +# 20100120: replacing GNU bc/dc with BSDL versions +OLD_FILES+=usr/share/examples/bc/ckbook.b +OLD_FILES+=usr/share/examples/bc/pi.b +OLD_FILES+=usr/share/examples/bc/primes.b +OLD_FILES+=usr/share/examples/bc/twins.b +OLD_FILES+=usr/share/info/dc.info.gz +OLD_DIRS+=usr/share/examples/bc # 20100114: removal of ttyslot(3) OLD_FILES+=usr/share/man/man3/ttyslot.3.gz # 20100113: remove utmp.h, replace it by utmpx.h ==== //depot/projects/scottl-camlock/src/bin/date/date.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.75 2007/06/02 20:15:59 remko Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.76 2010/01/21 17:25:12 ed Exp $ .\" .Dd June 2, 2007 .Dt DATE 1 @@ -299,7 +299,7 @@ .El .Sh FILES .Bl -tag -width /var/log/messages -compact -.It Pa /var/log/wtmp +.It Pa /var/log/utx.log record of date resets and time changes .It Pa /var/log/messages record of the user setting the time @@ -406,9 +406,9 @@ .Sh SEE ALSO .Xr locale 1 , .Xr gettimeofday 2 , +.Xr getutxent 3 , .Xr strftime 3 , .Xr strptime 3 , -.Xr utmp 5 , .Xr timed 8 .Rs .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD" ==== //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#6 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.48 2008/09/19 13:24:41 sobrado Exp $ +.\" $OpenBSD: nc.1,v 1.50 2009/06/05 06:47:12 jmc Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -25,9 +25,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.14 2009/07/11 17:35:55 cperciva Exp $ +.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.15 2010/01/19 18:45:29 delphij Exp $ .\" -.Dd May 6 2008 +.Dd June 5 2009 .Dt NC 1 .Os .Sh NAME @@ -46,6 +46,7 @@ .Op Fl p Ar source_port .Op Fl s Ar source_ip_address .Op Fl T Ar ToS +.Op Fl V Ar fib .Op Fl w Ar timeout .Op Fl X Ar proxy_protocol .Oo Xo @@ -208,6 +209,9 @@ Specifies to use Unix Domain Sockets. .It Fl u Use UDP instead of the default option of TCP. +.It Fl V Ar fib +Set the routing table (FIB). +The default is 0. .It Fl v Have .Nm @@ -449,6 +453,7 @@ .Ex -std .Sh SEE ALSO .Xr cat 1 , +.Xr setfib 1 , .Xr ssh 1 , .Xr tcp 4 .Sh AUTHORS ==== //depot/projects/scottl-camlock/src/contrib/netcat/netcat.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.92 2008/09/19 13:24:41 sobrado Exp $ */ +/* $OpenBSD: netcat.c,v 1.93 2009/06/05 00:18:10 claudio Exp $ */ /* * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> * @@ -25,7 +25,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/contrib/netcat/netcat.c,v 1.10 2009/05/28 23:23:49 delphij Exp $ + * $FreeBSD: src/contrib/netcat/netcat.c,v 1.11 2010/01/19 18:45:29 delphij Exp $ */ /* @@ -36,6 +36,7 @@ #include <sys/limits.h> #include <sys/types.h> #include <sys/socket.h> +#include <sys/sysctl.h> #include <sys/time.h> #include <sys/un.h> @@ -94,6 +95,7 @@ int Oflag; /* TCP send buffer size */ int Sflag; /* TCP MD5 signature option */ int Tflag = -1; /* IP Type of Service */ +u_int rdomain; int timeout = -1; int family = AF_UNSPEC; @@ -124,6 +126,8 @@ main(int argc, char *argv[]) { int ch, s, ret, socksv, ipsec_count; + int numfibs; + size_t intsize = sizeof(int); char *host, *uport; struct addrinfo hints; struct servent *sv; @@ -137,6 +141,7 @@ { NULL, 0, NULL, 0 } }; + rdomain = 0; ret = 1; ipsec_count = 0; s = 0; @@ -146,7 +151,7 @@ sv = NULL; while ((ch = getopt_long(argc, argv, - "46e:DEdhi:jklnoI:O:P:p:rSs:tT:Uuvw:X:x:z", + "46DdEe:hI:i:jklnO:oP:p:rSs:tT:UuV:vw:X:x:z", longopts, NULL)) != -1) { switch (ch) { case '4': @@ -229,6 +234,14 @@ case 'u': uflag = 1; break; + case 'V': + if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 0) == -1) + errx(1, "Multiple FIBS not supported"); + rdomain = (unsigned int)strtonum(optarg, 0, + numfibs - 1, &errstr); + if (errstr) + errx(1, "FIB %s: %s", errstr, optarg); + break; case 'v': vflag = 1; break; @@ -550,6 +563,11 @@ add_ipsec_policy(s, ipsec_policy[1]); #endif + if (rdomain) { + if (setfib(rdomain) == -1) + err(1, "setfib"); + } + /* Bind to a local port or source address if specified. */ if (sflag || pflag) { struct addrinfo ahints, *ares; @@ -620,6 +638,11 @@ res0->ai_protocol)) < 0) continue; + if (rdomain) { + if (setfib(rdomain) == -1) + err(1, "setfib"); + } + ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x)); if (ret == -1) err(1, NULL); @@ -930,6 +953,7 @@ \t-t Answer TELNET negotiation\n\ \t-U Use UNIX domain socket\n\ \t-u UDP mode\n\ + \t-V fib Specify alternate routing table (FIB)\n\ \t-v Verbose\n\ \t-w secs\t Timeout for connects and final net reads\n\ \t-X proto Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\ @@ -974,8 +998,8 @@ "usage: nc [-46DdhklnorStUuvz] [-I length] [-i interval] [-O length]\n" #endif "\t [-P proxy_username] [-p source_port] [-s source_ip_address] [-T ToS]\n" - "\t [-w timeout] [-X proxy_protocol] [-x proxy_address[:port]] [hostname]\n" - "\t [port]\n"); + "\t [-V fib] [-w timeout] [-X proxy_protocol]\n" + "\t [-x proxy_address[:port]] [hostname] [port]\n"); if (ret) exit(1); } ==== //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.341 2009/12/29 20:20:51 trasz Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.342 2010/01/22 23:19:48 delphij Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -160,6 +160,10 @@ usd 04.csh .. + 05.dc + .. + 06.bc + .. 07.mail .. 10.exref ==== //depot/projects/scottl-camlock/src/etc/rc.d/devfs#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.12 2006/01/21 14:31:45 matteo Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.13 2010/01/23 11:42:31 kib Exp $ # # PROVIDE: devfs @@ -44,7 +44,7 @@ while read action devicelist parameter; do case "${action}" in l*) for device in ${devicelist}; do - if [ -c ${device} -a ! -e ${parameter} ]; then + if [ ! -e ${parameter} ]; then ln -fs ${device} ${parameter} fi done ==== //depot/projects/scottl-camlock/src/gnu/lib/libstdc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.63 2008/12/31 07:39:23 imp Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.64 2010/01/22 14:09:15 sepotvin Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -21,6 +21,7 @@ CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ -Wno-deprecated +PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} DPADD= ${LIBM} LDADD= -lm ==== //depot/projects/scottl-camlock/src/gnu/lib/libsupc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.9 2007/05/19 04:25:56 kan Exp $ +# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.10 2010/01/22 14:09:15 sepotvin Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -23,6 +23,7 @@ CFLAGS+= -I${.CURDIR}/../libstdc++ -I. CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections +PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} HDRS= exception new typeinfo cxxabi.h exception_defines.h INCS= ${HDRS:S;^;${SRCDIR}/;} ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -1,13 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.99 2008/09/21 22:02:26 sam Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.100 2010/01/20 21:30:52 gabor Exp $ .include <bsd.own.mk> -SUBDIR= bc \ - ${_binutils} \ +SUBDIR= ${_binutils} \ ${_cc} \ ${_cpio} \ ${_cvs} \ - dc \ dialog \ diff \ diff3 \ ==== //depot/projects/scottl-camlock/src/lib/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.240 2009/12/11 14:15:55 ed Exp $ +# $FreeBSD: src/lib/Makefile,v 1.241 2010/01/21 16:56:27 ed Exp $ .include <bsd.own.mk> @@ -21,7 +21,6 @@ # librpcsvc must be built before libpam. # libsbuf must be built before libcam. # libtacplus must be built before libpam. -# libulog must be built before libpam. # libutil must be built before libpam. # libypclnt must be built before libpam. # libgssapi must be built before librpcsec_gss @@ -31,7 +30,7 @@ SUBDIR= ${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm msun \ libmd \ ncurses ${_libnetgraph} libradius librpcsvc libsbuf \ - libtacplus libulog libutil ${_libypclnt} libalias libarchive \ + libtacplus libutil ${_libypclnt} libalias libarchive \ ${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ @@ -39,9 +38,9 @@ ${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \ ${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \ ${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ - ${_libsmdb} \ - ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \ - libugidfw ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \ + ${_libsmdb} ${_libsmutil} libstand \ + ${_libtelnet} ${_libthr} libthread_db libufs libugidfw libulog \ + ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \ ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) ==== //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_link_resolver.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.5 2009/12/28 03:05:31 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.6 2010/01/23 07:57:17 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -181,8 +181,10 @@ /* If it has only one link, then we're done. */ if (archive_entry_nlink(*e) == 1) return; - /* Directories never have hardlinks. */ - if (archive_entry_filetype(*e) == AE_IFDIR) + /* Directories, devices never have hardlinks. */ + if (archive_entry_filetype(*e) == AE_IFDIR + || archive_entry_filetype(*e) == AE_IFBLK + || archive_entry_filetype(*e) == AE_IFCHR) return; switch (res->strategy) { ==== //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.54 2009/12/29 05:30:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.55 2010/01/23 07:52:13 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -57,6 +57,7 @@ static int build_stream(struct archive_read *); static int choose_format(struct archive_read *); +static int cleanup_filters(struct archive_read *); static struct archive_vtable *archive_read_vtable(void); static int _archive_read_close(struct archive *); static int _archive_read_finish(struct archive *); @@ -393,14 +394,13 @@ free(filter); return (r); } + a->filter = filter; /* Verify the filter by asking it for some data. */ __archive_read_filter_ahead(filter, 1, &avail); if (avail < 0) { - /* If the read failed, bail out now. */ - free(filter); - return (avail); + cleanup_filters(a); + return (ARCHIVE_FATAL); } - a->filter = filter; } } @@ -738,18 +738,10 @@ /* TODO: Clean up the formatters. */ - /* Clean up the filter pipeline. */ - while (a->filter != NULL) { - struct archive_read_filter *t = a->filter->upstream; - if (a->filter->close != NULL) { - r1 = (a->filter->close)(a->filter); - if (r1 < r) - r = r1; - } - free(a->filter->buffer); - free(a->filter); - a->filter = t; - } + /* Release the filter objects. */ + r1 = cleanup_filters(a); + if (r1 < r) + r = r1; /* Release the bidder objects. */ n = sizeof(a->bidders)/sizeof(a->bidders[0]); @@ -764,6 +756,25 @@ return (r); } +static int +cleanup_filters(struct archive_read *a) +{ + int r = ARCHIVE_OK; + /* Clean up the filter pipeline. */ + while (a->filter != NULL) { + struct archive_read_filter *t = a->filter->upstream; + if (a->filter->close != NULL) { + int r1 = (a->filter->close)(a->filter); + if (r1 < r) + r = r1; + } + free(a->filter->buffer); + free(a->filter); + a->filter = t; + } + return r; +} + /* * Release memory and other resources. */ ==== //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_entry_from_file.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_disk_entry_from_file.c,v 1.4 2009/12/28 02:14:09 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_disk_entry_from_file.c,v 1.5 2010/01/23 07:54:15 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H /* Mac OSX requires sys/types.h before sys/acl.h. */ @@ -121,18 +121,27 @@ */ #if HAVE_FSTAT if (fd >= 0) { - if (fstat(fd, &s) != 0) - return (ARCHIVE_FATAL); + if (fstat(fd, &s) != 0) { + archive_set_error(&a->archive, errno, + "Can't fstat"); + return (ARCHIVE_FAILED); + } } else #endif >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001241630.o0OGUQPE071809>