PERFORCE change 137569 for review

Marcel Moolenaar marcel at FreeBSD.org
Thu Mar 13 03:37:40 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=137569

Change 137569 by marcel at marcel_xcllnt on 2008/03/13 03:37:35

	IFC @137564

Affected files ...

.. //depot/projects/e500/ObsoleteFiles.inc#10 integrate
.. //depot/projects/e500/UPDATING#10 integrate
.. //depot/projects/e500/bin/chflags/chflags.1#3 integrate
.. //depot/projects/e500/bin/chflags/chflags.c#2 integrate
.. //depot/projects/e500/bin/cp/cp.1#2 integrate
.. //depot/projects/e500/bin/cp/cp.c#3 integrate
.. //depot/projects/e500/bin/cp/utils.c#2 integrate
.. //depot/projects/e500/bin/ps/ps.1#2 integrate
.. //depot/projects/e500/bin/realpath/realpath.1#2 integrate
.. //depot/projects/e500/bin/realpath/realpath.c#2 integrate
.. //depot/projects/e500/bin/uuidgen/Makefile#1 branch
.. //depot/projects/e500/bin/uuidgen/uuidgen.1#1 branch
.. //depot/projects/e500/bin/uuidgen/uuidgen.c#1 branch
.. //depot/projects/e500/contrib/tcsh/sh.lex.c#3 integrate
.. //depot/projects/e500/etc/rc.d/mountlate#4 integrate
.. //depot/projects/e500/etc/rc.d/root#4 integrate
.. //depot/projects/e500/lib/Makefile#6 integrate
.. //depot/projects/e500/lib/libalias/libalias/Makefile#3 integrate
.. //depot/projects/e500/lib/libarchive/archive_entry.3#4 integrate
.. //depot/projects/e500/lib/libarchive/archive_entry.c#5 integrate
.. //depot/projects/e500/lib/libarchive/archive_read.3#4 integrate
.. //depot/projects/e500/lib/libarchive/archive_read.c#4 integrate
.. //depot/projects/e500/lib/libarchive/archive_read_private.h#4 integrate
.. //depot/projects/e500/lib/libarchive/archive_read_support_format_ar.c#5 integrate
.. //depot/projects/e500/lib/libarchive/archive_util.3#3 integrate
.. //depot/projects/e500/lib/libarchive/archive_write.3#3 integrate
.. //depot/projects/e500/lib/libarchive/archive_write_disk.3#2 integrate
.. //depot/projects/e500/lib/libarchive/test/Makefile#6 integrate
.. //depot/projects/e500/lib/libarchive/test/main.c#6 integrate
.. //depot/projects/e500/lib/libarchive/test/test.h#6 integrate
.. //depot/projects/e500/lib/libarchive/test/test_compat_gtar.c#2 integrate
.. //depot/projects/e500/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate
.. //depot/projects/e500/lib/libarchive/test/test_compat_zip.c#2 integrate
.. //depot/projects/e500/lib/libarchive/test/test_entry.c#3 integrate
.. //depot/projects/e500/lib/libarchive/test/test_read_format_ar.c#4 integrate
.. //depot/projects/e500/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate
.. //depot/projects/e500/lib/libarchive/test/test_write_format_ar.c#4 integrate
.. //depot/projects/e500/lib/libc/gen/Makefile.inc#6 integrate
.. //depot/projects/e500/lib/libc/gen/sem_timedwait.3#1 branch
.. //depot/projects/e500/lib/libc/gen/sem_wait.3#2 integrate
.. //depot/projects/e500/lib/libc/sys/Makefile.inc#6 integrate
.. //depot/projects/e500/lib/libc/sys/Symbol.map#7 integrate
.. //depot/projects/e500/lib/libc/sys/fcntl.2#2 integrate
.. //depot/projects/e500/lib/libc/sys/kldunload.2#2 integrate
.. //depot/projects/e500/lib/libkvm/kvm_proc.c#5 integrate
.. //depot/projects/e500/lib/libpmc/libpmc.c#3 integrate
.. //depot/projects/e500/lib/libpmc/pmc_capabilities.3#2 integrate
.. //depot/projects/e500/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/e500/lib/libthr/thread/thr_sem.c#4 integrate
.. //depot/projects/e500/lib/libthread_db/Makefile#3 integrate
.. //depot/projects/e500/lib/libutil/humanize_number.c#2 integrate
.. //depot/projects/e500/release/doc/share/misc/dev.archlist.txt#7 integrate
.. //depot/projects/e500/sbin/mount/mount.8#5 integrate
.. //depot/projects/e500/share/man/man4/uart.4#2 integrate
.. //depot/projects/e500/share/man/man4/vr.4#2 integrate
.. //depot/projects/e500/share/man/man9/DEVICE_PROBE.9#2 integrate
.. //depot/projects/e500/share/misc/committers-ports.dot#8 integrate
.. //depot/projects/e500/share/zoneinfo/leapseconds#5 integrate
.. //depot/projects/e500/share/zoneinfo/southamerica#6 integrate
.. //depot/projects/e500/sys/amd64/amd64/amd64_mem.c#2 integrate
.. //depot/projects/e500/sys/amd64/amd64/legacy.c#3 integrate
.. //depot/projects/e500/sys/amd64/amd64/machdep.c#7 integrate
.. //depot/projects/e500/sys/amd64/amd64/mem.c#2 integrate
.. //depot/projects/e500/sys/amd64/amd64/mp_machdep.c#6 integrate
.. //depot/projects/e500/sys/amd64/amd64/trap.c#6 integrate
.. //depot/projects/e500/sys/amd64/amd64/vm_machdep.c#4 integrate
.. //depot/projects/e500/sys/amd64/conf/DEFAULTS#4 integrate
.. //depot/projects/e500/sys/amd64/include/specialreg.h#6 integrate
.. //depot/projects/e500/sys/amd64/linux32/linux32_sysvec.c#5 integrate
.. //depot/projects/e500/sys/arm/arm/busdma_machdep.c#7 integrate
.. //depot/projects/e500/sys/arm/arm/nexus.c#2 integrate
.. //depot/projects/e500/sys/arm/arm/trap.c#5 integrate
.. //depot/projects/e500/sys/arm/conf/AVILA#6 integrate
.. //depot/projects/e500/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate
.. //depot/projects/e500/sys/boot/common/dev_net.c#3 integrate
.. //depot/projects/e500/sys/boot/i386/btx/btx/btx.S#3 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#10 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/console.c#5 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/copy.c#4 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/glue.c#8 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/libuboot.h#5 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/net.c#5 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/time.c#5 integrate
.. //depot/projects/e500/sys/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/e500/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/e500/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/e500/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/e500/sys/compat/freebsd32/syscalls.master#6 integrate
.. //depot/projects/e500/sys/compat/svr4/svr4_sysvec.c#2 integrate
.. //depot/projects/e500/sys/conf/NOTES#17 integrate
.. //depot/projects/e500/sys/conf/files#19 integrate
.. //depot/projects/e500/sys/conf/options#13 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi.c#7 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_cpu.c#7 integrate
.. //depot/projects/e500/sys/dev/agp/agp_i810.c#2 integrate
.. //depot/projects/e500/sys/dev/bge/if_bge.c#9 integrate
.. //depot/projects/e500/sys/dev/cpufreq/ichss.c#2 integrate
.. //depot/projects/e500/sys/dev/gem/if_gem.c#6 integrate
.. //depot/projects/e500/sys/dev/msk/if_msk.c#8 integrate
.. //depot/projects/e500/sys/dev/mxge/if_mxge.c#10 integrate
.. //depot/projects/e500/sys/dev/tsec/if_tsec.c#10 integrate
.. //depot/projects/e500/sys/dev/tsec/if_tsec.h#5 integrate
.. //depot/projects/e500/sys/dev/uart/uart.h#4 integrate
.. //depot/projects/e500/sys/dev/uart/uart_dev_ns8250.c#2 integrate
.. //depot/projects/e500/sys/dev/usb/ehci_pci.c#5 integrate
.. //depot/projects/e500/sys/dev/usb/ums.c#6 integrate
.. //depot/projects/e500/sys/dev/vr/if_vr.c#1 branch
.. //depot/projects/e500/sys/dev/vr/if_vrreg.h#1 branch
.. //depot/projects/e500/sys/dev/wpi/if_wpi.c#4 integrate
.. //depot/projects/e500/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/e500/sys/dev/wpi/if_wpivar.h#2 integrate
.. //depot/projects/e500/sys/fs/fifofs/fifo_vnops.c#6 integrate
.. //depot/projects/e500/sys/fs/procfs/procfs_ctl.c#3 integrate
.. //depot/projects/e500/sys/fs/procfs/procfs_dbregs.c#2 integrate
.. //depot/projects/e500/sys/fs/procfs/procfs_status.c#4 integrate
.. //depot/projects/e500/sys/i386/conf/DEFAULTS#4 integrate
.. //depot/projects/e500/sys/i386/cpufreq/est.c#3 integrate
.. //depot/projects/e500/sys/i386/i386/i686_mem.c#2 integrate
.. //depot/projects/e500/sys/i386/i386/k6_mem.c#2 integrate
.. //depot/projects/e500/sys/i386/i386/legacy.c#3 integrate
.. //depot/projects/e500/sys/i386/i386/mp_machdep.c#7 integrate
.. //depot/projects/e500/sys/i386/i386/sys_machdep.c#5 integrate
.. //depot/projects/e500/sys/i386/i386/trap.c#6 integrate
.. //depot/projects/e500/sys/i386/i386/vm_machdep.c#7 integrate
.. //depot/projects/e500/sys/i386/ibcs2/imgact_coff.c#5 integrate
.. //depot/projects/e500/sys/i386/include/specialreg.h#4 integrate
.. //depot/projects/e500/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/e500/sys/ia64/conf/DEFAULTS#4 integrate
.. //depot/projects/e500/sys/ia64/ia64/machdep.c#10 integrate
.. //depot/projects/e500/sys/ia64/ia64/trap.c#5 integrate
.. //depot/projects/e500/sys/ia64/include/ucontext.h#2 integrate
.. //depot/projects/e500/sys/kern/imgact_elf.c#5 integrate
.. //depot/projects/e500/sys/kern/init_sysent.c#6 integrate
.. //depot/projects/e500/sys/kern/kern_clock.c#8 integrate
.. //depot/projects/e500/sys/kern/kern_condvar.c#4 integrate
.. //depot/projects/e500/sys/kern/kern_descrip.c#9 integrate
.. //depot/projects/e500/sys/kern/kern_exec.c#8 integrate
.. //depot/projects/e500/sys/kern/kern_fork.c#8 integrate
.. //depot/projects/e500/sys/kern/kern_intr.c#6 integrate
.. //depot/projects/e500/sys/kern/kern_kse.c#6 delete
.. //depot/projects/e500/sys/kern/kern_proc.c#7 integrate
.. //depot/projects/e500/sys/kern/kern_resource.c#8 integrate
.. //depot/projects/e500/sys/kern/kern_sig.c#11 integrate
.. //depot/projects/e500/sys/kern/kern_switch.c#6 integrate
.. //depot/projects/e500/sys/kern/kern_sx.c#8 integrate
.. //depot/projects/e500/sys/kern/kern_synch.c#8 integrate
.. //depot/projects/e500/sys/kern/kern_thread.c#12 integrate
.. //depot/projects/e500/sys/kern/kern_timeout.c#7 integrate
.. //depot/projects/e500/sys/kern/p1003_1b.c#4 integrate
.. //depot/projects/e500/sys/kern/sched_4bsd.c#9 integrate
.. //depot/projects/e500/sys/kern/sched_ule.c#10 integrate
.. //depot/projects/e500/sys/kern/subr_bus.c#7 integrate
.. //depot/projects/e500/sys/kern/subr_sleepqueue.c#8 integrate
.. //depot/projects/e500/sys/kern/subr_smp.c#8 integrate
.. //depot/projects/e500/sys/kern/subr_trap.c#8 integrate
.. //depot/projects/e500/sys/kern/subr_witness.c#11 integrate
.. //depot/projects/e500/sys/kern/sys_process.c#5 integrate
.. //depot/projects/e500/sys/kern/syscalls.c#6 integrate
.. //depot/projects/e500/sys/kern/syscalls.master#7 integrate
.. //depot/projects/e500/sys/kern/systrace_args.c#6 integrate
.. //depot/projects/e500/sys/modules/vr/Makefile#2 integrate
.. //depot/projects/e500/sys/net/bpf_filter.c#4 integrate
.. //depot/projects/e500/sys/netgraph/netgraph.h#6 integrate
.. //depot/projects/e500/sys/netgraph/ng_base.c#11 integrate
.. //depot/projects/e500/sys/netgraph/ng_l2tp.c#4 integrate
.. //depot/projects/e500/sys/netgraph/ng_socket.c#5 integrate
.. //depot/projects/e500/sys/netinet/libalias/alias.c#3 integrate
.. //depot/projects/e500/sys/netinet/libalias/alias.h#2 integrate
.. //depot/projects/e500/sys/netinet/libalias/alias_old.c#2 delete
.. //depot/projects/e500/sys/netinet/tcp_output.c#7 integrate
.. //depot/projects/e500/sys/netsmb/smb_conn.h#3 integrate
.. //depot/projects/e500/sys/pc98/conf/DEFAULTS#3 integrate
.. //depot/projects/e500/sys/pc98/conf/GENERIC#8 integrate
.. //depot/projects/e500/sys/pc98/pc98/machdep.c#8 integrate
.. //depot/projects/e500/sys/pci/if_vr.c#4 delete
.. //depot/projects/e500/sys/pci/if_vrreg.h#2 delete
.. //depot/projects/e500/sys/powerpc/aim/trap.c#9 integrate
.. //depot/projects/e500/sys/powerpc/aim/vm_machdep.c#10 integrate
.. //depot/projects/e500/sys/powerpc/booke/machdep.c#16 integrate
.. //depot/projects/e500/sys/powerpc/booke/trap.c#10 integrate
.. //depot/projects/e500/sys/powerpc/booke/vm_machdep.c#7 integrate
.. //depot/projects/e500/sys/powerpc/conf/DEFAULTS#3 integrate
.. //depot/projects/e500/sys/powerpc/include/bootinfo.h#6 integrate
.. //depot/projects/e500/sys/powerpc/include/ocpbus.h#4 integrate
.. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.c#11 integrate
.. //depot/projects/e500/sys/powerpc/powerpc/intr_machdep.c#7 integrate
.. //depot/projects/e500/sys/security/audit/audit_worker.c#7 integrate
.. //depot/projects/e500/sys/sparc64/conf/DEFAULTS#4 integrate
.. //depot/projects/e500/sys/sparc64/conf/GENERIC#9 integrate
.. //depot/projects/e500/sys/sparc64/include/tlb.h#2 integrate
.. //depot/projects/e500/sys/sparc64/sparc64/cache.c#2 integrate
.. //depot/projects/e500/sys/sparc64/sparc64/cheetah.c#2 integrate
.. //depot/projects/e500/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/e500/sys/sparc64/sparc64/mp_machdep.c#6 integrate
.. //depot/projects/e500/sys/sparc64/sparc64/pmap.c#9 integrate
.. //depot/projects/e500/sys/sparc64/sparc64/spitfire.c#2 integrate
.. //depot/projects/e500/sys/sparc64/sparc64/tlb.c#2 integrate
.. //depot/projects/e500/sys/sparc64/sparc64/trap.c#4 integrate
.. //depot/projects/e500/sys/sun4v/sun4v/mp_machdep.c#5 integrate
.. //depot/projects/e500/sys/sys/bus.h#3 integrate
.. //depot/projects/e500/sys/sys/condvar.h#2 integrate
.. //depot/projects/e500/sys/sys/cpuset.h#3 integrate
.. //depot/projects/e500/sys/sys/disklabel.h#3 integrate
.. //depot/projects/e500/sys/sys/fcntl.h#3 integrate
.. //depot/projects/e500/sys/sys/kse.h#2 delete
.. //depot/projects/e500/sys/sys/param.h#13 integrate
.. //depot/projects/e500/sys/sys/proc.h#12 integrate
.. //depot/projects/e500/sys/sys/sched.h#5 integrate
.. //depot/projects/e500/sys/sys/sleepqueue.h#2 integrate
.. //depot/projects/e500/sys/sys/syscall.h#6 integrate
.. //depot/projects/e500/sys/sys/syscall.mk#6 integrate
.. //depot/projects/e500/sys/sys/sysproto.h#6 integrate
.. //depot/projects/e500/sys/sys/systm.h#8 integrate
.. //depot/projects/e500/sys/ufs/ffs/ffs_softdep.c#7 integrate
.. //depot/projects/e500/sys/vm/vm_fault.c#9 integrate
.. //depot/projects/e500/sys/vm/vm_glue.c#7 integrate
.. //depot/projects/e500/sys/vm/vm_map.c#8 integrate
.. //depot/projects/e500/sys/vm/vm_meter.c#6 integrate
.. //depot/projects/e500/tools/build/mk/OptionalObsoleteFiles.inc#5 integrate
.. //depot/projects/e500/tools/regression/file/dup/dup.c#2 integrate
.. //depot/projects/e500/usr.bin/ar/ar.1#2 integrate
.. //depot/projects/e500/usr.bin/ar/ar.c#3 integrate
.. //depot/projects/e500/usr.bin/ar/ar.h#2 integrate
.. //depot/projects/e500/usr.bin/ar/write.c#4 integrate
.. //depot/projects/e500/usr.bin/cpuset/cpuset.1#2 integrate
.. //depot/projects/e500/usr.bin/cpuset/cpuset.c#3 integrate
.. //depot/projects/e500/usr.bin/gzip/gzip.c#4 integrate
.. //depot/projects/e500/usr.bin/kdump/kdump.c#6 integrate
.. //depot/projects/e500/usr.bin/kdump/kdump_subr.h#2 integrate
.. //depot/projects/e500/usr.bin/kdump/mksubr#4 integrate
.. //depot/projects/e500/usr.bin/make/globals.h#2 integrate
.. //depot/projects/e500/usr.bin/make/hash_tables.c#2 integrate
.. //depot/projects/e500/usr.bin/make/main.c#5 integrate
.. //depot/projects/e500/usr.bin/make/make.1#4 integrate
.. //depot/projects/e500/usr.bin/make/parse.c#2 integrate
.. //depot/projects/e500/usr.bin/ministat/ministat.1#2 integrate
.. //depot/projects/e500/usr.sbin/Makefile#6 integrate
.. //depot/projects/e500/usr.sbin/bluetooth/sdpd/Makefile#2 integrate
.. //depot/projects/e500/usr.sbin/bluetooth/sdpd/gn.c#1 branch
.. //depot/projects/e500/usr.sbin/bluetooth/sdpd/nap.c#1 branch
.. //depot/projects/e500/usr.sbin/bluetooth/sdpd/panu.c#1 branch
.. //depot/projects/e500/usr.sbin/bluetooth/sdpd/profile.c#2 integrate
.. //depot/projects/e500/usr.sbin/bluetooth/sdpd/profile.h#2 integrate
.. //depot/projects/e500/usr.sbin/fifolog/Makefile#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/Makefile.inc#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/fifolog_create/Makefile#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/flint.lnt#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/Makefile#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog.h#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_create.c#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_int.c#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_write.h#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/getdate.y#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/libfifolog.h#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch
.. //depot/projects/e500/usr.sbin/fifolog/lib/miniobj.h#1 branch
.. //depot/projects/e500/usr.sbin/ppp/command.c#3 integrate
.. //depot/projects/e500/usr.sbin/ppp/ipcp.c#2 integrate
.. //depot/projects/e500/usr.sbin/ppp/main.c#2 integrate
.. //depot/projects/e500/usr.sbin/ppp/nat_cmd.c#2 integrate

Differences ...

==== //depot/projects/e500/ObsoleteFiles.inc#10 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -32,6 +32,11 @@
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libkse.a
+OLD_FILES+=usr/lib32/libkse_p.a
+OLD_FILES+=usr/lib32/libkse_pic.a
+.endif
 .endif
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
@@ -134,6 +139,12 @@
 OLD_DIRS+=usr/include/netatm/uni
 OLD_DIRS+=usr/include/netatm
 OLD_DIRS+=usr/share/examples/atm
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libatm.a
+OLD_FILES+=usr/lib32/libatm.so
+OLD_LIBS+=usr/lib32/libatm.so.5
+OLD_FILES+=usr/lib32/libatm_p.a
+.endif
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
@@ -224,6 +235,42 @@
 OLD_LIBS+=usr/lib/snmp_mibII.so.4
 OLD_LIBS+=usr/lib/snmp_netgraph.so.4
 OLD_LIBS+=usr/lib/snmp_pf.so.4
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libalias.so.5
+OLD_LIBS+=usr/lib32/libbsnmp.so.3
+OLD_LIBS+=usr/lib32/libdialog.so.5
+OLD_LIBS+=usr/lib32/libgnuregex.so.3
+OLD_LIBS+=usr/lib32/libhistory.so.6
+OLD_LIBS+=usr/lib32/libncurses.so.6
+OLD_LIBS+=usr/lib32/libncursesw.so.6
+OLD_LIBS+=usr/lib32/libpam.so.3
+OLD_LIBS+=usr/lib32/libreadline.so.6
+OLD_LIBS+=usr/lib32/libssh.so.3
+OLD_LIBS+=usr/lib32/pam_chroot.so.3
+OLD_LIBS+=usr/lib32/pam_deny.so.3
+OLD_LIBS+=usr/lib32/pam_echo.so.3
+OLD_LIBS+=usr/lib32/pam_exec.so.3
+OLD_LIBS+=usr/lib32/pam_ftpusers.so.3
+OLD_LIBS+=usr/lib32/pam_group.so.3
+OLD_LIBS+=usr/lib32/pam_guest.so.3
+OLD_LIBS+=usr/lib32/pam_krb5.so.3
+OLD_LIBS+=usr/lib32/pam_ksu.so.3
+OLD_LIBS+=usr/lib32/pam_lastlog.so.3
+OLD_LIBS+=usr/lib32/pam_login_access.so.3
+OLD_LIBS+=usr/lib32/pam_nologin.so.3
+OLD_LIBS+=usr/lib32/pam_opie.so.3
+OLD_LIBS+=usr/lib32/pam_opieaccess.so.3
+OLD_LIBS+=usr/lib32/pam_passwdqc.so.3
+OLD_LIBS+=usr/lib32/pam_permit.so.3
+OLD_LIBS+=usr/lib32/pam_radius.so.3
+OLD_LIBS+=usr/lib32/pam_rhosts.so.3
+OLD_LIBS+=usr/lib32/pam_rootok.so.3
+OLD_LIBS+=usr/lib32/pam_securetty.so.3
+OLD_LIBS+=usr/lib32/pam_self.so.3
+OLD_LIBS+=usr/lib32/pam_ssh.so.3
+OLD_LIBS+=usr/lib32/pam_tacplus.so.3
+OLD_LIBS+=usr/lib32/pam_unix.so.3
+.endif
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
@@ -603,6 +650,9 @@
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0
 OLD_LIBS+=usr/lib/libarchive.so.3
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libarchive.so.3
+.endif
 # 20070301: remove addr2ascii and ascii2addr
 OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
 OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz

==== //depot/projects/e500/UPDATING#10 (text+ko) ====

@@ -22,6 +22,16 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20080312:
+	Support for KSE threading has been removed from the kernel.  To
+	run legacy applications linked against KSE libmap.conf may
+	be used.  The following libmap.conf may be used to ensure
+	compatibility with any prior release:
+
+	libpthread.so.1 libthr.so.1
+	libpthread.so.2 libthr.so.2
+	libkse.so.3 libthr.so.3
+
 20080301:
 	The layout of struct vmspace has changed. This affects libkvm
 	and any executables that link against libkvm and use the
@@ -997,4 +1007,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $
+$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $

==== //depot/projects/e500/bin/chflags/chflags.1#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $
 .\"
 .Dd March 3, 2006
 .Dt CHFLAGS 1
@@ -40,7 +40,7 @@
 .Nd change file flags
 .Sh SYNOPSIS
 .Nm
-.Op Fl h
+.Op Fl fhv
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
@@ -57,6 +57,12 @@
 .Pp
 The options are as follows:
 .Bl -tag -width indent
+.It Fl f
+Do not display a diagnostic message if
+.Nm
+could not modify the flags for
+.Va file ,
+nor modify the exit status to reflect such failures.
 .It Fl H
 If the
 .Fl R
@@ -79,6 +85,14 @@
 .It Fl R
 Change the file flags for the file hierarchies rooted
 in the files instead of just the files themselves.
+.It Fl v
+Cause
+.Nm
+to be verbose, showing filenames as the flags are modified.
+If the
+.Fl v
+option is specified more than once, the old and new flags of the file
+will also be printed, in octal notation.
 .El
 .Pp
 The flags are specified as an octal number or a comma separated list

==== //depot/projects/e500/bin/chflags/chflags.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $");
+__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -60,14 +60,15 @@
 {
 	FTS *ftsp;
 	FTSENT *p;
-	u_long clear, set;
+	u_long clear, newflags, set;
 	long val;
-	int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval;
+	int Hflag, Lflag, Rflag, fflag, hflag, vflag;
+	int ch, fts_options, oct, rval;
 	char *flags, *ep;
 	int (*change_flags)(const char *, unsigned long);
 
-	Hflag = Lflag = Rflag = hflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRh")) != -1)
+	Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
+	while ((ch = getopt(argc, argv, "HLPRfhv")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -83,9 +84,15 @@
 		case 'R':
 			Rflag = 1;
 			break;
+		case 'f':
+			fflag = 1;
+			break;
 		case 'h':
 			hflag = 1;
 			break;
+		case 'v':
+			vflag++;
+			break;
 		case '?':
 		default:
 			usage();
@@ -166,18 +173,23 @@
 		default:
 			break;
 		}
-		if (oct) {
-			if (!(*change_flags)(p->fts_accpath, set))
-				continue;
-		} else {
-			p->fts_statp->st_flags |= set;
-			p->fts_statp->st_flags &= clear;
-			if (!(*change_flags)(p->fts_accpath,
-				    (u_long)p->fts_statp->st_flags))
-				continue;
+		if (oct)
+			newflags = set;
+		else
+			newflags = (p->fts_statp->st_flags | set) & clear;
+		if (newflags == p->fts_statp->st_flags)
+			continue;
+		if ((*change_flags)(p->fts_accpath, newflags) && !fflag) {
+			warn("%s", p->fts_path);
+			rval = 1;
+		} else if (vflag) {
+			(void)printf("%s", p->fts_path);
+			if (vflag > 1)
+				(void)printf(": 0%lo -> 0%lo",
+				    (u_long)p->fts_statp->st_flags,
+				    newflags);
+			(void)printf("\n");
 		}
-		warn("%s", p->fts_path);
-		rval = 1;
 	}
 	if (errno)
 		err(1, "fts_read");
@@ -188,6 +200,6 @@
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n");
+	    "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n");
 	exit(1);
 }

==== //depot/projects/e500/bin/cp/cp.1#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $
 .\"
 .Dd October 27, 2006
 .Dt CP 1
@@ -45,7 +45,7 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Op Fl f | i | n
-.Op Fl lpv
+.Op Fl alpv
 .Ar source_file target_file
 .Nm
 .Oo
@@ -53,7 +53,7 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Op Fl f | i | n
-.Op Fl lpv
+.Op Fl alpv
 .Ar source_file ... target_directory
 .Sh DESCRIPTION
 In the first synopsis form, the
@@ -116,6 +116,10 @@
 or
 .Xr pax 1
 instead.
+.It Fl a
+Archive mode.
+Same as
+.Fl RpP .
 .It Fl f
 For each existing destination pathname, remove it and
 create a new file, without prompting for confirmation

==== //depot/projects/e500/bin/cp/cp.c#3 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $");
 
 /*
  * Cp copies source files to target files.
@@ -102,7 +102,7 @@
 	char *target;
 
 	Hflag = Lflag = Pflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1)
+	while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -119,6 +119,12 @@
 		case 'R':
 			Rflag = 1;
 			break;
+		case 'a':
+			Pflag = 1;
+			pflag = 1;
+			Rflag = 1;
+			Hflag = Lflag = 0;
+			break;
 		case 'f':
 			fflag = 1;
 			iflag = nflag = 0;

==== //depot/projects/e500/bin/cp/utils.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
@@ -429,8 +429,8 @@
 {
 
 	(void)fprintf(stderr, "%s\n%s\n",
-"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file",
-"       cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... "
+"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file",
+"       cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... "
 "target_directory");
 	exit(EX_USAGE);
 }

==== //depot/projects/e500/bin/ps/ps.1#2 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $
 .\"
 .Dd August 21, 2006
 .Dt PS 1
@@ -290,7 +290,6 @@
 .It Dv "P_WAITED" Ta No "0x01000	Someone is waiting for us"
 .It Dv "P_WEXIT" Ta No "0x02000		Working on exiting"
 .It Dv "P_EXEC" Ta No "0x04000		Process called exec"
-.It Dv "P_SA" Ta No "0x08000		Using scheduler activations"
 .It Dv "P_CONTINUED" Ta No "0x10000	Proc has continued from a stopped state"
 .It Dv "P_STOPPED_SIG" Ta No "0x20000	Stopped due to SIGSTOP/SIGTSTP"
 .It Dv "P_STOPPED_TRACE" Ta No "0x40000	Stopped because of tracing"

==== //depot/projects/e500/bin/realpath/realpath.1#2 (text+ko) ====

@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp
-.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $
+.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $
 .\"
 .Dd November 24, 2000
 .Dt REALPATH 1
@@ -41,7 +41,9 @@
 .Nd return resolved physical path
 .Sh SYNOPSIS
 .Nm
+.Op Fl q
 .Ar path
+.Op Ar ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -55,6 +57,12 @@
 .Pa /../
 in
 .Ar path .
+.Pp
+If
+.Fl q
+is specified, warnings will not be printed when
+.Xr realpath 3
+fails.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO

==== //depot/projects/e500/bin/realpath/realpath.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $");
 
 #include <sys/param.h>
 
@@ -44,20 +44,39 @@
 {
 	char buf[PATH_MAX];
 	char *p;
+	int ch, i, qflag, rval;
 
-	if (argc == 2) {
-		if ((p = realpath(argv[1], buf)) == NULL)
-			err(1, "%s", buf);
-	} else
+	qflag = 0;
+	while ((ch = getopt(argc, argv, "q")) != -1) {
+		switch (ch) {
+		case 'q':
+			qflag = 1;
+			break;
+		case '?':
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+	if (argc < 1)
 		usage();
-	(void)printf("%s\n", p);
-	exit(0);
+	rval  = 0;
+	for (i = 0; i < argc; i++) {
+		if ((p = realpath(argv[i], buf)) == NULL) {
+			if (!qflag)
+				warn("%s", argv[i]);
+			rval = 1;
+		} else
+			(void)printf("%s\n", p);
+	}
+	exit(rval);
 }
 
 static void
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: realpath path\n");
+	(void)fprintf(stderr, "usage: realpath [-q] path [...]\n");
   	exit(1);
 }

==== //depot/projects/e500/contrib/tcsh/sh.lex.c#3 (text+ko) ====

@@ -851,7 +851,8 @@
 	    return (en);
 	}
 	slhs.len = 0;
-	Strbuf_append(&slhs, lhsb.s);
+	if (lhsb.s != NULL && lhsb.len != 0)
+	    Strbuf_append(&slhs, lhsb.s);
 	Strbuf_terminate(&slhs);
 	if (exclc)
 	    en = dosub(sc, en, global);

==== //depot/projects/e500/etc/rc.d/mountlate#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $
+# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $
 #
 
 # PROVIDE: mountlate
@@ -33,6 +33,12 @@
 		stop_boot true
 		;;
 	esac
+
+ 	# If we booted a special kernel remove the record
+ 	# so we will boot the default kernel next time.
+ 	if [ -x /sbin/nextboot ]; then
+		/sbin/nextboot -D
+ 	fi
 }
 
 load_rc_config $name

==== //depot/projects/e500/etc/rc.d/root#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $
 #
 
 # PROVIDE: root
@@ -34,7 +34,7 @@
 	# If we booted a special kernel remove the record
 	# so we will boot the default kernel next time.
 	if [ -x /sbin/nextboot ]; then
-		/sbin/nextboot -D
+		/sbin/nextboot -D > /dev/null 2>&1
 	fi
 }
 

==== //depot/projects/e500/lib/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $
+# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $
 
 .include <bsd.own.mk>
 
@@ -34,7 +34,7 @@
 	${_libgssapi} libipsec \
 	${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
 	${_libncp} ${_libngatm} libopie libpam libpcap \
-	libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \
+	libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \
 	${_libsmdb} \
 	${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \
 	libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind}
@@ -104,10 +104,6 @@
 _libsmb=	libsmb
 .endif
 
-.if ${MK_LIBKSE} != "no"
-_libkse=	libkse
-.endif
-
 .if ${MK_LIBTHR} != "no"
 _libthr=	libthr
 .endif

==== //depot/projects/e500/lib/libalias/libalias/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $
+# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $
 
 .PATH: ${.CURDIR}/../../../sys/netinet/libalias
 
@@ -6,7 +6,7 @@
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 6
 MAN=	libalias.3
-SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c
+SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c
 INCS=	alias.h
 WARNS?=	6
 NO_WERROR=

==== //depot/projects/e500/lib/libarchive/archive_entry.3#4 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.16 2008/03/10 14:44:40 jkoshy Exp $
 .\"
 .Dd December 15, 2003
 .Dt archive_entry 3
@@ -101,17 +101,47 @@
 .Sh SYNOPSIS
 .In archive_entry.h
 .Ft void
-.Fn archive_entry_acl_add_entry "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const char *name"
+.Fo archive_entry_acl_add_entry
+.Fa "struct archive_entry *"
+.Fa "int type"
+.Fa "int permset"
+.Fa "int tag"
+.Fa "int qual"
+.Fa "const char *name"
+.Fc
 .Ft void
-.Fn archive_entry_acl_add_entry_w "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const wchar_t *name"
+.Fo archive_entry_acl_add_entry_w
+.Fa "struct archive_entry *"
+.Fa "int type"
+.Fa "int permset"
+.Fa "int tag"
+.Fa "int qual"
+.Fa "const wchar_t *name"
+.Fc
 .Ft void
 .Fn archive_entry_acl_clear "struct archive_entry *"
 .Ft int
 .Fn archive_entry_acl_count "struct archive_entry *" "int type"
 .Ft int
-.Fn archive_entry_acl_next "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const char **name"
+.Fo archive_entry_acl_next
+.Fa "struct archive_entry *"
+.Fa "int want_type"
+.Fa "int *type"
+.Fa "int *permset"
+.Fa "int *tag"
+.Fa "int *qual"
+.Fa "const char **name"
+.Fc
 .Ft int
-.Fn archive_entry_acl_next_w "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const wchar_t **name"
+.Fo archive_entry_acl_next_w
+.Fa "struct archive_entry *"
+.Fa "int want_type"
+.Fa "int *type"
+.Fa "int *permset"
+.Fa "int *tag"
+.Fa "int *qual"
+.Fa "const wchar_t **name"
+.Fc
 .Ft int
 .Fn archive_entry_acl_reset "struct archive_entry *" "int want_type"
 .Ft const wchar_t *
@@ -155,7 +185,11 @@
 .Ft mode_t
 .Fn archive_entry_filetype "struct archive_entry *"
 .Ft void
-.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear"
+.Fo archive_entry_fflags
+.Fa "struct archive_entry *"
+.Fa "unsigned long *set"
+.Fa "unsigned long *clear"
+.Fc
 .Ft const char *
 .Fn archive_entry_fflags_text "struct archive_entry *"
 .Ft void
@@ -195,7 +229,11 @@
 .Ft void
 .Fn archive_entry_set_filetype "struct archive_entry *" "unsigned int"
 .Ft void
-.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear"
+.Fo archive_entry_set_fflags
+.Fa "struct archive_entry *"
+.Fa "unsigned long set"
+.Fa "unsigned long clear"
+.Fc
 .Ft void
 .Fn archive_entry_set_gid "struct archive_entry *" "gid_t"
 .Ft void

==== //depot/projects/e500/lib/libarchive/archive_entry.c#5 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -1124,6 +1124,11 @@
 		entry->acl_p = entry->acl_p->next;
 	if (entry->acl_p == NULL) {
 		entry->acl_state = 0;
+		*type = 0;
+		*permset = 0;
+		*tag = 0;
+		*id = -1;
+		*name = NULL;
 		return (ARCHIVE_EOF); /* End of ACL entries. */
 	}
 	*type = entry->acl_p->type;
@@ -1505,7 +1510,7 @@
 		return (ARCHIVE_OK);
 	} else {
 		*name = NULL;
-		*name = NULL;
+		*value = NULL;
 		*size = (size_t)0;
 		return (ARCHIVE_WARN);
 	}

==== //depot/projects/e500/lib/libarchive/archive_read.3#4 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.36 2008/03/10 14:45:29 jkoshy Exp $
 .\"
 .Dd August 19, 2006
 .Dt archive_read 3
@@ -75,7 +75,10 @@
 .Ft int
 .Fn archive_read_support_compression_none "struct archive *"
 .Ft int
-.Fn archive_read_support_compression_program "struct archive *" "const char *cmd"
+.Fo archive_read_support_compression_program
+.Fa "struct archive *"
+.Fa "const char *cmd"
+.Fc
 .Ft int
 .Fn archive_read_support_format_all "struct archive *"
 .Ft int
@@ -89,15 +92,32 @@
 .Ft int
 .Fn archive_read_support_format_zip "struct archive *"
 .Ft int
-.Fn archive_read_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_close_callback *"
+.Fo archive_read_open

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list