Date: Sun, 15 Nov 2009 20:09:09 GMT From: Gabor Pali <pgj@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 170649 for review Message-ID: <200911152009.nAFK99Gr080464@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=170649 Change 170649 by pgj@beehive on 2009/11/15 20:08:21 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/images/articles/checkpoint/networks.pic#2 integrate .. //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#4 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#22 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#61 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#74 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#23 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#18 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/images/articles/checkpoint/networks.pic#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: doc/share/images/articles/checkpoint/networks.pic,v 1.1 2003/04/11 08:59:19 blackend Exp $ +.\" $FreeBSD: doc/share/images/articles/checkpoint/networks.pic,v 1.2 2009/11/13 08:51:10 roam Exp $ .\" .PS @@ -24,7 +24,7 @@ "\fC\s-2199.208.192.0/24\s+2\fP" "FW-1 protected nets" \ with .nw at G.w; box wid 1.2 invis \ - "\fC\s-2199.208.192.0/24\s+2\fP" "internal nets" \ + "\fC\s-2192.168.10.0/24\s+2\fP" "internal nets" \ with .ne at I.e; .PE ==== //depot/projects/docproj_hu/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.66 2009/09/29 19:45:37 simon Exp $ +# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.69 2009/11/15 18:40:26 remko Exp $ # # @@ -474,6 +474,7 @@ my $url = "${self_url_base}${PR}"; my $outp = ""; + my $qpcont = ""; my %mime_headers; my $mime_boundary; my $mime_endheader; @@ -596,6 +597,21 @@ if ($inresponse) { my $txt = $1; + # Detect Q-P line continuations, + # join them with the next line + # and process when the full line + # will be assembled. + if ($encoding == ENCODING_QP) { + if ($txt =~ /=$/) { + $txt =~ s/=$//; + $qpcont .= $txt; + next; + } else { + $txt = $qpcont . $txt; + $qpcont = ""; + } + } + if ($txt !~ /^-+$/ && $txt !~ /(?:cut|snip)/i && $txt =~ /^--(\S+)$/) { $mime_boundary = $1 if (!defined $mime_boundary && !$inpatch); @@ -657,11 +673,10 @@ } if ($encoding == ENCODING_BASE64) { + next if $txt =~ /:/; $outp .= $txt; next; } elsif ($encoding == ENCODING_QP) { - # XXX: lines ending in = should be joined - $txt =~ s/=$//; $txt = decode_qp($txt); } @@ -1013,7 +1028,7 @@ } if (($inpatch & PATCH_BASE64) && $getpatch) { - $outp .= $_; + $outp .= $_ unless /:/; return 1; } @@ -1107,8 +1122,8 @@ unless (!$getpatch and $inpatch & PATCH_UUENC_BIN); $outp = htmlclean($outp) unless ($getpatch); print $outp; - $inpatch ^= PATCH_UUENC; $outp = ""; - $inpatch ^= PATCH_UUENC_BIN; + $outp = ""; + $inpatch &= ~(PATCH_UUENC | PATCH_UUENC_BIN); # No outer container? sprint('patchblock_tfoot') if (!$inpatch and !$getpatch); ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#22 (text+ko) ==== @@ -17,7 +17,7 @@ <events> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: www/hu/share/sgml/events.xml,v 1.9 2009/10/22 23:02:11 pgj Exp $ + $FreeBSD: www/hu/share/sgml/events.xml,v 1.10 2009/11/11 16:45:32 pgj Exp $ </cvs:keyword> </cvs:keywords> ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#61 (text+ko) ==== @@ -11,7 +11,7 @@ <news> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: www/hu/share/sgml/news.xml,v 1.25 2009/10/30 20:54:26 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.26 2009/11/11 16:45:32 pgj Exp $ </cvs:keyword> </cvs:keywords> ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#74 (text+ko) ==== @@ -25,7 +25,7 @@ <news> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: www/share/sgml/news.xml,v 1.276 2009/11/09 05:24:00 linimon Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.277 2009/11/12 22:58:14 delphij Exp $ </cvs:keyword> </cvs:keywords> @@ -33,6 +33,27 @@ <name>2009</name> <month> + <name>11</name> + + <day> + <name>12</name> + + <event> + <title>&os; 8.0-RC3 Available</title> + + <p>The third of the Release Candidates for the &os;-8.0 + release cycle is now available. ISO images for Tier-1 + architectures and a <em>memory stick</em> image for + amd64/i386 are now <a + href="http://lists.freebsd.org/pipermail/freebsd-stable/2009-November/052699.html">available</a>; + on most of the <a + href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os; + mirror sites</a>.</p> + </event> + </day> + </month> + + <month> <name>10</name> <day> ==== //depot/projects/docproj_hu/www/share/sgml/press.xml#23 (text+ko) ==== @@ -9,7 +9,7 @@ <press> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: www/share/sgml/press.xml,v 1.88 2009/09/03 16:58:37 jkoshy Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.90 2009/11/12 14:02:25 jkoshy Exp $ </cvs:keyword> </cvs:keywords> @@ -17,6 +17,30 @@ <name>2009</name> <month> + <name>11</name> + + <story> + <name>FreeNAS 0.7 adds ZFS support</name> + <url>http://www.h-online.com/open/news/item/FreeNAS-0-7-adds-ZFS-support-853475.html</url>; + <site-name>The H</site-name> + <site-url>http://www.h-online.com/</site-url>; + <date>09 November 2009</date> + <author>crve</author> + <p>A description of the new features in version 0.7 of the FreeBSD-based FreeNAS project.</p> + </story> + + <story> + <name>Update your FreeBSD software with care</name> + <url>http://blogs.techrepublic.com.com/security/?p=2615</url>; + <site-name>Tech Republic</site-name> + <site-url>http://www.techrepublic.com/</site-url>; + <date>09 November 2009</date> + <author>Chad Perrin</author> + <p>Chad Perrin describes how he keeps his FreeBSD system up to date.</p> + </story> + </month> + + <month> <name>8</name> <story> ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#18 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: www/share/sgml/release.ent,v 1.38 2009/10/28 15:01:11 brueffer Exp $ --> +<!-- $FreeBSD: www/share/sgml/release.ent,v 1.39 2009/11/13 12:39:29 danger Exp $ --> <!-- XXX rel.current and u.rel.* should be available in doc/ --> <!-- The currently released versions of FreeBSD. This value is used to @@ -31,7 +31,7 @@ <!ENTITY beta.testing "INCLUDE"> <!ENTITY % beta.testing "INCLUDE"> <!ENTITY betarel.current '8.0'> -<!ENTITY betarel.vers 'RC2'> +<!ENTITY betarel.vers 'RC3'> <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'> <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911152009.nAFK99Gr080464>