PERFORCE change 128048 for review
Kip Macy
kmacy at FreeBSD.org
Wed Oct 24 22:45:00 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=128048
Change 128048 by kmacy at entropy_kmacy_xen31 on 2007/10/25 05:44:00
IFC @128039
Affected files ...
.. //depot/projects/xen31/ObsoleteFiles.inc#2 integrate
.. //depot/projects/xen31/UPDATING#2 integrate
.. //depot/projects/xen31/etc/rc.d/named#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_format_tar.c#2 integrate
.. //depot/projects/xen31/lib/libc/locale/iswctype.c#2 integrate
.. //depot/projects/xen31/lib/libc/sys/kldstat.2#2 integrate
.. //depot/projects/xen31/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/xen31/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/xen31/lib/libelf/elf_update.3#2 integrate
.. //depot/projects/xen31/lib/libelf/gelf_newehdr.3#2 integrate
.. //depot/projects/xen31/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/xen31/lib/libstand/Makefile#2 integrate
.. //depot/projects/xen31/lib/libthr/libthr.3#2 integrate
.. //depot/projects/xen31/sbin/gpt/Makefile#2 integrate
.. //depot/projects/xen31/sbin/gpt/add.c#2 integrate
.. //depot/projects/xen31/sbin/gpt/boot.c#1 branch
.. //depot/projects/xen31/sbin/gpt/gpt.8#2 integrate
.. //depot/projects/xen31/sbin/gpt/gpt.c#2 integrate
.. //depot/projects/xen31/sbin/gpt/gpt.h#2 integrate
.. //depot/projects/xen31/sbin/gpt/show.c#2 integrate
.. //depot/projects/xen31/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_attr.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_attr_get_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_barrier_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_barrierattr.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cancel.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cleanup_pop.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cleanup_push.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_broadcast.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_signal.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_timedwait.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_cond_wait.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_condattr.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_create.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_detach.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_equal.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_exit.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_getconcurrency.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_getspecific.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_join.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_key_create.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_key_delete.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_kill.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_main_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_multi_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_lock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_timedlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_trylock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutex_unlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutexattr.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_once.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_resume_all_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_resume_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_rdlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_unlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlock_wrlock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlockattr_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_schedparam.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_self.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_set_name_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_setspecific.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_sigmask.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_spin_init.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_spin_lock.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_switch_add_np.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_testcancel.3#2 integrate
.. //depot/projects/xen31/share/man/man3/pthread_yield.3#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/msi.c#2 integrate
.. //depot/projects/xen31/sys/arm/at91/if_ate.c#2 integrate
.. //depot/projects/xen31/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/xen31/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate
.. //depot/projects/xen31/sys/boot/common/ufsread.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/Makefile#2 integrate
.. //depot/projects/xen31/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/xen31/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/xen31/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/xen31/sys/boot/i386/libi386/bioscd.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/libi386/devicename.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/loader/main.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/xen31/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/xen31/sys/boot/pc98/boot2/boot.c#2 integrate
.. //depot/projects/xen31/sys/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/xen31/sys/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/xen31/sys/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/xen31/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/xen31/sys/compat/linux/linux_getcwd.c#2 integrate
.. //depot/projects/xen31/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/xen31/sys/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/xen31/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/xen31/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/xen31/sys/dev/usb/uipaq.c#2 integrate
.. //depot/projects/xen31/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/xen31/sys/fs/devfs/devfs_devs.c#2 integrate
.. //depot/projects/xen31/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/xen31/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/xen31/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/xen31/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/xen31/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/xen31/sys/i386/conf/PAE#2 integrate
.. //depot/projects/xen31/sys/i386/i386/msi.c#2 integrate
.. //depot/projects/xen31/sys/i386/ibcs2/ibcs2_misc.c#2 integrate
.. //depot/projects/xen31/sys/i386/include/bootinfo.h#2 integrate
.. //depot/projects/xen31/sys/kern/init_main.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_alq.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_environment.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_ktrace.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_mbuf.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/xen31/sys/kern/link_elf.c#2 integrate
.. //depot/projects/xen31/sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/xen31/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/xen31/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/xen31/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/xen31/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/xen31/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/xen31/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_mbuf2.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_sem.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/xen31/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/xen31/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/xen31/sys/net/bpf.c#2 integrate
.. //depot/projects/xen31/sys/net/bsd_comp.c#2 integrate
.. //depot/projects/xen31/sys/net/if.c#2 integrate
.. //depot/projects/xen31/sys/net/if_atmsubr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_fddisubr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_fwsubr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_gif.c#2 integrate
.. //depot/projects/xen31/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/xen31/sys/net/if_ppp.c#2 integrate
.. //depot/projects/xen31/sys/net/if_stf.c#2 integrate
.. //depot/projects/xen31/sys/net/if_tun.c#2 integrate
.. //depot/projects/xen31/sys/net/route.c#2 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/xen31/sys/netatalk/ddp_input.c#2 integrate
.. //depot/projects/xen31/sys/netatalk/ddp_output.c#2 integrate
.. //depot/projects/xen31/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_divert.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/xen31/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/xen31/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_output.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/xen31/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/xen31/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/xen31/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/swtch.S#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/vm_machdep.c#2 integrate
.. //depot/projects/xen31/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/xen31/sys/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_audit.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_framework.h#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_inet.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_internal.h#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_net.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_pipe.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_policy.h#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_posix_sem.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_socket.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_syscalls.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_system.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_sysv_msg.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_sysv_sem.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_sysv_shm.c#2 integrate
.. //depot/projects/xen31/sys/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_ifoff/mac_ifoff.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_lomac/mac_lomac.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_partition/mac_partition.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_portacl/mac_portacl.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_stub/mac_stub.c#2 integrate
.. //depot/projects/xen31/sys/security/mac_test/mac_test.c#2 integrate
.. //depot/projects/xen31/sys/sys/gpt.h#2 integrate
.. //depot/projects/xen31/sys/sys/linker.h#2 integrate
.. //depot/projects/xen31/sys/sys/param.h#2 integrate
.. //depot/projects/xen31/sys/sys/pciio.h#2 integrate
.. //depot/projects/xen31/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/xen31/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/xen31/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/xen31/sys/vm/vm_map.c#2 integrate
.. //depot/projects/xen31/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/xen31/sys/vm/vnode_pager.c#2 integrate
.. //depot/projects/xen31/usr.sbin/rpcbind/rpcbind.c#2 integrate
.. //depot/projects/xen31/usr.sbin/traceroute6/traceroute6.c#2 integrate
Differences ...
==== //depot/projects/xen31/ObsoleteFiles.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.114 2007/10/22 12:31:23 ru Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -579,11 +579,17 @@
# 20070201: remove libmytinfo link
OLD_FILES+=usr/lib/libmytinfo.a
OLD_FILES+=usr/lib/libmytinfo.so
-OLD_FILES+=usr/lib/libmytinfo_p.a
+OLD_FILES+=usr/lib/libmytinfo_p.a
+OLD_FILES+=usr/lib/libmytinfow.a
+OLD_FILES+=usr/lib/libmytinfow.so
+OLD_FILES+=usr/lib/libmytinfow_p.a
.if ${TARGET_ARCH} == "amd64"
OLD_FILES+=usr/lib32/libmytinfo.a
OLD_FILES+=usr/lib32/libmytinfo.so
OLD_FILES+=usr/lib32/libmytinfo_p.a
+OLD_FILES+=usr/lib32/libmytinfow.a
+OLD_FILES+=usr/lib32/libmytinfow.so
+OLD_FILES+=usr/lib32/libmytinfow_p.a
.endif
# 20070128: remove vnconfig
OLD_FILES+=usr/sbin/vnconfig
==== //depot/projects/xen31/UPDATING#2 (text+ko) ====
@@ -21,6 +21,19 @@
developers choose to disable these features on build machines
to maximize performance.
+20071024:
+ It has been decided that it is desirable to provide ABI
+ backwards compatibility to the FreeBSD 4/5/6 versions of the
+ PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was
+ broken with the introduction of PCI domain support (see the
+ 20070930 entry). Unfortunately, this required the ABI of
+ PCIOCGETCONF to be broken again in order to be able to
+ provide backwards compatibility to the old version of that
+ IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled
+ again. As for prominent ports this affects neither pciutils
+ nor xorg-server this time, the hal port needs to be rebuilt
+ however.
+
20071020:
The misnamed kthread_create() and friends have been renamed
to kproc_create() etc. Many of the callers already
@@ -921,4 +934,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $
+$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $
==== //depot/projects/xen31/etc/rc.d/named#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $
+# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $
#
# PROVIDE: named
@@ -82,20 +82,28 @@
named_reload()
{
- rndc reload
+ ${command%/named}/rndc reload
}
named_stop()
{
- echo -n "Stopping named"
- if rndc stop 2>/dev/null; then
- echo .
+ # This duplicates an undesirably large amount of code from the stop
+ # routine in rc.subr in order to use rndc to shut down the process,
+ # and to give it a second chance in case rndc fails.
+ rc_pid=$(check_pidfile $pidfile $command)
+ if [ -z "$rc_pid" ]; then
+ [ -n "$rc_fast" ] && return 0
+ _run_rc_notrunning
+ return 1
+ fi
+ echo 'Stopping named.'
+ if ${command%/named}/rndc stop 2>/dev/null; then
+ wait_for_pids $rc_pid
else
- echo -n ": rndc failed, trying killall: "
- if killall named; then
- echo .
- fi
- fi
+ echo -n 'rndc failed, trying kill: '
+ kill -TERM $rc_pid
+ wait_for_pids $rc_pid
+ fi
}
named_poststop()
@@ -121,13 +129,13 @@
if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then
return 0
fi
- confgen_command="rndc-confgen -a -b256 -u $named_uid \
+ confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \
-c ${named_chrootdir}/etc/namedb/rndc.key"
if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then
- if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \
- "$named_uid" ]; then
- $confgen_command
- fi
+ case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in
+ root|$named_uid) ;;
+ *) $confgen_command ;;
+ esac
else
$confgen_command
fi
==== //depot/projects/xen31/gnu/usr.bin/groff/tmac/mdoc.local#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.60 2007/10/15 08:06:42 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.61 2007/10/22 10:01:58 ru Exp $
.\"
.\" %beginstrip%
.
@@ -48,6 +48,7 @@
.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
.ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx)
.ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv)
+.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse)
.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
.ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat)
.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)
==== //depot/projects/xen31/lib/libarchive/archive_read_support_format_tar.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.61 2007/08/18 21:53:25 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.62 2007/10/24 04:01:31 kientzle Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -164,6 +164,7 @@
struct sparse_block *sparse_last;
int64_t sparse_offset;
int64_t sparse_numbytes;
+ int64_t sparse_realsize;
int sparse_gnu_major;
int sparse_gnu_minor;
char sparse_gnu_pending;
@@ -440,6 +441,7 @@
free(sp);
}
tar->sparse_last = NULL;
+ tar->sparse_realsize = -1; /* Mark this as "unset" */
r = tar_read_header(a, tar, entry);
@@ -1388,9 +1390,10 @@
}
if (wcscmp(key, L"GNU.sparse.name") == 0)
archive_entry_copy_pathname_w(entry, value);
- if (wcscmp(key, L"GNU.sparse.realsize") == 0)
- archive_entry_set_size(entry,
- tar_atol10(value, wcslen(value)));
+ if (wcscmp(key, L"GNU.sparse.realsize") == 0) {
+ tar->sparse_realsize = tar_atol10(value, wcslen(value));
+ archive_entry_set_size(entry, tar->sparse_realsize);
+ }
break;
case 'L':
/* Our extensions */
@@ -1471,11 +1474,22 @@
/* POSIX has reserved 'security.*' */
/* Someday: if (wcscmp(key, L"security.acl")==0) { ... } */
if (wcscmp(key, L"size")==0) {
- tar->entry_bytes_remaining = tar_atol10(value, wcslen(value));
- archive_entry_set_size(entry, tar->entry_bytes_remaining);
+ /* "size" is the size of the data in the entry. */
+ tar->entry_bytes_remaining
+ = tar_atol10(value, wcslen(value));
+ /*
+ * But, "size" is not necessarily the size of
+ * the file on disk; if this is a sparse file,
+ * the disk size may have already been set from
+ * GNU.sparse.realsize.
+ */
+ if (tar->sparse_realsize < 0) {
+ archive_entry_set_size(entry,
+ tar->entry_bytes_remaining);
+ tar->sparse_realsize
+ = tar->entry_bytes_remaining;
+ }
}
- tar->entry_bytes_remaining = 0;
-
break;
case 'u':
if (wcscmp(key, L"uid")==0)
==== //depot/projects/xen31/lib/libc/locale/iswctype.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.9 2007/10/23 17:39:28 ache Exp $");
#include <wctype.h>
@@ -61,7 +61,7 @@
iswascii(wc)
wint_t wc;
{
- return (wc < 0x80);
+ return ((wc & ~0x7F) == 0);
}
#undef iswblank
==== //depot/projects/xen31/lib/libc/sys/kldstat.2#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.20 2004/07/02 23:52:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.22 2007/10/22 21:49:39 jb Exp $
.\"
.Dd March 3, 1999
.Dt KLDSTAT 2
@@ -53,6 +53,7 @@
int id;
caddr_t address; /* load address */
size_t size; /* size in bytes */
+ char pathname[MAXPATHLEN];
};
.Ed
.Pp
@@ -77,6 +78,10 @@
The load address of the kld file.
.It size
The size of the file.
+.It pathname
+The full name of the file referred to by
+.Fa fileid ,
+including the path.
.El
.Sh RETURN VALUES
.Rv -std kldstat
@@ -123,3 +128,7 @@
.Nm kld
interface first appeared in
.Fx 3.0 .
+.Sh BUGS
+The pathname many not be accurate if the file system mounts have
+changed since the module was loaded, or if this function is called
+within a chrooted environment.
==== //depot/projects/xen31/lib/libelf/elf_flagdata.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd August 10, 2006
+.Dd October 22, 2007
.Os
.Dt ELF_FLAGDATA 3
.Sh NAME
@@ -51,7 +51,7 @@
.Ft "unsigned int"
.Fn elf_flagshdr "Elf_Scn *scn" "Elf_Cmd cmd" "unsigned int flags"
.Sh DESCRIPTION
-These functions are used to query, set or reset flag bits on data
+These functions are used to query, set or reset flags on data
structures associated with an ELF file.
.Pp
Arguments
@@ -59,7 +59,7 @@
.Ar elf
and
.Ar scn
-denote the data structures whose status bits need to be changed.
+denote the data structures whose flags need to be changed.
These values are allowed to be NULL to simplify error handling in
application code.
.Pp
@@ -70,16 +70,16 @@
.It Dv ELF_C_CLR
The argument
.Ar flags
-specifies the bits to be cleared.
+specifies the flags to be cleared.
.It Dv ELF_C_SET
The argument
.Ar flags
-specifies the bits to be set.
+specifies the flags to be set.
.El
.Pp
The argument
.Ar flags
-is allowed to have the following bits set:
+is allowed to have the following flags set:
.Bl -tag -width ELF_F_LAYOUT
.It Dv ELF_F_DIRTY
Mark the associated data structure as needing to be written back
@@ -111,7 +111,7 @@
will return the current set of flags for the data structure being
queried.
.Sh RETURN VALUES
-These functions return the updated bits is successful, and zero if
+These functions return the updated flags is successful, and zero if
an error is detected.
.Sh ERRORS
These functions may fail with the following errors:
@@ -123,7 +123,7 @@
.It Bq Er ELF_E_ARGUMENT
Argument
.Ar flags
-had unsupported flag bits set.
+had unsupported flags set.
.It Bq Er ELF_E_ARGUMENT
The argument
.Ar elf
==== //depot/projects/xen31/lib/libelf/elf_getscn.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd August 26, 2006
+.Dd October 22, 2007
.Os
.Dt ELF_GETSCN 3
.Sh NAME
@@ -73,7 +73,7 @@
.Ar elf ,
and will set the
.Dv ELF_F_DIRTY
-bit for the new section.
+flag on the returned section descriptor.
For ELF descriptors opened for writing, the ELF library will
automatically create an empty section at index zero
.Dv ( SHN_UNDEF )
==== //depot/projects/xen31/lib/libelf/elf_update.3#2 (text+ko) ====
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.4 2007/09/08 08:20:12 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.5 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd September 08, 2007
+.Dd October 22, 2007
.Os
.Dt ELF_UPDATE 3
.Sh NAME
@@ -63,7 +63,7 @@
.Dv ELF_F_LAYOUT
flag has been set on the ELF descriptor, the application assumes full
responsibility for the layout of the ELF object.
-If this bit is not set, the ELF library will compute the layout of the
+If this flag is not set, the ELF library will compute the layout of the
file from its associated section descriptors.
.Pp
It is the application's responsibility to manage the the following
==== //depot/projects/xen31/lib/libelf/gelf_newehdr.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd December 16, 2006
+.Dd October 22, 2007
.Os
.Dt GELF_NEWEHDR 3
.Sh NAME
@@ -122,7 +122,7 @@
.Pp
If successful, these three functions set the
.Dv ELF_F_DIRTY
-bit on ELF descriptor
+flag on ELF descriptor
.Ar elf .
.Sh RETURN VALUES
These functions return a pointer to a translated header descriptor
==== //depot/projects/xen31/lib/libelf/gelf_newphdr.3#2 (text+ko) ====
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.3 2007/10/21 05:15:07 jkoshy Exp $
+.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.4 2007/10/22 03:38:43 jkoshy Exp $
.\"
-.Dd October 21, 2007
+.Dd October 22, 2007
.Os
.Dt GELF_NEWPHDR 3
.Sh NAME
@@ -82,7 +82,7 @@
.Pp
The functions set the
.Dv ELF_F_DIRTY
-bit on the program header table.
+flag on the program header table.
All members of the returned array of Phdr structures
will be initialized to zero.
.Pp
==== //depot/projects/xen31/lib/libstand/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libstand/Makefile,v 1.58 2007/10/15 14:20:24 nyan Exp $
+# $FreeBSD: src/lib/libstand/Makefile,v 1.59 2007/10/24 21:32:57 jhb Exp $
# Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
#
# Notes:
@@ -72,6 +72,10 @@
SRCS+= syncicache.c
.endif
+# uuid functions from libc
+.PATH: ${.CURDIR}/../libc/uuid
+SRCS+= uuid_equal.c uuid_is_nil.c
+
# _setjmp/_longjmp
.if ${MACHINE_ARCH} == "amd64"
.PATH: ${.CURDIR}/i386
==== //depot/projects/xen31/lib/libthr/libthr.3#2 (text+ko) ====
@@ -22,14 +22,14 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libthr/libthr.3,v 1.3 2005/06/16 19:01:07 ru Exp $
+.\" $FreeBSD: src/lib/libthr/libthr.3,v 1.4 2007/10/22 10:13:38 ru Exp $
.\"
-.Dd June 11, 2005
+.Dd October 19, 2007
.Os
.Dt LIBTHR 3
.Sh NAME
.Nm libthr
-.Nd "alternative POSIX threads library"
+.Nd "1:1 POSIX threads library"
.Sh LIBRARY
.Lb libthr
.Sh SYNOPSIS
@@ -37,22 +37,14 @@
.Sh DESCRIPTION
The
.Nm
-library provides an alternative 1:1 implementation of the
+library provides a 1:1 implementation of the
.Xr pthread 3
library interfaces for application threading.
-While applications may be linked directly against
-.Nm ,
-system administrators are offered maximum flexibility by linking against
-.Xr pthread 3 ,
-as they can then use
-.Xr libmap.conf 5
-to select the threading implementation on a per-application basis.
-.Pp
-The
-.Nm
-library
+It
has been optimized for use by applications expecting system scope thread
-semantics, and can provide significant performance improvements.
+semantics, and can provide significant performance improvements
+compared to
+.Lb libkse .
.Sh SEE ALSO
.Xr pthread 3
.Sh AUTHORS
==== //depot/projects/xen31/sbin/gpt/Makefile#2 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
+# $FreeBSD: src/sbin/gpt/Makefile,v 1.8 2007/10/24 21:32:57 jhb Exp $
PROG= gpt
-SRCS= add.c create.c destroy.c gpt.c label.c map.c migrate.c recover.c \
- remove.c show.c
+SRCS= add.c boot.c create.c destroy.c gpt.c label.c map.c migrate.c \
+ recover.c remove.c show.c
WARNS?= 4
MAN= gpt.8
==== //depot/projects/xen31/sbin/gpt/add.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.15 2006/10/04 18:20:25 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.16 2007/10/24 21:32:57 jhb Exp $");
#include <sys/types.h>
@@ -39,9 +39,9 @@
#include "map.h"
#include "gpt.h"
-static uuid_t type;
-static off_t block, size;
-static unsigned int entry;
+static uuid_t add_type;
+static off_t add_block, add_size;
+static unsigned int add_entry;
static void
usage_add(void)
@@ -53,8 +53,8 @@
exit(1);
}
-static void
-add(int fd)
+map_t *
+gpt_add_part(int fd, uuid_t type, off_t start, off_t size, unsigned int *entry)
{
map_t *gpt, *tpg;
map_t *tbl, *lbt;
@@ -67,38 +67,38 @@
if (gpt == NULL) {
warnx("%s: error: no primary GPT header; run create or recover",
device_name);
- return;
+ return (NULL);
}
tpg = map_find(MAP_TYPE_SEC_GPT_HDR);
if (tpg == NULL) {
warnx("%s: error: no secondary GPT header; run recover",
device_name);
- return;
+ return (NULL);
}
tbl = map_find(MAP_TYPE_PRI_GPT_TBL);
lbt = map_find(MAP_TYPE_SEC_GPT_TBL);
if (tbl == NULL || lbt == NULL) {
warnx("%s: error: run recover -- trust me", device_name);
- return;
+ return (NULL);
}
hdr = gpt->map_data;
- if (entry > le32toh(hdr->hdr_entries)) {
+ if (*entry > le32toh(hdr->hdr_entries)) {
warnx("%s: error: index %u out of range (%u max)", device_name,
- entry, le32toh(hdr->hdr_entries));
- return;
+ *entry, le32toh(hdr->hdr_entries));
+ return (NULL);
}
- if (entry > 0) {
- i = entry - 1;
+ if (*entry > 0) {
+ i = *entry - 1;
ent = (void*)((char*)tbl->map_data + i *
le32toh(hdr->hdr_entsz));
if (!uuid_is_nil(&ent->ent_type, NULL)) {
warnx("%s: error: entry at index %u is not free",
- device_name, entry);
- return;
+ device_name, *entry);
+ return (NULL);
}
} else {
/* Find empty slot in GPT table. */
@@ -111,14 +111,14 @@
if (i == le32toh(hdr->hdr_entries)) {
warnx("%s: error: no available table entries",
device_name);
- return;
+ return (NULL);
}
}
- map = map_alloc(block, size);
+ map = map_alloc(start, size);
if (map == NULL) {
warnx("%s: error: no space available on device", device_name);
- return;
+ return (NULL);
}
le_uuid_enc(&ent->ent_type, &type);
@@ -148,7 +148,19 @@
gpt_write(fd, lbt);
gpt_write(fd, tpg);
- printf("%sp%u added\n", device_name, i + 1);
+ *entry = i + 1;
+
+ return (map);
+}
+
+static void
+add(int fd)
+{
+
+ if (gpt_add_part(fd, add_type, add_block, add_size, &add_entry) != 0)
+ return;
+
+ printf("%sp%u added\n", device_name, add_entry);
}
int
@@ -161,30 +173,30 @@
while ((ch = getopt(argc, argv, "b:i:s:t:")) != -1) {
switch(ch) {
case 'b':
- if (block > 0)
+ if (add_block > 0)
usage_add();
- block = strtoll(optarg, &p, 10);
- if (*p != 0 || block < 1)
+ add_block = strtoll(optarg, &p, 10);
+ if (*p != 0 || add_block < 1)
usage_add();
break;
case 'i':
- if (entry > 0)
+ if (add_entry > 0)
usage_add();
- entry = strtol(optarg, &p, 10);
- if (*p != 0 || entry < 1)
+ add_entry = strtol(optarg, &p, 10);
+ if (*p != 0 || add_entry < 1)
usage_add();
break;
case 's':
- if (size > 0)
+ if (add_size > 0)
usage_add();
- size = strtoll(optarg, &p, 10);
- if (*p != 0 || size < 1)
+ add_size = strtoll(optarg, &p, 10);
+ if (*p != 0 || add_size < 1)
usage_add();
break;
case 't':
- if (!uuid_is_nil(&type, NULL))
+ if (!uuid_is_nil(&add_type, NULL))
usage_add();
- if (parse_uuid(optarg, &type) != 0)
+ if (parse_uuid(optarg, &add_type) != 0)
usage_add();
break;
default:
@@ -196,9 +208,9 @@
usage_add();
/* Create UFS partitions by default. */
- if (uuid_is_nil(&type, NULL)) {
+ if (uuid_is_nil(&add_type, NULL)) {
uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS;
- type = ufs;
+ add_type = ufs;
}
while (optind < argc) {
==== //depot/projects/xen31/sbin/gpt/gpt.8#2 (text+ko) ====
@@ -22,9 +22,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/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
+.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.18 2007/10/24 21:32:57 jhb Exp $
.\"
-.Dd June 22, 2006
+.Dd October 24, 2007
.Os
.Dt GPT 8
.Sh NAME
@@ -130,10 +130,51 @@
The type is given as an UUID, but
.Nm
accepts
-.Cm efi , swap , ufs , hfs , linux
+.Cm boot , efi , swap , ufs , hfs , linux
and
.Cm windows
as aliases for the most commonly used partition types.
+.\" ==== boot ====
+.It Xo
+.Nm
+.Ic boot
+.Op Fl b Ar pmbr
+.Op Fl g Ar gptboot
+.Op Fl s Ar count
+.Ar device ...
+.Xc
+The
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list