From owner-p4-projects@FreeBSD.ORG Fri Oct 26 07:53:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB39916A469; Fri, 26 Oct 2007 07:53:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57ABB16A420 for ; Fri, 26 Oct 2007 07:53:36 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 428AB13C4B7 for ; Fri, 26 Oct 2007 07:53:36 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9Q7ra3S085341 for ; Fri, 26 Oct 2007 07:53:36 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9Q7rVl8085337 for perforce@freebsd.org; Fri, 26 Oct 2007 07:53:31 GMT (envelope-from peter@freebsd.org) Date: Fri, 26 Oct 2007 07:53:31 GMT Message-Id: <200710260753.l9Q7rVl8085337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 128113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Oct 2007 07:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=128113 Change 128113 by peter@peter_overcee on 2007/10/26 07:53:11 IFC @128112 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#37 integrate .. //depot/projects/hammer/UPDATING#109 integrate .. //depot/projects/hammer/contrib/one-true-awk/FIXES#8 integrate .. //depot/projects/hammer/contrib/one-true-awk/FREEBSD-upgrade#8 integrate .. //depot/projects/hammer/contrib/one-true-awk/lib.c#6 integrate .. //depot/projects/hammer/contrib/one-true-awk/tran.c#4 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#57 integrate .. //depot/projects/hammer/etc/rc.d/amd#14 integrate .. //depot/projects/hammer/etc/rc.d/nfslocking#11 delete .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#37 integrate .. //depot/projects/hammer/lib/libstand/Makefile#19 integrate .. //depot/projects/hammer/sbin/gpt/Makefile#7 integrate .. //depot/projects/hammer/sbin/gpt/add.c#13 integrate .. //depot/projects/hammer/sbin/gpt/boot.c#1 branch .. //depot/projects/hammer/sbin/gpt/gpt.8#14 integrate .. //depot/projects/hammer/sbin/gpt/gpt.c#12 integrate .. //depot/projects/hammer/sbin/gpt/gpt.h#10 integrate .. //depot/projects/hammer/sbin/gpt/show.c#10 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#8 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#99 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#25 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#66 integrate .. //depot/projects/hammer/sys/arm/at91/at91rm92reg.h#6 integrate .. //depot/projects/hammer/sys/arm/at91/if_ate.c#9 integrate .. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#9 integrate .. //depot/projects/hammer/sys/arm/at91/std.at91#3 integrate .. //depot/projects/hammer/sys/arm/at91/std.kb920x#3 integrate .. //depot/projects/hammer/sys/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/eeprom.c#3 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/emac.c#5 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/lib.h#3 integrate .. //depot/projects/hammer/sys/boot/common/ufsread.c#7 integrate .. //depot/projects/hammer/sys/boot/i386/Makefile#7 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#20 integrate .. //depot/projects/hammer/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/hammer/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/hammer/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/hammer/sys/boot/i386/libi386/bioscd.c#7 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#13 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/hammer/sys/boot/i386/loader/main.c#15 integrate .. //depot/projects/hammer/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/hammer/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/hammer/sys/boot/pc98/boot2/boot.c#10 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#11 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/main.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#24 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#16 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#43 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#12 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#29 integrate .. //depot/projects/hammer/sys/conf/files#161 integrate .. //depot/projects/hammer/sys/conf/files.amd64#97 integrate .. //depot/projects/hammer/sys/conf/files.arm#10 integrate .. //depot/projects/hammer/sys/conf/files.i386#83 integrate .. //depot/projects/hammer/sys/conf/files.ia64#40 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#24 integrate .. //depot/projects/hammer/sys/conf/files.sun4v#4 integrate .. //depot/projects/hammer/sys/conf/options.arm#12 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#33 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#10 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_table.c#7 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#41 integrate .. //depot/projects/hammer/sys/dev/pci/pci_user.c#14 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#18 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#53 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#14 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#11 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#24 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#41 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#7 integrate .. //depot/projects/hammer/sys/geom/part/g_part.h#5 integrate .. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#5 integrate .. //depot/projects/hammer/sys/i386/conf/DEFAULTS#8 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#57 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#23 integrate .. //depot/projects/hammer/sys/i386/i386/msi.c#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#18 integrate .. //depot/projects/hammer/sys/i386/include/bootinfo.h#3 integrate .. //depot/projects/hammer/sys/i386/include/clock.h#15 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#40 integrate .. //depot/projects/hammer/sys/kern/init_main.c#47 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_environment.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#72 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#68 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#65 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#82 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#33 integrate .. //depot/projects/hammer/sys/kern/link_elf.c#29 integrate .. //depot/projects/hammer/sys/kern/link_elf_obj.c#53 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#35 integrate .. //depot/projects/hammer/sys/kern/sys_socket.c#21 integrate .. //depot/projects/hammer/sys/kern/sysv_msg.c#19 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#28 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#28 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#76 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#66 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#52 integrate .. //depot/projects/hammer/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/hammer/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#29 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#82 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#117 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#74 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#49 integrate .. //depot/projects/hammer/sys/modules/Makefile#116 integrate .. //depot/projects/hammer/sys/net/bpf.c#53 integrate .. //depot/projects/hammer/sys/net/bsd_comp.c#8 integrate .. //depot/projects/hammer/sys/net/if.c#71 integrate .. //depot/projects/hammer/sys/net/if_atmsubr.c#21 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#68 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#22 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#19 integrate .. //depot/projects/hammer/sys/net/if_gif.c#28 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#20 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#31 integrate .. //depot/projects/hammer/sys/net/if_stf.c#28 integrate .. //depot/projects/hammer/sys/net/if_tun.c#32 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan.c#4 integrate .. //depot/projects/hammer/sys/netatalk/ddp_input.c#14 integrate .. //depot/projects/hammer/sys/netatalk/ddp_output.c#14 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#51 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#40 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#88 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#37 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#69 integrate .. //depot/projects/hammer/sys/netinet/ip_options.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#66 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#50 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#81 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#45 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#77 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#51 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#52 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#32 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#23 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#10 integrate .. //depot/projects/hammer/sys/security/audit/audit.h#9 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm.c#10 integrate .. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_audit.c#3 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/hammer/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/hammer/sys/security/mac/mac_internal.h#12 integrate .. //depot/projects/hammer/sys/security/mac/mac_net.c#15 integrate .. //depot/projects/hammer/sys/security/mac/mac_pipe.c#9 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#8 integrate .. //depot/projects/hammer/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/hammer/sys/security/mac/mac_process.c#12 integrate .. //depot/projects/hammer/sys/security/mac/mac_socket.c#7 integrate .. //depot/projects/hammer/sys/security/mac/mac_syscalls.c#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_system.c#9 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_vfs.c#15 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#44 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#27 integrate .. //depot/projects/hammer/sys/security/mac_ifoff/mac_ifoff.c#13 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#32 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#42 integrate .. //depot/projects/hammer/sys/security/mac_none/mac_none.c#15 integrate .. //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#13 integrate .. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#13 integrate .. //depot/projects/hammer/sys/security/mac_seeotheruids/mac_seeotheruids.c#13 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#26 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#44 integrate .. //depot/projects/hammer/sys/sys/gpt.h#8 integrate .. //depot/projects/hammer/sys/sys/param.h#95 integrate .. //depot/projects/hammer/sys/sys/pciio.h#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#68 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#49 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#54 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#48 integrate .. //depot/projects/hammer/usr.bin/awk/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/awk/lib.c.diff#3 delete .. //depot/projects/hammer/usr.bin/awk/tran.c.diff#2 delete .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#57 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.c#11 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#37 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.114 2007/10/22 12:31:23 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd +OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached ==== //depot/projects/hammer/UPDATING#109 (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/hammer/contrib/one-true-awk/FIXES#8 (text+ko) ==== @@ -25,6 +25,14 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Oct 23, 2007: + minor fix in lib.c: increase inputFS to 100, change malloc + for fields to n+1. + + fixed memory fault caused by out of order test in setsval. + + thanks to david o'brien, freebsd, for both fixes. + May 1, 2007: fiddle in makefile to fix for BSD make; thanks to igor sobrado. ==== //depot/projects/hammer/contrib/one-true-awk/FREEBSD-upgrade#8 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $ Import of the 2005/04/24 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). -Original sources were taken from the Brian Kernighan's home page -(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru -May 01, 2007. +Original sources were taken from the Brian Kernighan's AWK page +http://www.cs.princeton.edu/~bwk/btl.mirror +and include bug fixes up thru Oct 23, 2007. The following files were removed for this import: @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023 ==== //depot/projects/hammer/contrib/one-true-awk/lib.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ int fieldssize = RECSIZE; Cell **fldtab; /* pointers to Cells */ -char inputFS[10] = " "; +char inputFS[100] = " "; #define MAXFLD 2 int nfields = MAXFLD; /* last allocated slot for $i */ @@ -58,7 +58,7 @@ void recinit(unsigned int n) { if ( (record = (char *) malloc(n)) == NULL - || (fields = (char *) malloc(n)) == NULL + || (fields = (char *) malloc(n+1)) == NULL || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL ) FATAL("out of space for $0 and fields"); ==== //depot/projects/hammer/contrib/one-true-awk/tran.c#4 (text+ko) ==== @@ -332,10 +332,10 @@ donerec = 1; } t = tostring(s); /* in case it's self-assign */ + if (freeable(vp)) + xfree(vp->sval); vp->tval &= ~NUM; vp->tval |= STR; - if (freeable(vp)) - xfree(vp->sval); vp->tval &= ~DONTFREE; dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); ==== //depot/projects/hammer/etc/rc.d/Makefile#57 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ .include @@ -25,7 +25,7 @@ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/hammer/etc/rc.d/amd#14 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ # # PROVIDE: amd @@ -47,7 +47,7 @@ ;; *) rc_flags="-p ${rc_flags}" - command_args=" > /var/run/amd.pid 2> /dev/null" + command_args="> /var/run/amd.pid 2> /dev/null" ;; esac return 0 ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#37 (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 @@ -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/hammer/lib/libstand/Makefile#19 (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/hammer/sbin/gpt/Makefile#7 (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/hammer/sbin/gpt/add.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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 @@ -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/hammer/sbin/gpt/gpt.8#14 (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 +.Ic boot +command allows the user to make a GPT labeled disk bootable via the BIOS +bootstrap on i386 and amd64 machines. +By default, +the +.Pa /boot/pmbr +boot loader is installed into the PMBR and the +.Pa /boot/gptboot +boot loader is installed into the first boot partition. +If no boot partition exists and there is available space, +a boot partition will be created. +.Pp +The +.Fl b Ar pmbr +option allows the user to specify an alternate path for the PMBR boot loader. +.Pp +The +.Fl g Ar gptboot +option allows the user to specify an alternate path for the GPT boot loader +that is installed into the boot partition. +.Pp +The +.Fl s Ar count +option allows the user to specify the size in sectors of the boot partition +if one does not already exist. +A boot partition must be at least 16 kilobytes. +By default, +a size of 64 kilobytes is used. +Note that the PMBR boot loader will load the entire boot partition into +memory. +As a result, the boot partition may not exceed 545 kilobytes. .\" ==== create ==== .It Nm Ic create Oo Fl fp Oc Ar device ... The ==== //depot/projects/hammer/sbin/gpt/gpt.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.17 2007/10/24 21:32:57 jhb Exp $"); #include #include @@ -609,6 +609,7 @@ const char *name; } cmdsw[] = { { cmd_add, "add" }, + { cmd_boot, "boot" }, { cmd_create, "create" }, { cmd_destroy, "destroy" }, { NULL, "help" }, ==== //depot/projects/hammer/sbin/gpt/gpt.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sbin/gpt/gpt.h,v 1.11 2006/06/22 22:05:28 marcel Exp $ + * $FreeBSD: src/sbin/gpt/gpt.h,v 1.12 2007/10/24 21:32:58 jhb Exp $ */ #ifndef _GPT_H_ @@ -67,6 +67,7 @@ extern int readonly, verbose; uint32_t crc32(const void *, size_t); +map_t *gpt_add_part(int, uuid_t, off_t, off_t, unsigned int *); void gpt_close(int); int gpt_open(const char *); void* gpt_read(int, off_t, size_t); @@ -76,6 +77,7 @@ void utf8_to_utf16(const uint8_t *, uint16_t *, size_t); int cmd_add(int, char *[]); +int cmd_boot(int, char *[]); int cmd_create(int, char *[]); int cmd_destroy(int, char *[]); int cmd_label(int, char *[]); ==== //depot/projects/hammer/sbin/gpt/show.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.15 2007/10/24 21:32:58 jhb Exp $"); #include @@ -54,6 +54,7 @@ static const char * friendly(uuid_t *t) { + static uuid_t boot = GPT_ENT_TYPE_FREEBSD_BOOT; static uuid_t efi_slice = GPT_ENT_TYPE_EFI; static uuid_t mslinux = GPT_ENT_TYPE_MS_BASIC_DATA; static uuid_t freebsd = GPT_ENT_TYPE_FREEBSD; @@ -71,6 +72,8 @@ if (uuid_equal(t, &efi_slice, NULL)) return ("EFI System"); + if (uuid_equal(t, &boot, NULL)) + return ("FreeBSD boot"); if (uuid_equal(t, &swap, NULL)) return ("FreeBSD swap"); if (uuid_equal(t, &ufs, NULL)) ==== //depot/projects/hammer/share/misc/committers-src.dot#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.66 2007/09/29 17:01:19 kaiw Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.67 2007/10/25 19:32:48 lulf Exp $ # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. @@ -113,6 +113,7 @@ kmacy [label="Kip Macy\nkmacy@FreeBSD.org\n2005/06/01"] le [label="Lukas Ertl\nle@FreeBSD.org\n2004/02/02"] linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2006/09/30"] +lulf [label="Ulf Lilleengen\nlulf@FreeBSD.org\n2007/10/24"] marks [label="Mark Santcroos\nmarks@FreeBSD.org\n2004/03/18"] markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2006/06/01"] matteo [label="Matteo Riondato\nmatteo@FreeBSD.org\n2006/01/18"] @@ -292,6 +293,8 @@ julian -> archie julian -> adrian +kib -> lulf + mdodd -> jake mlaier -> benjsc @@ -322,6 +325,8 @@ philip -> jls philip -> matteo +pjd -> lulf + ru -> ceri ru -> cjc ru -> eik ==== //depot/projects/hammer/sys/amd64/amd64/msi.c#5 (text+ko) ==== @@ -1,6 +1,7 @@ /*- - * Copyright (c) 2006 John Baldwin + * Copyright (c) 2006 Yahoo!, Inc. * All rights reserved. + * Written by: John Baldwin * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.6 2007/05/08 21:29:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.7 2007/10/24 21:16:22 jhb Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/conf/DEFAULTS#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.10 2007/06/11 00:38:05 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.11 2007/10/26 03:23:52 peter Exp $ machine amd64 ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#99 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.485 2007/10/19 12:30:33 kensmith Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.487 2007/10/26 02:35:42 imp Exp $ cpu HAMMER ident GENERIC @@ -279,8 +279,19 @@ device umass # Disks/Mass storage - Requires scbus and da device ums # Mouse device ural # Ralink Technology RT2500USB wireless NICs +device rum # Ralink Technology RT2501USB wireless NICs device urio # Diamond Rio 500 MP3 player device uscanner # Scanners +# USB Serial devices +device ucom # Generic com ttys +device uark # Technologies ARK3116 based serial adapters +device ubsa # Belkin F5U103 and compatible serial adapters +device ubser # BWCT console serial adapters +device uftdi # For FTDI usb serial adapters +device uipaq # Some WinCE based devices +device uplcom # Prolific PL-2303 serial adapters +device uvisor # Visor and Palm devices +device uvscom # USB serial support for DDI pocket's PHS # USB Ethernet, requires miibus device aue # ADMtek USB Ethernet device axe # ASIX Electronics USB Ethernet @@ -288,6 +299,7 @@ device cue # CATC USB Ethernet device kue # Kawasaki LSI USB Ethernet device rue # RealTek RTL8150 USB Ethernet +device udav # Davicom DM9601E USB # FireWire support device firewire # FireWire bus code ==== //depot/projects/hammer/sys/amd64/include/clock.h#25 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.55 2007/10/26 03:23:53 peter Exp $ */ #ifndef _MACHINE_CLOCK_H_ ==== //depot/projects/hammer/sys/amd64/isa/clock.c#66 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.234 2007/09/14 01:12:39 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.235 2007/10/26 03:23:53 peter Exp $"); /* * Routines to handle clock hardware. ==== //depot/projects/hammer/sys/arm/at91/at91rm92reg.h#6 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.5 2007/07/31 17:43:18 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.6 2007/10/25 23:02:42 cognet Exp $ */ #ifndef AT91RM92REG_H_ #define AT91RM92REG_H_ @@ -340,7 +340,9 @@ #define AT91RM92_OHCI_PA_BASE 0x00300000 #define AT91RM92_OHCI_SIZE 0x00100000 +#ifndef AT91C_MASTER_CLOCK #define AT91C_MASTER_CLOCK 60000000 +#endif /* SDRAMC */ ==== //depot/projects/hammer/sys/arm/at91/if_ate.c#9 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.20 2007/06/11 19:36:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.21 2007/10/24 23:12:19 cognet Exp $"); #include #include @@ -597,12 +597,12 @@ high = RD4(sc, ETH_SA1H); if ((low | (high & 0xffff)) == 0) return (ENXIO); - eaddr[0] = (high >> 8) & 0xff; - eaddr[1] = high & 0xff; - eaddr[2] = (low >> 24) & 0xff; - eaddr[3] = (low >> 16) & 0xff; - eaddr[4] = (low >> 8) & 0xff; - eaddr[5] = low & 0xff; + eaddr[0] = low & 0xff; + eaddr[1] = (low >> 8) & 0xff; + eaddr[2] = (low >> 16) & 0xff; + eaddr[3] = (low >> 24) & 0xff; + eaddr[4] = high & 0xff; + eaddr[5] = (high >> 8) & 0xff; return (0); } ==== //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#9 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.23 2007/07/31 17:43:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.26 2007/10/25 22:43:17 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -283,10 +283,10 @@ i += 2; fake_preload[i++] = MODINFO_ADDR; fake_preload[i++] = sizeof(vm_offset_t); >>> TRUNCATED FOR MAIL (1000 lines) <<<