Alexandre Julliard : Import of upstream bugzilla release 4.4.4.
Alexandre Julliard
julliard at winehq.org
Sat Apr 19 08:54:32 CDT 2014
Module: bugzilla
Branch: upstream
Commit: 243d7ee5eeb145034f735c0c8c2e3b538f01dee6
URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=243d7ee5eeb145034f735c0c8c2e3b538f01dee6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Apr 19 15:50:39 2014 +0200
Import of upstream bugzilla release 4.4.4.
---
Bugzilla/Constants.pm | 2 +-
Bugzilla/Template.pm | 25 +++++++++------------
docs/bugzilla.ent | 12 +++++-----
docs/bugzilla.ent.tmpl | 4 ++--
docs/en/xml/bugzilla.ent | 12 +++++-----
template/en/default/pages/release-notes.html.tmpl | 7 ++++++
6 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 230691c..33d4a56 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -182,7 +182,7 @@ use Memoize;
# CONSTANTS
#
# Bugzilla version
-use constant BUGZILLA_VERSION => "4.4.3";
+use constant BUGZILLA_VERSION => "4.4.4";
# Location of the remote and local XML files to track new releases.
use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml';
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index ee610ff..c007283 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -151,13 +151,11 @@ sub quoteUrls {
# (http://foo/bug#3 for example). Filtering that out filters valid
# bug refs out, so we have to do replacements.
# mailto can't contain space or #, so we don't have to bother for that
- # Do this by escaping \0 to \1\0, and replacing matches with \0\0$count\0\0
- # \0 is used because it's unlikely to occur in the text, so the cost of
- # doing this should be very small
-
- # escape the 2nd escape char we're using
- my $chr1 = chr(1);
- $text =~ s/\0/$chr1\0/g;
+ # Do this by replacing matches with \x{FDD2}$count\x{FDD3}
+ # \x{FDDx} is used because it's unlikely to occur in the text
+ # and are reserved unicode characters. We disable warnings for now
+ # until we require Perl 5.13.9 or newer.
+ no warnings 'utf8';
# However, note that adding the title (for buglinks) can affect things
# In particular, attachment matches go before bug titles, so that titles
@@ -184,11 +182,11 @@ sub quoteUrls {
$1, $2, $3, $4,
$5, $6, $7, $8,
$9, $10]}))
- && ("\0\0" . ($count-1) . "\0\0")/egx;
+ && ("\x{FDD2}" . ($count-1) . "\x{FDD3}")/egx;
}
else {
$text =~ s/$match/($things[$count++] = $replace)
- && ("\0\0" . ($count-1) . "\0\0")/egx;
+ && ("\x{FDD2}" . ($count-1) . "\x{FDD3}")/egx;
}
}
@@ -198,7 +196,7 @@ sub quoteUrls {
Bugzilla->params->{'sslbase'})) . ')';
$text =~ s~\b(${urlbase_re}\Qshow_bug.cgi?id=\E([0-9]+)(\#c([0-9]+))?)\b
~($things[$count++] = get_bug_link($3, $1, { comment_num => $5, user => $user })) &&
- ("\0\0" . ($count-1) . "\0\0")
+ ("\x{FDD2}" . ($count-1) . "\x{FDD3}")
~egox;
# non-mailto protocols
@@ -206,7 +204,7 @@ sub quoteUrls {
$text =~ s~\b($safe_protocols)
~($tmp = html_quote($1)) &&
($things[$count++] = "<a href=\"$tmp\">$tmp</a>") &&
- ("\0\0" . ($count-1) . "\0\0")
+ ("\x{FDD2}" . ($count-1) . "\x{FDD3}")
~egox;
# We have to quote now, otherwise the html itself is escaped
@@ -227,7 +225,7 @@ sub quoteUrls {
# attachment links
$text =~ s~\b(attachment\s*\#?\s*(\d+)(?:\s+\[details\])?)
~($things[$count++] = get_attachment_link($2, $1, $user)) &&
- ("\0\0" . ($count-1) . "\0\0")
+ ("\x{FDD2}" . ($count-1) . "\x{FDD3}")
~egmxi;
# Current bug ID this comment belongs to
@@ -257,9 +255,8 @@ sub quoteUrls {
# Now remove the encoding hacks in reverse order
for (my $i = $#things; $i >= 0; $i--) {
- $text =~ s/\0\0($i)\0\0/$things[$i]/eg;
+ $text =~ s/\x{FDD2}($i)\x{FDD3}/$things[$i]/eg;
}
- $text =~ s/$chr1\0/\0/g;
return $text;
}
diff --git a/docs/bugzilla.ent b/docs/bugzilla.ent
index 1f6d5ba..30ba7cc 100644
--- a/docs/bugzilla.ent
+++ b/docs/bugzilla.ent
@@ -1,5 +1,5 @@
-<!ENTITY bz-ver "4.4.3">
-<!ENTITY bz-date "2014-04-17">
+<!ENTITY bz-ver "4.4.4">
+<!ENTITY bz-date "2014-04-18">
<!ENTITY current-year "2014">
<!ENTITY min-perl-ver "5.8.1">
@@ -12,7 +12,7 @@
<!ENTITY min-date-format-ver "2.23">
<!ENTITY min-datetime-ver "0.28">
<!ENTITY min-datetime-timezone-ver "0.71">
-<!ENTITY min-dbi-ver "1.614">
+<!ENTITY min-dbi-ver "1.54">
<!ENTITY min-template-ver "2.22">
<!ENTITY min-email-send-ver "2.04">
<!ENTITY min-email-mime-ver "1.904">
@@ -37,7 +37,7 @@
<!ENTITY min-json-rpc-ver "any">
<!ENTITY min-json-xs-ver "2.0">
<!ENTITY min-test-taint-ver "any">
-<!ENTITY min-html-parser-ver "3.67">
+<!ENTITY min-html-parser-ver "3.40">
<!ENTITY min-html-scrubber-ver "any">
<!ENTITY min-encode-ver "2.21">
<!ENTITY min-encode-detect-ver "any">
@@ -51,11 +51,11 @@
<!ENTITY min-io-scalar-ver "any">
<!-- Database Versions -->
+<!ENTITY min-dbd-pg-ver "2.7.0">
+<!ENTITY min-pg-ver "8.03.0000">
<!ENTITY min-dbd-mysql-ver "4.001">
<!ENTITY min-mysql-ver "5.0.15">
<!ENTITY min-dbd-sqlite-ver "1.29">
<!ENTITY min-sqlite-ver "3.6.22">
<!ENTITY min-dbd-oracle-ver "1.19">
<!ENTITY min-oracle-ver "10.02.0">
-<!ENTITY min-dbd-pg-ver "2.7.0">
-<!ENTITY min-pg-ver "8.03.0000">
diff --git a/docs/bugzilla.ent.tmpl b/docs/bugzilla.ent.tmpl
index d2785d9..15cd475 100644
--- a/docs/bugzilla.ent.tmpl
+++ b/docs/bugzilla.ent.tmpl
@@ -1,5 +1,5 @@
-<!ENTITY bz-ver "4.4.3">
-<!ENTITY bz-date "2014-04-17">
+<!ENTITY bz-ver "4.4.4">
+<!ENTITY bz-date "2014-04-18">
<!ENTITY current-year "2014">
<!ENTITY min-perl-ver "5.8.1">
diff --git a/docs/en/xml/bugzilla.ent b/docs/en/xml/bugzilla.ent
index 1f6d5ba..30ba7cc 100644
--- a/docs/en/xml/bugzilla.ent
+++ b/docs/en/xml/bugzilla.ent
@@ -1,5 +1,5 @@
-<!ENTITY bz-ver "4.4.3">
-<!ENTITY bz-date "2014-04-17">
+<!ENTITY bz-ver "4.4.4">
+<!ENTITY bz-date "2014-04-18">
<!ENTITY current-year "2014">
<!ENTITY min-perl-ver "5.8.1">
@@ -12,7 +12,7 @@
<!ENTITY min-date-format-ver "2.23">
<!ENTITY min-datetime-ver "0.28">
<!ENTITY min-datetime-timezone-ver "0.71">
-<!ENTITY min-dbi-ver "1.614">
+<!ENTITY min-dbi-ver "1.54">
<!ENTITY min-template-ver "2.22">
<!ENTITY min-email-send-ver "2.04">
<!ENTITY min-email-mime-ver "1.904">
@@ -37,7 +37,7 @@
<!ENTITY min-json-rpc-ver "any">
<!ENTITY min-json-xs-ver "2.0">
<!ENTITY min-test-taint-ver "any">
-<!ENTITY min-html-parser-ver "3.67">
+<!ENTITY min-html-parser-ver "3.40">
<!ENTITY min-html-scrubber-ver "any">
<!ENTITY min-encode-ver "2.21">
<!ENTITY min-encode-detect-ver "any">
@@ -51,11 +51,11 @@
<!ENTITY min-io-scalar-ver "any">
<!-- Database Versions -->
+<!ENTITY min-dbd-pg-ver "2.7.0">
+<!ENTITY min-pg-ver "8.03.0000">
<!ENTITY min-dbd-mysql-ver "4.001">
<!ENTITY min-mysql-ver "5.0.15">
<!ENTITY min-dbd-sqlite-ver "1.29">
<!ENTITY min-sqlite-ver "3.6.22">
<!ENTITY min-dbd-oracle-ver "1.19">
<!ENTITY min-oracle-ver "10.02.0">
-<!ENTITY min-dbd-pg-ver "2.7.0">
-<!ENTITY min-pg-ver "8.03.0000">
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 92d9ce6..dfd5c64 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -45,6 +45,13 @@
<h2 id="v44_point">Updates in this 4.4.x Release</h2>
+<h3>4.4.4</h3>
+
+<p>This release fixes one regression introduced in [% terms.Bugzilla %] 4.4.3 by
+ <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=968576">security [% terms.bug %] 968576</a>:
+ URLs in [% terms.bug %] comments are displayed correctly again.
+ (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=998323">[% terms.Bug %] 998323</a>)</p>
+
<h3>4.4.3</h3>
<p>This release fixes two security issues. See the
More information about the wine-cvs
mailing list