PERFORCE change 128099 for review

John Birrell jb at FreeBSD.org
Thu Oct 25 16:12:50 PDT 2007


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

Change 128099 by jb at jb_freebsd1 on 2007/10/25 23:12:34

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#48 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#32 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#42 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#24 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/lulf.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#26 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#25 integrate
.. //depot/projects/dtrace/ports/LEGAL#24 integrate
.. //depot/projects/dtrace/ports/MOVED#48 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#11 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/tindex#5 integrate
.. //depot/projects/dtrace/ports/UPDATING#38 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#25 integrate
.. //depot/projects/dtrace/src/UPDATING#19 integrate
.. //depot/projects/dtrace/src/contrib/one-true-awk/FIXES#5 integrate
.. //depot/projects/dtrace/src/contrib/one-true-awk/FREEBSD-upgrade#5 integrate
.. //depot/projects/dtrace/src/contrib/one-true-awk/lib.c#5 integrate
.. //depot/projects/dtrace/src/contrib/one-true-awk/tran.c#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/Makefile#14 integrate
.. //depot/projects/dtrace/src/etc/rc.d/amd#7 integrate
.. //depot/projects/dtrace/src/etc/rc.d/nfslocking#5 delete
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#10 integrate
.. //depot/projects/dtrace/src/lib/libstand/Makefile#7 integrate
.. //depot/projects/dtrace/src/sbin/gpt/Makefile#4 integrate
.. //depot/projects/dtrace/src/sbin/gpt/add.c#5 integrate
.. //depot/projects/dtrace/src/sbin/gpt/boot.c#1 branch
.. //depot/projects/dtrace/src/sbin/gpt/gpt.8#4 integrate
.. //depot/projects/dtrace/src/sbin/gpt/gpt.c#5 integrate
.. //depot/projects/dtrace/src/sbin/gpt/gpt.h#4 integrate
.. //depot/projects/dtrace/src/sbin/gpt/show.c#4 integrate
.. //depot/projects/dtrace/src/share/misc/committers-src.dot#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/msi.c#3 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#11 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#18 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac_init.c#6 integrate
.. //depot/projects/dtrace/src/sys/boot/common/ufsread.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/boot2/boot2.c#7 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/bioscd.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/biosdisk.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/devicename.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/loader/main.c#8 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/dtrace/src/sys/boot/pc98/boot2/boot.c#7 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/libpc98/bioscd.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/libpc98/biosdisk.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/loader/main.c#6 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#10 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_getcwd.c#6 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#18 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#7 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#9 integrate
.. //depot/projects/dtrace/src/sys/conf/files#46 integrate
.. //depot/projects/dtrace/src/sys/conf/files.amd64#18 integrate
.. //depot/projects/dtrace/src/sys/conf/files.arm#9 integrate
.. //depot/projects/dtrace/src/sys/conf/files.i386#22 integrate
.. //depot/projects/dtrace/src/sys/conf/files.ia64#8 integrate
.. //depot/projects/dtrace/src/sys/conf/files.powerpc#11 integrate
.. //depot/projects/dtrace/src/sys/conf/files.sun4v#12 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#9 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_if.c#5 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_table.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_ibm.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_ec.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci_user.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_devs.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#11 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/denode.h#8 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_fat.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#9 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/PAE#7 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/msi.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_misc.c#9 integrate
.. //depot/projects/dtrace/src/sys/i386/include/bootinfo.h#4 integrate
.. //depot/projects/dtrace/src/sys/kern/init_main.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_acct.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_alq.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_environment.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exit.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_jail.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_ktrace.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_linker.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_prot.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sysctl.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/link_elf.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/link_elf_obj.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_pipe.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_socket.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_msg.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_sem.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_shm.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_mbuf2.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_sem.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#10 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.c#14 integrate
.. //depot/projects/dtrace/src/sys/net/bsd_comp.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if.c#11 integrate
.. //depot/projects/dtrace/src/sys/net/if_atmsubr.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#12 integrate
.. //depot/projects/dtrace/src/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_fwsubr.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.c#9 integrate
.. //depot/projects/dtrace/src/sys/net/if_iso88025subr.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_ppp.c#10 integrate
.. //depot/projects/dtrace/src/sys/net/if_stf.c#9 integrate
.. //depot/projects/dtrace/src/sys/net/if_tun.c#10 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/dtrace/src/sys/netatalk/ddp_input.c#6 integrate
.. //depot/projects/dtrace/src/sys/netatalk/ddp_output.c#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#21 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_input.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_options.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_output.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_timewait.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#12 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsock.c#7 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_audit.c#2 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#11 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_internal.h#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_net.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_pipe.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#5 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_posix_sem.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_process.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_socket.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_syscalls.c#3 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_system.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_sysv_msg.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_sysv_sem.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_sysv_shm.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_vfs.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac_biba/mac_biba.c#12 integrate
.. //depot/projects/dtrace/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac_ifoff/mac_ifoff.c#6 integrate
.. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#11 integrate
.. //depot/projects/dtrace/src/sys/security/mac_none/mac_none.c#6 integrate
.. //depot/projects/dtrace/src/sys/security/mac_partition/mac_partition.c#7 integrate
.. //depot/projects/dtrace/src/sys/security/mac_portacl/mac_portacl.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 integrate
.. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac_test/mac_test.c#8 integrate
.. //depot/projects/dtrace/src/sys/sys/gpt.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#22 integrate
.. //depot/projects/dtrace/src/sys/sys/pciio.h#5 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#16 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#12 integrate
.. //depot/projects/dtrace/src/sys/vm/swap_pager.c#14 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#9 integrate
.. //depot/projects/dtrace/src/usr.bin/awk/Makefile#6 integrate
.. //depot/projects/dtrace/src/usr.bin/awk/lib.c.diff#4 delete
.. //depot/projects/dtrace/src/usr.bin/awk/tran.c.diff#2 delete
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#14 integrate
.. //depot/projects/dtrace/src/usr.sbin/traceroute6/traceroute6.c#5 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#22 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/Makefile#7 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#13 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq220.sgml#1 branch
.. //depot/projects/dtrace/www/en/gnome/images/Makefile#8 integrate
.. //depot/projects/dtrace/www/en/gnome/images/ss218-1-tn.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-1.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-2-tn.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-2.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-3-tn.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/images/ss218-3.png#2 delete
.. //depot/projects/dtrace/www/en/gnome/index.xsl#9 integrate
.. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#9 integrate
.. //depot/projects/dtrace/www/share/sgml/navibar.ent#5 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#23 integrate
.. //depot/projects/dtrace/www/share/sgml/press.xml#16 integrate
.. //depot/projects/dtrace/www/share/sgml/release.ent#10 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#48 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.735 2007/10/21 02:59:09 alepulver Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.737 2007/10/25 19:13:22 lulf Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -9128,6 +9128,11 @@
     </listitem>
 
     <listitem>
+      <para>Thomas Hurst
+	<email>tom at hur.st</email></para>
+    </listitem>
+
+    <listitem>
       <para>Thomas Kempka
 	<email>t.kempka at web.de</email></para>
     </listitem>
@@ -9463,11 +9468,6 @@
     </listitem>
 
     <listitem>
-      <para>Ulf Lilleengen
-	<email>lulf at kerneled.org</email></para>
-    </listitem>
-
-    <listitem>
       <para>Ulli Linzen
 	<email>ulli at perceval.camelot.de</email></para>
     </listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#32 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.210 2007/10/14 11:55:29 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.211 2007/10/25 19:13:22 lulf Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -694,6 +694,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.lulf;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.clive;</para>
     </listitem>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#7 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.32 2007/08/22 18:18:25 chinsan Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.33 2007/10/25 07:55:54 trhodes Exp $
 
 -->
 
@@ -575,7 +575,6 @@
     </sect2>
   </sect1>
 
-<!--
   <sect1 id="geom-gjournal">
     <title>UFS Journaling Through GEOM</title>
     
@@ -661,7 +660,6 @@
       incurred as a result of misusing
       <command>tunefs</command>.</para>
   </sect1>
--->
 </chapter>
 
 <!--

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#12 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.439 2007/10/23 02:15:23 loader Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.440 2007/10/24 09:46:19 loader Exp $
 -->
 
 <appendix id="mirrors">
@@ -50,7 +50,7 @@
 	  Phone: <phone>+1 866 273-6255</phone>
 	  Fax: <fax>+1 217 453-9956</fax>
 	  Email: <email>sales at bsdmall.com</email>
-	  WWW: <otheraddr><ulink url="http://www.bsdmall.com/freebsd1.html"></ulink></otheraddr>
+	  WWW: <otheraddr><ulink url="http://www.bsdmall.com/"></ulink></otheraddr>
         </address>
       </listitem>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#42 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.879 2007/10/21 18:42:57 julian Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.882 2007/10/25 20:36:01 delphij Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11293,6 +11293,13 @@
 		    <entry>602112</entry>
 		  </row>
 		  <row>
+		    <entry>6.2-STABLE after MFC of wide and single byte
+		      ctype separation.  Newly compiled binary that references
+		      to ctype.h may require a new symbol, __mb_sb_limit,
+		      which is not available on older systems.</entry>
+		    <entry>602113</entry>
+		  </row>
+		  <row>
 		    <entry>7.0-CURRENT.</entry>
 		    <entry>700000</entry>
 		  </row>
@@ -11573,6 +11580,11 @@
 		    <entry>700053</entry>
 		  </row>
 		  <row>
+		    <entry>7.0-STABLE after MFC of wide and single byte
+		      ctype separation.</entry>
+		    <entry>700054</entry>
+		  </row>
+		  <row>
 		    <entry>8.0-CURRENT. Separating wide and single byte
 		      ctype.</entry>
 		    <entry>800000</entry>
@@ -11587,6 +11599,14 @@
 		      and friends to kproc_create() etc.</entry>
 		    <entry>800002</entry>
 		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after ABI backwards compatibility
+		      to the FreeBSD 4/5/6 versions of the PCIOCGETCONF,
+		      PCIOCREAD and PCIOCWRITE IOCTLs was added, which
+		      required the ABI of the PCIOCGETCONF IOCTL to be
+		      broken again
+		    <entry>800003</entry>
+		  </row>
 
 		</tbody>
 	      </tgroup>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#24 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.431 2007/09/28 14:55:47 kaiw Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.432 2007/10/25 18:51:21 lulf Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -600,6 +600,8 @@
 
 <!ENTITY a.luigi "Luigi Rizzo <email>luigi at FreeBSD.org</email>">
 
+<!ENTITY a.lulf "Ulf Lilleengen <email>lulf at FreeBSD.org</email>">
+
 <!ENTITY a.luoqi "Luoqi Chen <email>luoqi at FreeBSD.org</email>">
 
 <!ENTITY a.lwhsu "Li-Wen Hsu <email>lwhsu at FreeBSD.org</email>">

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#26 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.56 2007/10/01 13:19:12 jkois Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.57 2007/10/25 19:28:58 lulf Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -589,6 +589,11 @@
       &pgpkey.ijliao;
     </sect2>
 
+    <sect2 id="pgpkey-lulf">
+      <title>&a.lulf;</title>
+      &pgpkey.lulf;
+    </sect2>
+
     <sect2 id="pgpkey-clive">
       <title>&a.clive;</title>
       &pgpkey.clive;

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#25 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.152 2007/09/28 15:42:39 kaiw Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.153 2007/10/25 19:28:58 lulf Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -146,6 +146,7 @@
 <!ENTITY pgpkey.loader SYSTEM "loader.key">
 <!ENTITY pgpkey.lofi SYSTEM "lofi.key">
 <!ENTITY pgpkey.lth SYSTEM "lth.key">
+<!ENTITY pgpkey.lulf SYSTEM "lulf.key">
 <!ENTITY pgpkey.luoqi SYSTEM "luoqi.key">
 <!ENTITY pgpkey.lwhsu SYSTEM "lwhsu.key">
 <!ENTITY pgpkey.lx SYSTEM "lx.key">

==== //depot/projects/dtrace/ports/LEGAL#24 (text+ko) ====

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.555 2007/10/11 19:35:06 vd Exp $
+# $FreeBSD: ports/LEGAL,v 1.556 2007/10/24 19:49:20 garga Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -494,6 +494,11 @@
 							not sure of its license
 savage/SFE*		games/linux-savage	Savage is freeware, but i am
 						not sure of its license
+scim-kmfl-sil-ipa-unicode5* textproc/scim-kmfl-sil-ipa-unicode5	SIL's Freeware License
+								(a) doesn't allow distribution,
+								(b) makes keyboard free for personal use only,
+								(c) doesn't allow distribution of modified
+								    keyboard sources under the same name.
 sdr-*			mbone/sdr		Crypto; export-controlled
 seatools_cli.tar	sysutils/seatools	Distfile should be loaded by hand
 serialmail-*		mail/serialmail		No license -- see

==== //depot/projects/dtrace/ports/MOVED#48 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1505 2007/10/21 19:33:24 beech Exp $
+# $FreeBSD: ports/MOVED,v 1.1508 2007/10/25 14:52:54 hrs Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3319,3 +3319,7 @@
 devel/bison2|devel/bison|2007-10-17|Bison 1.x to 2.x conversion
 games/actioncube|games/assaultcube|2007-10-19|Project name changed
 x11-fm/pcmanfm||2007-10-21|Has expired: Unmaintained upstream
+graphics/gimp-devel|graphics/gimp|2007-10-24|Gimp 2.4.0 released
+graphics/gimp-app-devel|graphics/gimp-app|2007-10-24|Gimp 2.4.0 released
+print/gimp-devel-gutenprint|print/gimp-gutenprint|2007-10-24|Gimp 2.4.0 released
+print/yatex-mule||2007-10-25|Has expired: emacs19 and related ports are obsolete

==== //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#11 (text+ko) ====

@@ -1,9 +1,9 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.143 2007/08/04 11:37:23 gabor Exp $
+# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.144 2007/10/24 23:34:29 marcus Exp $
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.429 2007/08/04 22:09:00 marcus Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -40,9 +40,9 @@
 #					  each .omf file found to track OMF registration database.
 #
 # INSTALLS_ICONS	- If your port installs Freedesktop-style icons to
-#					  ${LOCALBASE}/share/icons or ${X11BASE}/share/icons, then
-#					  you should use this macro. If the icons are not cached,
-#					  they will not be displayed.
+#					  ${LOCALBASE}/share/icons, then you should use this
+#					  macro. If the icons are not cached, they will not be
+#					  displayed.
 #
 
 # non-version specific components
@@ -59,40 +59,25 @@
 _USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \
 		gal2 gconf2 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \
 		gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \
-		gtkhtml3 gtksharp10 gtksharp20 gtksourceview libartlgpl2 libbonobo \
-		libbonoboui libgailgnome libgda2 libgda3 libglade2 libgnome \
-		libgnomecanvas libgnomedb libgnomeprint libgnomeprintui \
-		libgnomeui libgsf libgsf_gnome libgtkhtml libidl librsvg2 libwnck \
-		libxml2 libxslt libzvt linc metacity nautilus2 nautiluscdburner \
-		orbit2 pango pygnome2 pygnomeextras pygtk2 vte pygnomedesktop \
-		libgnomekbd
+		gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 \
+		libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 \
+		libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \
+		libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \
+		librsvg2 libwnck libxml2 libxslt libzvt linc metacity nautilus2 \
+		nautiluscdburner orbit2 pango pygnome2 pygnomedesktop pygnomeextras \
+		pygtk2 pygtksourceview vte
 
 GNOME_MAKEFILEIN?=	Makefile.in
-SCROLLKEEPER_DIR=	/var/db/scrollkeeper
+SCROLLKEEPER_DIR=	/var/db/rarian
 gnomehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${XARGS} ${REINPLACE_CMD} -e \
-				's|[(]GNOME_datadir[)]/gnome/|(datadir)/|g ; \
-				 s|[(]GNOME_datadir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g ; \
-				 s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \
-				 s|[(]datadir[)]/gnome/|(datadir)/|g ; \
-				 s|[(]datadir[)]/mime/|(prefix)/share/mime/|g ; \
-				 s|[(]datadir[)]/mime"|(prefix)/share/mime"|g ; \
-				 s|[(]datadir[)]/mime;|(prefix)/share/mime;|g ; \
-				 s|[(]datadir[)]/mime$$|(prefix)/share/mime|g ; \
-				 s|[(]datadir[)]/dbus-1|(prefix)/share/dbus-1|g ; \
+				's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 				 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+				 s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 				 s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
-				 s|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g ; \
-				 s|{datadir}/icons/hicolor|{prefix}/share/icons/hicolor|g ; \
 				 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
 			${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 				's|-lpthread|${PTHREAD_LIBS}|g ; \
 				 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-				 s|{datadir}/locale|{prefix}/share/locale|g ; \
-				 s|DATADIR/dbus-1/services|prefix/share/dbus-1/services|g ; \
-				 s|datadir/dbus-1/services|prefix/share/dbus-1/services|g ; \
 				 s|{libdir}/locale|{prefix}/share/locale|g'
 
 referencehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \
@@ -109,12 +94,10 @@
 GCONF_CONFIG_OPTIONS?=	merged
 GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults
 GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY}
-GNOME_LOCALSTATEDIR?=	${PREFIX}/share/gnome
+GNOME_LOCALSTATEDIR?=	${PREFIX}/share
 gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
 gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \
-			   --datadir=${PREFIX}/share/gnome \
 			   --with-html-dir=${GNOME_HTML_DIR} \
-			   --with-help-dir=${PREFIX}/share/gnome/help \
 			   --disable-gtk-doc \
 			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 gnomeprefix_USE_GNOME_IMPL=gnomehier
@@ -322,11 +305,11 @@
 
 gail_LIB_DEPENDS=	gailutil.18:${PORTSDIR}/accessibility/gail
 gail_DETECT=		${LOCALBASE}/libdata/pkgconfig/gail.pc
-gail_USE_GNOME_IMPL=	libgnomecanvas
+gail_USE_GNOME_IMPL=	gtk20
 
 libgnomecanvas_LIB_DEPENDS=	gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
 libgnomecanvas_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc
-libgnomecanvas_USE_GNOME_IMPL=	libglade2 libartlgpl2
+libgnomecanvas_USE_GNOME_IMPL=	libglade2 libartlgpl2 gail
 
 libartlgpl2_LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl
 libartlgpl2_DETECT=		${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc
@@ -369,7 +352,7 @@
 gnomedesktop_USE_GNOME_IMPL=	libgnomeui gnomedocutils
 gnomedesktop_GNOME_DESKTOP_VERSION=2
 
-libwnck_LIB_DEPENDS=	wnck-1.18:${PORTSDIR}/x11-toolkits/libwnck
+libwnck_LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
 libwnck_DETECT=		${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
 libwnck_USE_GNOME_IMPL=	gtk20
 
@@ -427,6 +410,10 @@
 gtksourceview_DETECT=	${LOCALBASE}/libdata/pkgconfig/gtksourceview-1.0.pc
 gtksourceview_USE_GNOME_IMPL=libgnome libgnomeprintui
 
+gtksourceview2_LIB_DEPENDS=	gtksourceview-2.0.0:${PORTSDIR}/x11-toolkits/gtksourceview2
+gtksourceview2_DETECT=	${LOCALBASE}/libdata/pkgconfig/gtksourceview-2.0.pc
+gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2
+
 pkgconfig_DETECT=			${LOCALBASE}/bin/pkg-config
 pkgconfig_BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 pkgconfig_RUN_DEPENDS=		pkg-config:${PORTSDIR}/devel/pkg-config
@@ -518,6 +505,11 @@
 libgnomekbd_LIB_DEPENDS=	gnomekbd.1:${PORTSDIR}/x11/libgnomekbd
 libgnomekbd_USE_GNOME_IMPL=	libgnomeui
 
+pygtksourceview_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
+pygtksourceview_BUILD_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
+pygtksourceview_RUN_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
+pygtksourceview_USE_GNOME_IMPL=	gtksourceview2 pygtk2
+
 # End component definition section
 
 # This section defines tests for optional software.  These work off four

==== //depot/projects/dtrace/ports/Tools/scripts/tindex#5 (text+ko) ====

@@ -32,6 +32,7 @@
 export SRCDIR5=${BASEDIR}/src.5
 export SRCDIR6=${BASEDIR}/src.6
 export SRCDIR7=${BASEDIR}/src.7
+export SRCDIR8=${BASEDIR}/src.8
 
 # Target architecture if not set in the environment
 if [ "${ARCH}" = "" ]; then
@@ -139,18 +140,23 @@
 # First update the source trees to get current OSVERSION
 cd ${SRCDIR5}/sys/sys
 cvs -Rq update -PdA -r RELENG_5 param.h
-OSVERSION5=$(awk '/^#define __FreeBSD_version/ {print $3}' < ${SRCDIR5}/sys/sys/param.h)
+OSVERSION5=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR5}/sys/sys/param.h)
 
 cd ${SRCDIR6}/sys/sys
 cvs -Rq update -PdA -r RELENG_6 param.h
-OSVERSION6=$(awk '/^#define __FreeBSD_version/ {print $3}' < ${SRCDIR6}/sys/sys/param.h)
+OSVERSION6=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR6}/sys/sys/param.h)
 
 cd ${SRCDIR7}/sys/sys
+cvs -Rq update -PdA -r RELENG_7 param.h
+OSVERSION7=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR7}/sys/sys/param.h)
+
+cd ${SRCDIR8}/sys/sys
 cvs -Rq update -PdA param.h
-OSVERSION7=$(awk '/^#define __FreeBSD_version/ {print $3}' < ${SRCDIR7}/sys/sys/param.h)
+OSVERSION8=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR8}/sys/sys/param.h)
+
 
 cd ${PORTSDIR}
-rm -f INDEX-5 INDEX-5.bz2 INDEX-6 INDEX-6.bz2 INDEX-7 INDEX-7.bz2
+rm -f INDEX-5 INDEX-5.bz2 INDEX-6 INDEX-6.bz2 INDEX-7 INDEX-7.bz2 INDEX-8 INDEX-8.bz2 
 (cvs -Rq update -PdA 2>1 ) > cvs.log
 if grep -q ^C cvs.log ; then
   (echo "cvs update failed with conflicts:";
@@ -203,5 +209,20 @@
 scp -q ${SSHKEY} ${PORTSDIR}/INDEX-7 ${PORTSDIR}/INDEX-7.bz2 ${SCP_DEST_HOST}:${TMPDIR} || mail -s "Cannot copy INDEX-7 to temp dir" ${ERROR_ADDRESS}
 ssh ${SCP_DEST_HOST} "/bin/mv ${TMPDIR}/INDEX-7 ${SCP_DEST_DIR}; /bin/mv ${TMPDIR}/INDEX-7.bz2 ${SCP_DEST_DIR}; rmdir ${TMPDIR}" || mail -s "Cannot move INDEX-7 to final dir" ${ERROR_ADDRESS}
 
+BRANCH=8.x
+export OSVERSION=${OSVERSION8}
+echo "Building INDEX for ${BRANCH} with OSVERSION=${OSVERSION}"
+cd ${PORTSDIR}
+((make index 2> index.err) > index.out) || indexfail ${BRANCH}
+if [ -s index.err ]; then
+	indexfail ${BRANCH}
+fi
+checkfixed ${BRANCH}
+
+createtmpdir
+bzip2 -kf ${PORTSDIR}/INDEX-8
+scp -q ${SSHKEY} ${PORTSDIR}/INDEX-8 ${PORTSDIR}/INDEX-8.bz2 ${SCP_DEST_HOST}:${TMPDIR} || mail -s "Cannot copy INDEX-8 to temp dir" ${ERROR_ADDRESS}
+ssh ${SCP_DEST_HOST} "/bin/mv ${TMPDIR}/INDEX-8 ${SCP_DEST_DIR}; /bin/mv ${TMPDIR}/INDEX-8.bz2 ${SCP_DEST_DIR}; rmdir ${TMPDIR}" || mail -s "Cannot move INDEX-8 to final dir" ${ERROR_ADDRESS}
+
 # All indexes built successfully, clear the hook
 rm -f ${PORTSDIR}/hook

==== //depot/projects/dtrace/ports/UPDATING#38 (text+ko) ====

@@ -6,6 +6,40 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20071024:
+  AFFECTS: All GNOME users and ports depend on gnomehier
+  AUTHOR: gnome at FreeBSD.org
+
+  GNOME has been updated to 2.20.1. All ports that depend on gnomehier have
+  had their DATADIR moved from share/gnome/ to share/ (e.g.
+  ${LOCALBASE}/share/gnome/ to ${LOCALBASE}/share/).
+  This puts the FreeBSD GNOME ports more in line with the default
+  GNOME installation hierarchy. To find the specific directories that
+  have changed, see misc/gnomehier/files/dirlist. To upgrade your
+  installed ports, you will need to use either sysutils/portupgrade or
+  sysutils/portmaster.
+
+    Portupgrade users:
+        # pkgdb -Ff
+        # portupgrade -f -o textproc/rarian textproc/scrollkeeper
+        # portupgrade -a
+
+    Portmaster users:
+        # portmaster -o textproc/rarian textproc/scrollkeeper
+        # portmaster -a
+
+  If some of icons, applets, themes or other customized items have
+  disappered from your desktop in this upgrade, you will need to
+  remove and re-add these items to make them appear again due to the
+  DATADIR change.
+
+20071024:
+  AFFECTS: users of databases/mysql-connector-java
+  AUTHOR: miwi at FreeBSD.org
+
+  databases/mysql-connector-java version is 5.1.5 now. 5.0.8 version was
+  preserved on databases/mysql-connector-java50 port.
+
 20071009:
   AFFECTS: users of mail/vpopmail
   AUTHOR: roam at FreeBSD.org
@@ -79,7 +113,7 @@
   AFFECTS: users of sysutils/nut sysutils/nut-*
   AUTHOR: Martin Matuska <mm at FreeBSD.org>
 
-  The slave ports sysutils/nut-libupsclient, sysutils/nut-snmp and 
+  The slave ports sysutils/nut-libupsclient, sysutils/nut-snmp and
   sysutils/nut-usb have been removed with the upgrade of sysutils/nut to 2.2.0
   They are now fully integrated into sysutils/nut and their functionality
   can be enabled/disabled in OPTIONS of sysutils/nut.
@@ -117,10 +151,10 @@
   AFFECTS: users of devel/p5-gearmand
   AUTHOR: clsung at FreeBSD.org
 
-  The port p5-gearmand has been splited up, so Gearman servers can 
-  be embedded into other processes. The Gearman::Server class is 
+  The port p5-gearmand has been splited up, so Gearman servers can
+  be embedded into other processes. The Gearman::Server class is
   located at devel/p5-Gearman-Server, if you have devel/p5-gearmand
-  installed, perform an upgrade devel/p5-Gearman-Server with a 
+  installed, perform an upgrade devel/p5-Gearman-Server with a
   command like:
 
     # portupgrade -o devel/p5-Gearman-Server devel/p5-gearmand
@@ -137,7 +171,7 @@
   AUTHOR: Wesley Shields <wxs at atarininja.org>
 
   The new version of grok has changed the meaning of a couple of
-  pre-defined patterns. 
+  pre-defined patterns.
   Please see /usr/local/share/doc/grok/CHANGELIST for more
   information. Existing grok.conf may be broken by these changes.
 
@@ -5785,4 +5819,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.559 2007/10/20 10:41:09 rafan Exp $
+$FreeBSD: ports/UPDATING,v 1.563 2007/10/25 07:43:49 marcus Exp $

==== //depot/projects/dtrace/src/ObsoleteFiles.inc#25 (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/dtrace/src/UPDATING#19 (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/dtrace/src/contrib/one-true-awk/FIXES#5 (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/dtrace/src/contrib/one-true-awk/FREEBSD-upgrade#5 (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/dtrace/src/contrib/one-true-awk/lib.c#5 (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/dtrace/src/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/dtrace/src/etc/rc.d/Makefile#14 (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 <bsd.own.mk>
 
@@ -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/dtrace/src/etc/rc.d/amd#7 (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/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#10 (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/dtrace/src/lib/libstand/Makefile#7 (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 $

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


More information about the p4-projects mailing list