From owner-p4-projects@FreeBSD.ORG Sat Dec 15 22:06:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6922016A41B; Sat, 15 Dec 2007 22:06:40 +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 1130F16A417 for ; Sat, 15 Dec 2007 22:06:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06AF613C455 for ; Sat, 15 Dec 2007 22:06:40 +0000 (UTC) (envelope-from jb@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 lBFM6dAp047380 for ; Sat, 15 Dec 2007 22:06:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFM6cUh047377 for perforce@freebsd.org; Sat, 15 Dec 2007 22:06:38 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Dec 2007 22:06:38 GMT Message-Id: <200712152206.lBFM6cUh047377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130976 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: Sat, 15 Dec 2007 22:06:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=130976 Change 130976 by jb@jb_freebsd1 on 2007/12/15 22:06:18 IFC Affected files ... .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/Makefile#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/flyer.tex#4 integrate .. //depot/projects/dtrace/ports/LEGAL#28 integrate .. //depot/projects/dtrace/ports/UPDATING#40 integrate .. //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.c#6 delete .. //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.h#6 delete .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.real#9 integrate .. //depot/projects/dtrace/src/include/complex.h#5 integrate .. //depot/projects/dtrace/src/lib/msun/Makefile#7 integrate .. //depot/projects/dtrace/src/lib/msun/Symbol.map#6 integrate .. //depot/projects/dtrace/src/lib/msun/man/csqrt.3#1 branch .. //depot/projects/dtrace/src/lib/msun/src/s_csqrt.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/s_csqrtf.c#1 branch .. //depot/projects/dtrace/src/share/man/man3/tgmath.3#4 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#24 integrate .. //depot/projects/dtrace/src/share/man/man4/hptrr.4#1 branch .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#28 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#25 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#29 integrate .. //depot/projects/dtrace/src/sys/conf/files.powerpc#13 integrate .. //depot/projects/dtrace/src/sys/conf/options#34 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/dtrace/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#16 integrate .. //depot/projects/dtrace/src/sys/i386/conf/PAE#9 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#29 integrate .. //depot/projects/dtrace/src/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/if.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/copyinout.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/nexus.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/ofwmagic.S#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/uio_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/uma_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#11 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/copyinout.c#7 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/interrupt.c#5 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/locore.S#4 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#12 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_oea.c#12 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/nexus.c#5 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/ofw_machdep.c#6 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/ofwmagic.S#4 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/swtch.S#5 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/trap.c#10 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/trap_subr.S#4 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/uio_machdep.c#6 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/uma_machdep.c#5 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/vm_machdep.c#10 delete .. //depot/projects/dtrace/src/sys/sys/pcpu.h#17 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/Makefile#5 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-csqrt.c#1 branch .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-csqrt.t#1 branch Differences ... ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: doc/fr_FR.ISO8859-1/flyer/Makefile,v 1.1 2004/01/25 11:55:36 blackend Exp $ -# Original revision: 1.1 +# $FreeBSD: doc/fr_FR.ISO8859-1/flyer/Makefile,v 1.2 2007/12/15 08:45:49 blackend Exp $ +# Original revision: 1.2 # pdf: dvi ps @@ -9,7 +9,10 @@ dvips -t a4 flyer.dvi -o dvi: flyer.tex + pngtopnm -mix ../../share/images/flyer/logo-full.png | \ + pnmtops -noturn > logo-full.eps latex flyer.tex clean: - rm -f flyer.aux flyer.dvi flyer.log flyer.pdf flyer.ps + rm -f flyer.aux flyer.dvi flyer.log flyer.pdf flyer.ps \ + logo-full.eps ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/flyer.tex#4 (text+ko) ==== @@ -1,4 +1,4 @@ -% Copyright (c) 2004 Marc Fonvieille +% Copyright (c) 2004-2006 Marc Fonvieille % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -22,11 +22,14 @@ % OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF % SUCH DAMAGE. % -% $FreeBSD: doc/fr_FR.ISO8859-1/flyer/flyer.tex,v 1.8 2006/05/10 16:49:57 blackend Exp $ -% Original revision: 1.10 +% $FreeBSD: doc/fr_FR.ISO8859-1/flyer/flyer.tex,v 1.9 2007/12/15 08:45:49 blackend Exp $ +% Original revision: 1.14 % % FreeBSD Flyer % Use make FORMAT (with FORMAT: pdf, ps or dvi) to build the flyer. +% Two layouts are available: one using Beastie the other one using the +% FreeBSD Logo. The layout selection is done below via the value of +% the \logo variable. By default the Beastie layout is enabled. % \documentclass[11pt]{article} \usepackage[T1]{fontenc} @@ -41,22 +44,34 @@ %\usepackage[verbose,a4paper,noheadfoot,margin=1cm]{geometry} % Le français étant terriblement verbeux s/1cm/0.8cm pour les marges \usepackage[verbose,a4paper,noheadfoot,margin=0.8cm]{geometry} + +\usepackage{ifthen} +% Use of the Logo (set the \logo variable below to true) or Beastie +% (\logo variable set to false). +\newcommand{\logo}{false} + % Colors settings \usepackage{color} +\ifthenelse{\equal{\logo}{true}}{ +\definecolor{bkgrdtitle}{rgb}{.69,0,0} +\definecolor{redtitle}{rgb}{.65,.16,.22} +\definecolor{ovalboxcolor}{rgb}{.69,0,0} +} +{ \definecolor{bkgrdtitle}{rgb}{1,.84,.22} -%\definecolor{bkgrdtitle}{rgb}{1,.81,.3} -%\definecolor{bkgrdtitle}{rgb}{1,.87,.32} -%\definecolor{redtitle}{rgb}{.82,0,0} -%\definecolor{redtitle}{rgb}{.7,.7,.9} -%\definecolor{redtitle}{rgb}{.6,0,0} -%\definecolor{redtitle}{rgb}{.4,0,0} \definecolor{redtitle}{rgb}{.65,.16,.22} \definecolor{ovalboxcolor}{rgb}{.65,.16,.22} +} % Some macros +\ifthenelse{\equal{\logo}{true}}{ +\newcommand{\titledframe}[3]{% +\boxput*(0,1){\colorbox{bkgrdtitle}{\color{white} \large{\textbf{\textsf{#1}}}}} {\setlength {\fboxsep}{12pt} \color{ovalboxcolor}\Ovalbox {\color{black}\begin{minipage}{#3}#2\end{minipage}}} +}} +{ \newcommand{\titledframe}[3]{% \boxput*(0,1){\colorbox{bkgrdtitle}{\color{black} \large{\textbf{\textsf{#1}}}}} {\setlength {\fboxsep}{12pt} \color{ovalboxcolor}\Ovalbox {\color{black}\begin{minipage}{#3}#2\end{minipage}}} -} +}} \newcommand{\reg}{$^{\mbox{\tiny \textregistered}}$} \newcommand{\tm}{$^{\mbox{\tiny TM}}$} @@ -75,35 +90,47 @@ \begin{document} \begin{center} +\ifthenelse{\equal{\logo}{true}}{ +\includegraphics[scale=0.5]{logo-full.eps} +\vspace{0.5mm} +} +{ \fontsize{40}{36}\selectfont -{\color{redtitle} \textrm{\textbf{FreeBSD}}} +{\color{redtitle} \textrm{\textbf{FreeBSD}}}\medskip} \end{center} %\vspace{2mm} % Main part \begin{center} +\ifthenelse{\equal{\logo}{true}}{ +\newcommand{\size}{17.3cm} +} +{\newcommand{\size}{12.7cm}} + \titledframe{Qu'est-ce que FreeBSD?}{ FreeBSD est un système d'exploitation avancé pour les architectures compatibles x86 (en particulier Pentium\reg et Athlon\tm), amd64 -(Opteron\tm, Athlon\tm 64 et EM64T), Alpha/AXP, IA-64 (famille des processeurs Intel\reg -Itanium\reg), PC-98 et UltraSPARC\reg. Un portage vers les -architectures PowerPC\reg et ARM\reg est en cours. +(Opteron\tm, Athlon\tm 64 et EM64T), UltraSPARC\reg, IA-64 (famille des processeurs Intel\reg +Itanium\reg), PC-98 et ARM. FreeBSD est dérivé de BSD, la version d'UNIX\reg développée à l'Université de Californie, Berkeley. -}{12.7cm} -\begin{minipage}{4cm} +}{\size} +\ifthenelse{\equal{\logo}{false}}{ +\begin{minipage}{4.3cm} \includegraphics[scale=0.3]{../../share/images/flyer/beastie.eps} \end{minipage} +} -\vspace{1mm} +\ifthenelse{\equal{\logo}{true}}{ +\vspace{4.3mm}}{\vspace{1.5mm}} \titledframe{Des fonctions avancées}{ FreeBSD offre des fonctions avancées pour le réseau, les performances, la sécurité et la compatibilité qui sont encore absentes d'autres systèmes d'exploitation, y compris certains des meilleurs systèmes commerciaux. -}{5cm} +}{5.05cm} \titledframe{\textsf{\textbf{Des solutions performantes pour l'Internet}}}{ FreeBSD inclus ce que beaucoup considèrent comme la référence en ce @@ -114,12 +141,12 @@ sous de fortes charges, et utilise efficacement la mémoire afin de maintenir des temps de réponses corrects pour des milliers de processus utilisateurs simultanés. -}{11cm} +}{11.05cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{Des logiciels en abondance!}{ -FreeBSD est proposé avec plus de 13000 logiciels tierce-partie +FreeBSD est proposé avec plus de 14000 logiciels tierce-partie prêts à être installés dont: Apache, Samba, MySQL\reg, OpenOffice.org, KDE, GNOME, MPlayer, etc. @@ -134,7 +161,7 @@ etc., sans aucune dégradation notable de la vitesse d'exécution. }{17.3cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{FreeBSD est facile à installer}{ FreeBSD peut s'installer depuis divers supports comme des CD-ROMs, des @@ -143,7 +170,7 @@ utilisant un serveur FTP anonyme ou un serveur NFS. }{17.3cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{FreeBSD est libre et gratuit}{ FreeBSD est disponible gratuitement et est fourni avec l'intégralité @@ -156,7 +183,7 @@ parties du code source de ces logiciels. }{17.3cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{Une grande variété de domaines d'application}{ FreeBSD est très bien adapté à un grand nombre d'applications, aussi @@ -167,7 +194,7 @@ de Windows\reg et GNU/Linux. }{17.3cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{Contacts}{ \begin{itemizeflyer} @@ -179,12 +206,16 @@ % % Copyrights \begin{center} -\tiny \copyright 2004-2005 Le projet FreeBSD\\ -FreeBSD est une marque déposée de la fondation FreeBSD.\\ +\tiny \copyright 2004-2006 Le projet FreeBSD\\ +\ifthenelse{\equal{\logo}{true}}{ +FreeBSD et le logo FreeBSD sont des marques déposées de la fondation +FreeBSD.\\} +{FreeBSD est une marque déposée de la fondation FreeBSD.\\} Tous les autres noms de produits et ou de sociétés mentionnés sont les marques de leurs titulaires respectifs.\\ +\ifthenelse{\equal{\logo}{false}}{ BSD Daemon, \copyright 1988 par Marshall Kirk McKusick. Tous droits -réservés. +réservés.}{} \end{center} \end{document} ==== //depot/projects/dtrace/ports/LEGAL#28 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.559 2007/12/14 18:32:14 sat Exp $ +# $FreeBSD: ports/LEGAL,v 1.560 2007/12/14 23:08:17 pav Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -422,6 +422,7 @@ mysqlman.tar.gz databases/mysqlman Not redistributable, license agreement required ncftpd-* ftp/ncftpd 30 day evaluation license +NeroDigitalAudio.zip audio/linux-nerodigitalaudio Redistribution forbidden netbeans3-* java/netbeans3 Restrictive copyright netbeans4-* java/netbeans4 Restrictive copyright netbeans5-* java/netbeans5 Restrictive copyright ==== //depot/projects/dtrace/ports/UPDATING#40 (text+ko) ==== @@ -6,6 +6,36 @@ time you update your ports collection, before attempting any port upgrades. +20071215: + AFFECTS: users of www/suphp + AUTHOR: koitsu@FreeBSD.org + + The suPHP port has been upgraded to 0.6.2. This update requires + modifications to your Apache httpd.conf, as the new version of suPHP does + things differently than the previous version -- particularly in regards + to how AddHandler is used. + + Previously, enabling suPHP was as simple as: + + suPHP_Engine on + AddType application/x-httpd-php .php + AddHandler x-httpd-php .php + + With suPHP 0.6.2, these should be changed to: + + suPHP_Engine on + AddType application/x-httpd-php .php + suPHP_AddHandler application/x-httpd-php + + If you forget this change, your PHP content will likely be offered as + downloadable content and not parsed by the PHP interpreter! + + Additionally, the new version uses a configuration file vs. compile-time + settings. The configuration file is /usr/local/etc/suphp.conf, and a + working example installed as /usr/local/etc/suphp.conf-example. It's + important that the MIME type under the [handlers] section matches what + the type passed to suPHP_AddHandler in your Apache configuration. + 20071101: AFFECTS: users of x11/nvidia-driver AUTHOR: danfe@FreeBSD.org @@ -5872,4 +5902,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.568 2007/11/01 13:01:57 beech Exp $ +$FreeBSD: ports/UPDATING,v 1.569 2007/12/15 15:35:53 koitsu Exp $ ==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.real#9 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.28 2007/12/09 01:00:11 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.29 2007/12/14 21:58:58 des Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -755,7 +755,7 @@ "What is amiss, my friend?" asked the king. "My lord," gasped Lancelot, "you have given me the wrong key!" % - "Before we get married," said the young woman to her fiancee, + "Before we get married," said the young woman to her fiance, "I want to confess some affairs that I've had in the past." "But you told me all about those a few weeks ago," her young man replied. ==== //depot/projects/dtrace/src/include/complex.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2001 The FreeBSD Project. + * Copyright (c) 2001-2007 The FreeBSD Project. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/complex.h,v 1.7 2007/12/12 23:43:51 das Exp $ + * $FreeBSD: src/include/complex.h,v 1.8 2007/12/15 08:38:44 das Exp $ */ #ifndef _COMPLEX_H @@ -57,6 +57,8 @@ double creal(double complex); float crealf(float complex); long double creall(long double complex); +double complex csqrt(double complex); +float complex csqrtf(float complex); __END_DECLS ==== //depot/projects/dtrace/src/lib/msun/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.79 2007/12/12 23:43:50 das Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.80 2007/12/15 08:38:44 das Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -40,7 +40,8 @@ k_tan.c k_tanf.c \ s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_carg.c s_cargf.c \ s_cbrt.c s_cbrtf.c s_ceil.c s_ceilf.c s_ceill.c \ - s_copysign.c s_copysignf.c s_cos.c s_cosf.c s_erf.c s_erff.c \ + s_copysign.c s_copysignf.c s_cos.c s_cosf.c \ + s_csqrt.c s_csqrtf.c s_erf.c s_erff.c \ s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabsf.c s_fdim.c \ s_finite.c s_finitef.c \ s_floor.c s_floorf.c s_floorl.c s_fma.c s_fmaf.c \ @@ -93,7 +94,7 @@ INCS= fenv.h math.h MAN= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 ceil.3 \ - cimag.3 copysign.3 cos.3 cosh.3 erf.3 exp.3 fabs.3 fdim.3 \ + cimag.3 copysign.3 cos.3 cosh.3 csqrt.3 erf.3 exp.3 fabs.3 fdim.3 \ feclearexcept.3 feenableexcept.3 fegetenv.3 \ fegetround.3 fenv.3 floor.3 \ fma.3 fmax.3 fmod.3 hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \ @@ -114,6 +115,7 @@ MLINKS+=copysign.3 copysignf.3 copysign.3 copysignl.3 MLINKS+=cos.3 cosf.3 MLINKS+=cosh.3 coshf.3 +MLINKS+=csqrt.3 csqrtf.3 MLINKS+=erf.3 erfc.3 erf.3 erff.3 erf.3 erfcf.3 MLINKS+=exp.3 expm1.3 exp.3 log.3 exp.3 log10.3 exp.3 log1p.3 exp.3 pow.3 \ exp.3 exp2.3 exp.3 exp2f.3 exp.3 expf.3 \ ==== //depot/projects/dtrace/src/lib/msun/Symbol.map#6 (text) ==== @@ -1,6 +1,8 @@ /* - * $FreeBSD: src/lib/msun/Symbol.map,v 1.6 2007/12/14 03:08:10 das Exp $ + * $FreeBSD: src/lib/msun/Symbol.map,v 1.7 2007/12/15 08:39:03 das Exp $ */ + +/* 7.0-CURRENT */ FBSD_1.0 { __fe_dfl_env; tgamma; @@ -60,8 +62,6 @@ asinhf; atan; atanf; - carg; - cargf; cbrt; cbrtf; ceil; @@ -183,3 +183,11 @@ drem; dremf; }; + +/* First added in 8.0-CURRENT */ +FBSD_1.1 { + carg; + cargf; + csqrt; + csqrtf; +}; ==== //depot/projects/dtrace/src/share/man/man3/tgmath.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/tgmath.3,v 1.2 2005/01/13 11:22:29 ru Exp $ +.\" $FreeBSD: src/share/man/man3/tgmath.3,v 1.3 2007/12/15 02:40:10 das Exp $ .\" .Dd August 14, 2004 .Os @@ -101,6 +101,7 @@ .It Fn exp Ta Fn exp Ta Fn cexp .It Fn log Ta Fn log Ta Fn clog .It Fn pow Ta Fn pow Ta Fn cpow +.It Fn sqrt Ta Fn sqrt Ta Fn csqrt .It Fn fabs Ta Fn fabs Ta Fn cabs .El .Pp ==== //depot/projects/dtrace/src/share/man/man4/Makefile#24 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.399 2007/11/13 11:23:52 ru Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.400 2007/12/15 00:56:15 scottl Exp $ MAN= aac.4 \ acpi.4 \ @@ -103,6 +103,7 @@ hme.4 \ ${_hptiop.4} \ ${_hptmv.4} \ + ${_hptrr.4} \ hwpmc.4 \ ichsmb.4 \ ${_ichwd.4} \ @@ -547,6 +548,7 @@ _coretemp.4= coretemp.4 _hptiop.4= hptiop.4 _hptmv.4= hptmv.4 +_hptrr.4= hptrr.4 _ichwd.4= ichwd.4 _if_nfe.4= if_nfe.4 _if_nve.4= if_nve.4 ==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#28 (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.489 2007/12/02 20:40:30 rwatson Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.490 2007/12/15 00:56:16 scottl Exp $ cpu HAMMER ident GENERIC @@ -131,6 +131,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID ==== //depot/projects/dtrace/src/sys/amd64/conf/NOTES#13 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.72 2007/12/01 20:07:44 phk Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.73 2007/12/15 00:56:16 scottl Exp $ # # @@ -372,11 +372,15 @@ device aacp # SCSI Passthrough interface (optional, CAM required) # -# Highpoint RocketRAID 182x. This is really just software RAID on a -# Marvell SATA chip. +# Highpoint RocketRAID 182x. device hptmv # +# Highpoint RocketRAID. Supports RR172x, RR222x, RR2240, RR232x, RR2340, +# RR2210, RR174x, RR2522, RR231x, RR230x. +device hptrr + +# # Highpoint RocketRAID 232x. This is software RAID but with hardware # acceleration assistance for RAID_5. device rr232x ==== //depot/projects/dtrace/src/sys/conf/files.amd64#25 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.116 2007/12/09 21:00:36 alc Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.117 2007/12/15 00:56:15 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -72,6 +72,11 @@ dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \ compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \ no-implicit-rule +hptrr_lib.o optional hptrr \ + dependency "$S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \ + compile-with "uudecode < $S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \ + no-implicit-rule +# rr232x_lib.o optional rr232x \ dependency "$S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \ compile-with "uudecode < $S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \ @@ -183,6 +188,9 @@ dev/hptmv/gui_lib.c optional hptmv dev/hptmv/hptproc.c optional hptmv dev/hptmv/ioctl.c optional hptmv +dev/hptrr/hptrr_os_bsd.c optional hptrr +dev/hptrr/hptrr_osm_bsd.c optional hptrr +dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc ==== //depot/projects/dtrace/src/sys/conf/files.i386#29 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.589 2007/12/09 21:00:36 alc Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.590 2007/12/15 00:56:15 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -77,12 +77,16 @@ compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \ no-implicit-rule # +hptrr_lib.o optional hptrr \ + dependency "$S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \ + compile-with "uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \ + no-implicit-rule +# rr232x_lib.o optional rr232x \ dependency "$S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \ compile-with "uudecode < $S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \ no-implicit-rule # -# compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs compat/linux/linux_emul.c optional compat_linux @@ -194,6 +198,9 @@ dev/hptmv/gui_lib.c optional hptmv dev/hptmv/hptproc.c optional hptmv dev/hptmv/ioctl.c optional hptmv +dev/hptrr/hptrr_os_bsd.c optional hptrr +dev/hptrr/hptrr_osm_bsd.c optional hptrr +dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_pentium.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc ==== //depot/projects/dtrace/src/sys/conf/files.powerpc#13 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.67 2007/12/02 20:40:31 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.69 2007/12/14 23:47:39 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -10,7 +10,7 @@ # font.h optional sc \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ + compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ no-obj no-implicit-rule before-depend \ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" # @@ -25,66 +25,23 @@ clean "opt_ah.h" # +crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc +dev/ofw/openfirm.c standard +dev/ofw/ofw_bus_if.m standard +dev/ofw/ofw_bus_subr.c standard +dev/ofw/ofw_console.c standard +dev/ofw/ofw_disk.c optional ofwd +dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac +dev/scc/scc_bfe_macio.c optional scc powermac dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-sc.c optional sc dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_powerpc.c optional uart kern/syscalls.c optional ktr -powerpc/powerpc/atomic.S standard -powerpc/powerpc/autoconf.c standard -powerpc/powerpc/bcopy.c standard -powerpc/powerpc/busdma_machdep.c standard -powerpc/powerpc/clock.c standard -powerpc/powerpc/copyinout.c standard -powerpc/powerpc/copystr.c standard -powerpc/powerpc/cpu.c standard -powerpc/powerpc/elf_machdep.c standard -powerpc/powerpc/fpu.c standard -powerpc/powerpc/fuswintr.c standard -powerpc/powerpc/gdb_machdep.c optional gdb -powerpc/powerpc/in_cksum.c optional inet -powerpc/powerpc/interrupt.c standard -powerpc/powerpc/intr_machdep.c standard -powerpc/powerpc/locore.S standard no-obj -powerpc/powerpc/machdep.c standard -powerpc/powerpc/mmu_if.m standard -powerpc/powerpc/mmu_oea.c standard -powerpc/powerpc/nexus.c standard -powerpc/powerpc/ofwmagic.S standard -powerpc/powerpc/ofw_machdep.c standard -powerpc/powerpc/openpic.c standard -powerpc/powerpc/pic_if.m standard -powerpc/powerpc/pmap_dispatch.c standard -powerpc/powerpc/sc_machdep.c optional sc -powerpc/powerpc/setjmp.S standard -powerpc/powerpc/sigcode.S standard -powerpc/powerpc/stack_machdep.c optional ddb | stack -powerpc/powerpc/suswintr.c standard -powerpc/powerpc/syncicache.c standard -powerpc/powerpc/sys_machdep.c standard -powerpc/powerpc/swtch.S standard -powerpc/powerpc/trap.c standard -powerpc/powerpc/uio_machdep.c standard -powerpc/powerpc/uma_machdep.c standard -powerpc/powerpc/vm_machdep.c standard - -powerpc/powerpc/db_disasm.c optional ddb -powerpc/powerpc/db_interface.c optional ddb -powerpc/powerpc/db_hwwatch.c optional ddb -powerpc/powerpc/db_trace.c optional ddb - -crypto/blowfish/bf_enc.c optional crypto | ipsec -crypto/des/des_enc.c optional crypto | ipsec | netsmb - -dev/ofw/openfirm.c standard -dev/ofw/ofw_bus_if.m standard -dev/ofw/ofw_bus_subr.c standard -dev/ofw/ofw_console.c standard -dev/ofw/ofw_disk.c optional ofwd - libkern/ashldi3.c standard libkern/ashrdi3.c standard libkern/bcmp.c standard @@ -100,14 +57,23 @@ libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard - -powerpc/powerpc/mem.c optional mem -powerpc/powerpc/mp_machdep.c optional smp - +powerpc/aim/clock.c standard +powerpc/aim/copyinout.c standard +powerpc/aim/interrupt.c standard +powerpc/aim/locore.S standard no-obj +powerpc/aim/machdep.c standard +powerpc/aim/mmu_oea.c standard +powerpc/aim/nexus.c standard +powerpc/aim/ofw_machdep.c standard +powerpc/aim/ofwmagic.S standard +powerpc/aim/swtch.S standard +powerpc/aim/trap.c standard +powerpc/aim/uio_machdep.c standard +powerpc/aim/uma_machdep.c standard +powerpc/aim/vm_machdep.c standard powerpc/ofw/ofw_pci.c optional pci powerpc/ofw/ofw_pcib_pci.c optional pci powerpc/ofw/ofw_syscons.c optional sc - powerpc/powermac/ata_kauai.c optional powermac ata powerpc/powermac/ata_macio.c optional powermac ata powerpc/powermac/grackle.c optional powermac pci @@ -116,12 +82,36 @@ powerpc/powermac/openpic_macio.c optional powermac pci powerpc/powermac/pswitch.c optional powermac pswitch powerpc/powermac/uninorth.c optional powermac pci - +powerpc/powerpc/atomic.S standard +powerpc/powerpc/autoconf.c standard +powerpc/powerpc/bcopy.c standard +powerpc/powerpc/busdma_machdep.c standard +powerpc/powerpc/copystr.c standard +powerpc/powerpc/cpu.c standard +powerpc/powerpc/db_disasm.c optional ddb +powerpc/powerpc/db_hwwatch.c optional ddb +powerpc/powerpc/db_interface.c optional ddb +powerpc/powerpc/db_trace.c optional ddb +powerpc/powerpc/elf_machdep.c standard +powerpc/powerpc/fpu.c standard +powerpc/powerpc/fuswintr.c standard +powerpc/powerpc/gdb_machdep.c optional gdb +powerpc/powerpc/in_cksum.c optional inet +powerpc/powerpc/intr_machdep.c standard +powerpc/powerpc/mem.c optional mem +powerpc/powerpc/mmu_if.m standard +powerpc/powerpc/mp_machdep.c optional smp +powerpc/powerpc/openpic.c standard +powerpc/powerpc/pic_if.m standard +powerpc/powerpc/pmap_dispatch.c standard +powerpc/powerpc/sc_machdep.c optional sc +powerpc/powerpc/setjmp.S standard +powerpc/powerpc/sigcode.S standard +powerpc/powerpc/stack_machdep.c optional ddb | stack +powerpc/powerpc/suswintr.c standard +powerpc/powerpc/syncicache.c standard +powerpc/powerpc/sys_machdep.c standard powerpc/psim/iobus.c optional psim powerpc/psim/ata_iobus.c optional ata psim powerpc/psim/openpic_iobus.c optional psim powerpc/psim/uart_iobus.c optional uart psim - -dev/scc/scc_bfe_macio.c optional scc powermac - -dev/powermac_nvram/powermac_nvram.c optional powermac powermac_nvram ==== //depot/projects/dtrace/src/sys/conf/options#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.611 2007/12/06 02:32:42 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.612 2007/12/15 19:53:35 kmacy Exp $ # # On the handling of kernel options # @@ -753,3 +753,6 @@ # Interrupt filtering INTR_FILTER opt_global.h + +#Disable code to dispatch tcp offloading +TCP_OFFLOAD_DISABLE opt_inet.h ==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.20 2007/09/10 00:59:51 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.21 2007/12/15 21:54:58 kmacy Exp $ ***************************************************************************/ @@ -55,12 +55,14 @@ #ifdef CONFIG_DEFINED #include -#include +#include #include +#include #else #include +#include #include -#include +#include #endif #define USE_SX @@ -371,7 +373,7 @@ struct port_info port[MAX_NPORTS]; device_t portdev[MAX_NPORTS]; - struct toedev tdev; + struct t3cdev tdev; char fw_version[64]; uint32_t open_device_map; uint32_t registered_device_map; @@ -497,7 +499,7 @@ void t3_os_link_changed(adapter_t *adapter, int port_id, int link_status, int speed, int duplex, int fc); void t3_sge_err_intr_handler(adapter_t *adapter); -int t3_offload_tx(struct toedev *, struct mbuf *); +int t3_offload_tx(struct t3cdev *, struct mbuf *); void t3_os_ext_intr_handler(adapter_t *adapter); void t3_os_set_hw_addr(adapter_t *adapter, int port_idx, u8 hw_addr[]); int t3_mgmt_tx(adapter_t *adap, struct mbuf *m); @@ -554,7 +556,7 @@ } static __inline struct adapter * -tdev2adap(struct toedev *d) +tdev2adap(struct t3cdev *d) { return container_of(d, struct adapter, tdev); } ==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_include.h#2 (text+ko) ==== @@ -1,8 +1,9 @@ /* - * $FreeBSD: src/sys/dev/cxgb/cxgb_include.h,v 1.2 2007/09/10 00:59:51 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/cxgb_include.h,v 1.3 2007/12/15 21:54:58 kmacy Exp $ */ + #ifdef CONFIG_DEFINED #include #include @@ -14,11 +15,9 @@ #include #include #include -#include #include #include - - +#include #else #include #include @@ -31,7 +30,9 @@ #include #include -#include #include #include +#include #endif + + ==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_l2t.c,v 1.3 2007/08/17 05:57:03 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_l2t.c,v 1.4 2007/12/15 21:54:58 kmacy Exp $"); #include #include @@ -59,7 +59,7 @@ #define VLAN_NONE 0xfff #define SDL(s) ((struct sockaddr_dl *)s) -#define RT_ENADDR(rt) ((u_char *)LLADDR(SDL((rt)))) +#define RT_ENADDR(sa) ((u_char *)LLADDR(SDL((sa)))) #define rt_expire rt_rmx.rmx_expire struct llinfo_arp { @@ -103,11 +103,8 @@ RT_ADDREF(rt); RT_UNLOCK(rt); - if (e->neigh) { - RT_LOCK(e->neigh); - RT_REMREF(e->neigh); - RT_UNLOCK(e->neigh); - } + if (e->neigh) + RTFREE(e->neigh); e->neigh = rt; } @@ -117,7 +114,7 @@ * entry locked. */ static int -setup_l2e_send_pending(struct toedev *dev, struct mbuf *m, +setup_l2e_send_pending(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { struct cpl_l2t_write_req *req; @@ -130,13 +127,14 @@ * XXX MH_ALIGN */ req = mtod(m, struct cpl_l2t_write_req *); + m->m_pkthdr.len = m->m_len = sizeof(*req); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_L2T_WRITE_REQ, e->idx)); req->params = htonl(V_L2T_W_IDX(e->idx) | V_L2T_W_IFF(e->smt_idx) | V_L2T_W_VLAN(e->vlan & EVL_VLID_MASK) | >>> TRUNCATED FOR MAIL (1000 lines) <<<