From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:53:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0099616A417; Thu, 12 Oct 2006 03:53:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD09716A403 for ; Thu, 12 Oct 2006 03:53:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A55443D49 for ; Thu, 12 Oct 2006 03:53:09 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3r9sF009254 for ; Thu, 12 Oct 2006 03:53:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3r86W009250 for perforce@freebsd.org; Thu, 12 Oct 2006 03:53:08 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:53:08 GMT Message-Id: <200610120353.k9C3r86W009250@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 107738 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: Thu, 12 Oct 2006 03:53:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107738 Change 107738 by jb@jb_freebsd8 on 2006/10/12 03:52:34 IFC Affected files ... .. //depot/projects/dtrace/ports/MOVED#24 integrate .. //depot/projects/dtrace/src/sys/boot/ofw/libofw/openfirm_mmu.c#2 integrate .. //depot/projects/dtrace/src/sys/boot/sparc64/loader/hcall.S#2 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/dtrace/www/en/cgi/query-pr.cgi#4 integrate Differences ... ==== //depot/projects/dtrace/ports/MOVED#24 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1162 2006/10/10 21:16:21 joerg Exp $ +# $FreeBSD: ports/MOVED,v 1.1163 2006/10/12 00:44:14 maho Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2480,7 +2480,7 @@ net/coda5_server||2006-10-05|Has expired: no longer available from mastersite net/coda5_client||2006-10-05|Has expired: no longer available from mastersite net/coda5_doc||2006-10-05|Has expired: coda5 removed -math/ufspase|math/suitespase|2006-10-05|portname has been changed +math/ufsparse|math/suitesparse|2006-10-05|portname has been changed devel/avr-gcc-devel|devel/avr-gcc|2006-10-06|make AVR-GCC 4.x the default version astro/gdesklets-goodweather||2006-10-07|Expired: no longer downloadable deskutils/goats||2006-10-07|Expired: no longer downloadable ==== //depot/projects/dtrace/src/sys/boot/ofw/libofw/openfirm_mmu.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/boot/sparc64/loader/hcall.S#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.40 2006/04/21 19:35:03 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.41 2006/10/12 03:05:45 imp Exp $"); /* * PCI:PCI bridge support. @@ -148,10 +148,10 @@ if (sc->command & PCIM_CMD_MEMEN) { sc->membase = PCI_PPBMEMBASE(0, pci_read_config(dev, PCIR_MEMBASE_1, 2)); sc->memlimit = PCI_PPBMEMLIMIT(0, pci_read_config(dev, PCIR_MEMLIMIT_1, 2)); - sc->pmembase = PCI_PPBMEMBASE((pci_addr_t)pci_read_config(dev, PCIR_PMBASEH_1, 4), - pci_read_config(dev, PCIR_PMBASEL_1, 2)); - sc->pmemlimit = PCI_PPBMEMLIMIT((pci_addr_t)pci_read_config(dev, PCIR_PMLIMITH_1, 4), - pci_read_config(dev, PCIR_PMLIMITL_1, 2)); + sc->pmembase = PCI_PPBMEMBASE(pci_read_config(dev, PCIR_PMBASEH_1, 4), + pci_read_config(dev, PCIR_PMBASEL_1, 2)); + sc->pmemlimit = PCI_PPBMEMLIMIT(pci_read_config(dev, PCIR_PMLIMITH_1, 4), + pci_read_config(dev, PCIR_PMLIMITL_1, 2)); } /* ==== //depot/projects/dtrace/www/en/cgi/query-pr.cgi#4 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.55 2006/09/23 14:02:27 simon Exp $ +# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.56 2006/10/11 21:02:58 danger Exp $ # use strict; @@ -198,7 +198,7 @@ EOF $fmt{'query_form'} = < +
@@ -215,7 +215,7 @@ $fmt{'break'} = "
\n"; # From cgi-style.pl -$main::t_style = ""; +$main::t_style = ""; #----------------------------------------------------------------------- @@ -226,7 +226,8 @@ foreach (split(/&/, $ENV{'QUERY_STRING'})) { my ($key, $val) = split /=/; $f = $val if ($key eq "f"); - $PR = $val if ($key eq "pr"); + $PR = $val if ($key eq "pr" or $key eq "q"); + $PR = $key if ($key =~ /^(?:$valid_category\/)?$valid_pr$/); $category = $val if ($key eq "cat"); $getpatch = $val if ($key eq "getpatch"); } @@ -243,7 +244,7 @@ if ($category && $category !~ /^$valid_category$/); if ($PR < 0 || $PR !~ /^$valid_pr$/) { - print html_header("Query PR Database", 0); + print html_header("Query PR Database"); sprint('query_form'); print html_footer(); exit; @@ -261,7 +262,8 @@ } if (!@query) { - print html_header("No PRs Matched Query", 0); + print html_header("No PRs Matched Query"); + sprint('query_form'); print html_footer(); exit; } @@ -706,7 +708,7 @@ #----------------------------------------------------------------------- -# Func: htmlclean() +# Func: htmlparse() # Desc: Perform any fancy formatting on the message (e.g. HTML-ify # URLs) and return the result. #----------------------------------------------------------------------- @@ -716,7 +718,7 @@ my $v = shift; return "" if (!$v); - $v =~ s/((?:https?|ftps?):\/\/[^\s\/]+\/[][A-Za-z0-9=_.\~\?\&\/\%;-]*)/$1<\/a>/g; + $v =~ s/((?:https?|ftps?):\/\/[^\s\/]+\/[][\w=.,\'\(\)\~\?\!\&\/\%:;@#+-]*)/$1<\/a>/g; $v =~ s/^RCS file: (\/home\/[A-Za-z0-9]+\/(.*?)),v$/RCS file: $1<\/a>,v/; return $v; }
PR number:
Category: (optional)