Date: Thu, 5 Oct 2006 07:46:48 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107298 for review Message-ID: <200610050746.k957kmMs026529@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107298 Change 107298 by jb@jb_freebsd7 on 2006/10/05 07:45:58 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#26 integrate .. //depot/projects/dtrace/ports/KNOBS#6 integrate .. //depot/projects/dtrace/ports/LEGAL#8 integrate .. //depot/projects/dtrace/src/crypto/openssh/configure.ac#4 integrate .. //depot/projects/dtrace/src/include/elf.h#4 integrate .. //depot/projects/dtrace/src/sbin/gpt/add.c#3 integrate .. //depot/projects/dtrace/src/sbin/gpt/label.c#3 integrate .. //depot/projects/dtrace/src/sbin/gpt/remove.c#3 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#8 integrate .. //depot/projects/dtrace/src/share/man/man9/kqueue.9#1 branch .. //depot/projects/dtrace/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/dtrace/src/sys/compat/ia32/ia32_genassym.c#3 integrate .. //depot/projects/dtrace/src/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/dtrace/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/dtrace/src/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/dtrace/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/dtrace/src/sys/conf/options.sun4v#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sig.c#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/compile/.cvsignore#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#9 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC.hints#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/MAC#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_bus.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_inttypes.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_limits.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_stdint.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_types.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/asm.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/asmacros.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/atomic.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/bus.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/bus_common.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/bus_dma.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/bus_private.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/cache.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ccr.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/dtrace/src/sys/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/dtrace/src/sys/sun4v/include/clock.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/cpu.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/cpufunc.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/db_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/endian.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/exec.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/float.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/floatingpoint.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/fp.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/frame.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/fsr.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/gdb_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/hv_pcivar.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/hviommu.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/hypervisorvar.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/idprom.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ieee.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ieeefp.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/in_cksum.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/instr.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/intr_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/iommureg.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/iommuvar.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/kdb.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/kerneldump.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ktr.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/limits.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/lsu.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/md_var.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/dtrace/src/sys/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/dtrace/src/sys/sun4v/include/memdev.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/metadata.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/mmu.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/mutex.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/nexusvar.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_bus.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_mem.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_nexus.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_upa.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/param.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pmap.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pmc_mdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/proc.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pstate.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ptrace.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/reg.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/reloc.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/resource.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/runq.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sc_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/setjmp.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sf_buf.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sigframe.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/signal.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/stdarg.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sysarch.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tick.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tlb.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tstate.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tte_hash.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ucontext.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/utrap.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/varargs.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/watch.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/wstate.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/sun4v/autoconf.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/clock.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/counter.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_disasm.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_hwwatch.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_interface.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_trace.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/eeprom.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/elf_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/exception.S#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/fpemu.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/sun4v/gdb_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/genassym.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hviommu.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/identcpu.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/in_cksum.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/iommu.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/locore.S#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mem.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_exception.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/ofw_bus.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/ofw_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#12 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/prof_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/rtc.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/rwindow.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/sys_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/t1_copy.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tick.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tlb.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#8 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap_trace.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/dtrace/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/dtrace/src/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/dtrace/www/en/projects/Makefile#4 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode-2006.sgml#1 branch Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#26 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.618 2006/10/04 20:03:37 alepulver Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.620 2006/10/05 00:40:40 alepulver Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -4682,6 +4682,11 @@ </listitem> <listitem> + <para>Jun Mukai + <email>mukai@jmuk.org</email></para> + </listitem> + + <listitem> <para>Junichi Satoh <email>junichi@jp.FreeBSD.org</email></para> </listitem> @@ -6282,6 +6287,11 @@ </listitem> <listitem> + <para>Milan Obuch + <email>bsd@dino.sk</email></para> + </listitem> + + <listitem> <para>Milosz Galazka <email>milosz.galazka@gmail.com</email></para> </listitem> ==== //depot/projects/dtrace/ports/KNOBS#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # KNOBS - A list of popular knobs and descriptions # -# $FreeBSD: ports/KNOBS,v 1.17 2006/10/04 20:20:38 shaun Exp $ +# $FreeBSD: ports/KNOBS,v 1.18 2006/10/05 03:02:18 leeym Exp $ # # Rules to adding knobs: # @@ -20,8 +20,8 @@ # Length | | Length | A52 ATSC A/52 audio decoding (used in most DVDs) +APACHE2 Use www/apache2 port ARTS aRts support via the KDE sound daemon -APACHE2 Use www/apache2 port AVIFILE Adds support for AVI multimedia BDB Adds Berkeley DB Support CACA Libcaca colored ASCII graphics @@ -41,10 +41,10 @@ ESOUND Adds support for Esound EXAMPLES Installs optional example code, graphics, etc EXIF Support for EXIF headers in JPEG or TIFF files +FAAC FAAC AAC and MP4 audio encoder support FAAD FAAD AAC and MP4 audio decoder support -FAAC FAAC AAC and MP4 audio encoder support +FIREBIRD Firebird (Interbase) database support FLAC Flac audio support -FIREBIRD Firebird (Interbase) database support GHC Prefer/use Glasgow Haskell Compiler GNOME Adds GNOME support GNUTLS Adds GnuTLS support ==== //depot/projects/dtrace/ports/LEGAL#8 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.502 2006/10/03 18:53:18 alepulver Exp $ +# $FreeBSD: ports/LEGAL,v 1.503 2006/10/05 00:11:51 alepulver Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -218,6 +218,7 @@ distribution without permission fp-freebsd-ws-* security/f-prot Free for personal use only FreeFem++* math/freefem++ No resale, not for commercial usage +framework-* security/metasploit-devel May not be re-sold freefonts-* x11-fonts/freefonts Some of the fonts are shareware. Some are freeware. Permission must be obtained ==== //depot/projects/dtrace/src/crypto/openssh/configure.ac#4 (text+ko) ==== @@ -1,5 +1,4 @@ -# $Id: configure.ac,v 1.367 2006/09/24 19:08:59 tim Exp $ -# $FreeBSD: src/crypto/openssh/configure.ac,v 1.14 2006/09/30 13:38:04 des Exp $ +# $Id: configure.ac,v 1.369 2006/10/03 16:34:35 tim Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -16,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.367 $) +AC_REVISION($Revision: 1.369 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -128,6 +127,136 @@ ] ) +# Allow user to specify flags +AC_ARG_WITH(cflags, + [ --with-cflags Specify additional flags to pass to compiler], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CFLAGS="$CFLAGS $withval" + fi + ] +) +AC_ARG_WITH(cppflags, + [ --with-cppflags Specify additional flags to pass to preprocessor] , + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CPPFLAGS="$CPPFLAGS $withval" + fi + ] +) +AC_ARG_WITH(ldflags, + [ --with-ldflags Specify additional flags to pass to linker], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LDFLAGS="$LDFLAGS $withval" + fi + ] +) +AC_ARG_WITH(libs, + [ --with-libs Specify additional libraries to link with], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LIBS="$LIBS $withval" + fi + ] +) +AC_ARG_WITH(Werror, + [ --with-Werror Build main code with -Werror], + [ + if test -n "$withval" && test "x$withval" != "xno"; then + werror_flags="-Werror" + if test "x${withval}" != "xyes"; then + werror_flags="$withval" + fi + fi + ] +) + +AC_CHECK_HEADERS( \ + bstring.h \ + crypt.h \ + crypto/sha2.h \ + dirent.h \ + endian.h \ + features.h \ + fcntl.h \ + floatingpoint.h \ + getopt.h \ + glob.h \ + ia.h \ + iaf.h \ + limits.h \ + login.h \ + maillock.h \ + ndir.h \ + net/if_tun.h \ + netdb.h \ + netgroup.h \ + pam/pam_appl.h \ + paths.h \ + pty.h \ + readpassphrase.h \ + rpc/types.h \ + security/pam_appl.h \ + sha2.h \ + shadow.h \ + stddef.h \ + stdint.h \ + string.h \ + strings.h \ + sys/audit.h \ + sys/bitypes.h \ + sys/bsdtty.h \ + sys/cdefs.h \ + sys/dir.h \ + sys/mman.h \ + sys/ndir.h \ + sys/prctl.h \ + sys/pstat.h \ + sys/select.h \ + sys/stat.h \ + sys/stream.h \ + sys/stropts.h \ + sys/strtio.h \ + sys/sysmacros.h \ + sys/time.h \ + sys/timers.h \ + sys/un.h \ + time.h \ + tmpdir.h \ + ttyent.h \ + unistd.h \ + usersec.h \ + util.h \ + utime.h \ + utmp.h \ + utmpx.h \ + vis.h \ +) + +# lastlog.h requires sys/time.h to be included first on Solaris +AC_CHECK_HEADERS(lastlog.h, [], [], [ +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif +]) + +# sys/ptms.h requires sys/stream.h to be included first on Solaris +AC_CHECK_HEADERS(sys/ptms.h, [], [], [ +#ifdef HAVE_SYS_STREAM_H +# include <sys/stream.h> +#endif +]) + +# login_cap.h requires sys/types.h on NetBSD +AC_CHECK_HEADERS(login_cap.h, [], [], [ +#include <sys/types.h> +]) + # Messages for features tested for in target-specific section SIA_MSG="no" SPC_MSG="no" @@ -664,55 +793,6 @@ ;; esac -# Allow user to specify flags -AC_ARG_WITH(cflags, - [ --with-cflags Specify additional flags to pass to compiler], - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - CFLAGS="$CFLAGS $withval" - fi - ] -) -AC_ARG_WITH(cppflags, - [ --with-cppflags Specify additional flags to pass to preprocessor] , - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - CPPFLAGS="$CPPFLAGS $withval" - fi - ] -) -AC_ARG_WITH(ldflags, - [ --with-ldflags Specify additional flags to pass to linker], - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - LDFLAGS="$LDFLAGS $withval" - fi - ] -) -AC_ARG_WITH(libs, - [ --with-libs Specify additional libraries to link with], - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - LIBS="$LIBS $withval" - fi - ] -) -AC_ARG_WITH(Werror, - [ --with-Werror Build main code with -Werror], - [ - if test -n "$withval" && test "x$withval" != "xno"; then - werror_flags="-Werror" - if test "x${withval}" != "xyes"; then - werror_flags="$withval" - fi - fi - ] -) - AC_MSG_CHECKING(compiler and flags for sanity) AC_RUN_IFELSE( [AC_LANG_SOURCE([ @@ -728,87 +808,6 @@ ) dnl Checks for header files. -AC_CHECK_HEADERS( \ - bstring.h \ - crypt.h \ - crypto/sha2.h \ - dirent.h \ - endian.h \ - features.h \ - fcntl.h \ - floatingpoint.h \ - getopt.h \ - glob.h \ - ia.h \ - iaf.h \ - limits.h \ - login.h \ - maillock.h \ - ndir.h \ - net/if_tun.h \ - netdb.h \ - netgroup.h \ - pam/pam_appl.h \ - paths.h \ - pty.h \ - readpassphrase.h \ - rpc/types.h \ - security/pam_appl.h \ - sha2.h \ - shadow.h \ - stddef.h \ - stdint.h \ - string.h \ - strings.h \ - sys/audit.h \ - sys/bitypes.h \ - sys/bsdtty.h \ - sys/cdefs.h \ - sys/dir.h \ - sys/mman.h \ - sys/ndir.h \ - sys/prctl.h \ - sys/pstat.h \ - sys/select.h \ - sys/stat.h \ - sys/stream.h \ - sys/stropts.h \ - sys/strtio.h \ - sys/sysmacros.h \ - sys/time.h \ - sys/timers.h \ - sys/un.h \ - time.h \ - tmpdir.h \ - ttyent.h \ - unistd.h \ - usersec.h \ - util.h \ - utime.h \ - utmp.h \ - utmpx.h \ - vis.h \ -) - -# lastlog.h requires sys/time.h to be included first on Solaris -AC_CHECK_HEADERS(lastlog.h, [], [], [ -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -]) - -# sys/ptms.h requires sys/stream.h to be included first on Solaris -AC_CHECK_HEADERS(sys/ptms.h, [], [], [ -#ifdef HAVE_SYS_STREAM_H -# include <sys/stream.h> -#endif -]) - -# login_cap.h requires sys/types.h on NetBSD -AC_CHECK_HEADERS(login_cap.h, [], [], [ -#include <sys/types.h> -]) - # Checks for libraries. AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) @@ -1952,7 +1951,7 @@ AC_TRY_COMPILE( [ #include <openssl/engine.h>], [ -int main(void){ENGINE_load_builtin_engines();ENGINE_register_all_complete();} +ENGINE_load_builtin_engines();ENGINE_register_all_complete(); ], [ AC_MSG_RESULT(yes) AC_DEFINE(USE_OPENSSL_ENGINE, 1, ==== //depot/projects/dtrace/src/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/elf.h,v 1.8 2002/07/04 11:05:39 markm Exp $ + * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $ */ /* ==== //depot/projects/dtrace/src/sbin/gpt/add.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.15 2006/10/04 18:20:25 marcel Exp $"); #include <sys/types.h> @@ -163,7 +163,7 @@ case 'b': if (block > 0) usage_add(); - block = strtol(optarg, &p, 10); + block = strtoll(optarg, &p, 10); if (*p != 0 || block < 1) usage_add(); break; @@ -177,7 +177,7 @@ case 's': if (size > 0) usage_add(); - size = strtol(optarg, &p, 10); + size = strtoll(optarg, &p, 10); if (*p != 0 || size < 1) usage_add(); break; ==== //depot/projects/dtrace/src/sbin/gpt/label.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.2 2006/06/22 22:05:28 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $"); #include <sys/types.h> @@ -184,7 +184,7 @@ case 'b': if (block > 0) usage_label(); - block = strtol(optarg, &p, 10); + block = strtoll(optarg, &p, 10); if (*p != 0 || block < 1) usage_label(); break; @@ -208,7 +208,7 @@ case 's': if (size > 0) usage_label(); - size = strtol(optarg, &p, 10); + size = strtoll(optarg, &p, 10); if (*p != 0 || size < 1) usage_label(); break; ==== //depot/projects/dtrace/src/sbin/gpt/remove.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.9 2006/06/22 22:05:28 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $"); #include <sys/types.h> @@ -155,7 +155,7 @@ case 'b': if (block > 0) usage_remove(); - block = strtol(optarg, &p, 10); + block = strtoll(optarg, &p, 10); if (*p != 0 || block < 1) usage_remove(); break; @@ -169,7 +169,7 @@ case 's': if (size > 0) usage_remove(); - size = strtol(optarg, &p, 10); + size = strtoll(optarg, &p, 10); if (*p != 0 || size < 1) usage_remove(); break; ==== //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#8 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.195 2006/09/18 11:55:10 ru Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.196 2006/10/04 19:29:05 keramida Exp $ .\" .Dd July 25, 2006 .Dt IPFW 8 @@ -951,20 +951,20 @@ .It Ar addr Ns / Ns Ar masklen Matches all addresses with base .Ar addr -(specified as an IP address or a hostname) +(specified as an IP address, a network number, or a hostname) and mask width of .Cm masklen bits. -As an example, 1.2.3.4/25 will match +As an example, 1.2.3.4/25 or 1.2.3.0/25 will match all IP numbers from 1.2.3.0 to 1.2.3.127 . .It Ar addr Ns : Ns Ar mask Matches all addresses with base .Ar addr -(specified as an IP address or a hostname) +(specified as an IP address, a network number, or a hostname) and the mask of .Ar mask , specified as a dotted quad. -As an example, 1.2.3.4:255.0.255.0 will match +As an example, 1.2.3.4:255.0.255.0 or 1.0.3.0:255.0.255.0 will match 1.*.3.*. This form is advised only for non-contiguous masks. @@ -977,7 +977,7 @@ .It Ar list : Bro Ar num | num-num Brc Ns Op Ns , Ns Ar list Matches all addresses with base address .Ar addr -(specified as an IP address or a hostname) +(specified as an IP address, a network number, or a hostname) and whose last byte is in the list between braces { } . Note that there must be no spaces between braces and numbers (spaces after commas are allowed). @@ -997,6 +997,7 @@ the complexity of rulesets. .br As an example, an address specified as 1.2.3.4/24{128,35-55,89} +or 1.2.3.0/24{128,35-55,89} will match the following IP addresses: .br 1.2.3.128, 1.2.3.35 to 1.2.3.55, 1.2.3.89 . ==== //depot/projects/dtrace/src/share/man/man9/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.279 2006/10/02 11:51:25 andre Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.280 2006/10/04 20:16:23 jmg Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -129,6 +129,7 @@ kernacc.9 \ kernel_mount.9 \ kobj.9 \ + kqueue.9 \ kthread.9 \ ktr.9 \ lock.9 \ @@ -665,6 +666,20 @@ kobj.9 kobj_create.9 \ kobj.9 kobj_delete.9 \ kobj.9 kobj_init.9 +MLINKS+=kqueue.9 kqfd_register.9 \ + kqueue.9 knlist_add.9 \ + kqueue.9 knlist_remove.9 \ + kqueue.9 knlist_remove_inevent.9 \ + kqueue.9 knlist_empty.9 \ + kqueue.9 knlist_init.9 \ + kqueue.9 knlist_destroy.9 \ + kqueue.9 knlist_clear.9 \ + kqueue.9 knlist_delete.9 \ + kqueue.9 knote_fdclose.9 \ + kqueue.9 KNOTE_LOCKED.9 \ + kqueue.9 KNOTE_UNLOCKED.9 \ + kqueue.9 kqueue_add_filteropts.9 \ + kqueue.9 kqueue_del_filteropts.9 MLINKS+=kthread.9 kproc_shutdown.9 \ kthread.9 kproc_start.9 \ kthread.9 kthread_create.9 \ ==== //depot/projects/dtrace/src/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.14 2005/12/06 23:06:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $"); #include "opt_compat.h" @@ -67,6 +67,7 @@ #include <vm/vm_object.h> #include <vm/vm_extern.h> +#include <compat/freebsd32/freebsd32_signal.h> #include <compat/freebsd32/freebsd32_util.h> #include <compat/freebsd32/freebsd32_proto.h> #include <compat/ia32/ia32_signal.h> @@ -298,7 +299,7 @@ freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe4 sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -308,7 +309,7 @@ td = curthread; p = td->td_proc; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); PROC_LOCK_ASSERT(p, MA_OWNED); sig = siginfo.si_signo; @@ -407,7 +408,7 @@ ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -416,7 +417,7 @@ int oonstack; int sig; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); @@ -741,20 +742,3 @@ pcb->pcb_flags |= PCB_FULLCTX; td->td_retval[1] = 0; } - -void -siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst) -{ - dst->si_signo = src->si_signo; - dst->si_errno = src->si_errno; - dst->si_code = src->si_code; - dst->si_pid = src->si_pid; - dst->si_uid = src->si_uid; - dst->si_status = src->si_status; - dst->si_addr = dst->si_addr; - dst->si_value.sigval_int = src->si_value.sival_int; - dst->si_band = src->si_band; - dst->si_trapno = src->si_trapno; - dst->si_timerid = src->si_timerid; - dst->si_overrun = src->si_overrun; -} ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.60 2006/10/02 12:59:55 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.61 2006/10/05 01:56:10 davidxu Exp $"); #include "opt_compat.h" @@ -88,6 +88,7 @@ #include <compat/freebsd32/freebsd32_util.h> #include <compat/freebsd32/freebsd32.h> +#include <compat/freebsd32/freebsd32_signal.h> #include <compat/freebsd32/freebsd32_proto.h> CTASSERT(sizeof(struct timeval32) == 8); @@ -192,12 +193,6 @@ } #endif -struct sigaltstack32 { - u_int32_t ss_sp; - u_int32_t ss_size; - int ss_flags; -}; - CTASSERT(sizeof(struct sigaltstack32) == 12); int @@ -2178,6 +2173,89 @@ return (kern_thr_suspend(td, tsp)); } +void +siginfo_to_siginfo32(siginfo_t *src, struct siginfo32 *dst) +{ + bzero(dst, sizeof(*dst)); + dst->si_signo = src->si_signo; + dst->si_errno = src->si_errno; + dst->si_code = src->si_code; + dst->si_pid = src->si_pid; + dst->si_uid = src->si_uid; + dst->si_status = src->si_status; + dst->si_addr = dst->si_addr; + dst->si_value.sigval_int = src->si_value.sival_int; + dst->si_timerid = src->si_timerid; + dst->si_overrun = src->si_overrun; +} + +int +freebsd32_sigtimedwait(struct thread *td, struct freebsd32_sigtimedwait_args *uap) +{ + struct timespec32 ts32; + struct timespec ts; + struct timespec *timeout; + sigset_t set; + ksiginfo_t ksi; + struct siginfo32 si32; + int error; + + if (uap->timeout) { + error = copyin(uap->timeout, &ts32, sizeof(ts32)); + if (error) + return (error); + ts.tv_sec = ts32.tv_sec; + ts.tv_nsec = ts32.tv_nsec; + timeout = &ts; + } else + timeout = NULL; + + error = copyin(uap->set, &set, sizeof(set)); + if (error) + return (error); + + error = kern_sigtimedwait(td, set, &ksi, timeout); + if (error) + return (error); + + if (uap->info) { + siginfo_to_siginfo32(&ksi.ksi_info, &si32); + error = copyout(&si32, uap->info, sizeof(struct siginfo32)); + } + + if (error == 0) + td->td_retval[0] = ksi.ksi_signo; + return (error); +} + +/* + * MPSAFE + */ +int +freebsd32_sigwaitinfo(struct thread *td, struct freebsd32_sigwaitinfo_args *uap) +{ + ksiginfo_t ksi; + struct siginfo32 si32; + sigset_t set; + int error; + + error = copyin(uap->set, &set, sizeof(set)); + if (error) + return (error); + + error = kern_sigtimedwait(td, set, &ksi, NULL); + if (error) + return (error); + + if (uap->info) { + siginfo_to_siginfo32(&ksi.ksi_info, &si32); + error = copyout(&si32, uap->info, sizeof(struct siginfo32)); + } + if (error == 0) + td->td_retval[0] = ksi.ksi_signo; + return (error); +} + #if 0 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610050746.k957kmMs026529>