Diff
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/Config.pm (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/Bugzilla/Config.pm 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/Config.pm 2019-01-18 20:39:32 UTC (rev 240167)
@@ -16,10 +16,9 @@
use Bugzilla::Constants;
use Bugzilla::Hook;
-use Bugzilla::Util qw(trick_taint);
+use Bugzilla::Util qw(trick_taint read_text write_text);
use JSON::XS;
-use File::Slurp;
use File::Temp;
use File::Basename;
@@ -284,7 +283,7 @@
my $param_file = bz_locations()->{'datadir'} . '/params.json';
my $json_data = JSON::XS->new->canonical->pretty->encode($param_data);
- write_file($param_file, { binmode => ':utf8', atomic => 1 }, \$json_data);
+ write_text($param_file, $json_data);
# It's not common to edit parameters and loading
# Bugzilla::Install::Filesystem is slow.
@@ -301,8 +300,8 @@
my $file = bz_locations()->{'datadir'} . '/params.json';
if (-e $file) {
- my $data;
- read_file($file, binmode => ':utf8', buf_ref => \$data);
+ my $data = ""
+ trick_taint($data);
# If params.json has been manually edited and e.g. some quotes are
# missing, we don't want JSON::XS to leak the content of the file
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/Constants.pm (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/Bugzilla/Constants.pm 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/Constants.pm 2019-01-18 20:39:32 UTC (rev 240167)
@@ -201,7 +201,7 @@
# CONSTANTS
#
# Bugzilla version
-use constant BUGZILLA_VERSION => "5.0.3";
+use constant BUGZILLA_VERSION => "5.0.4";
# A base link to the current REST Documentation. We place it here
# as it will need to be updated to whatever the current release is.
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/DB/Sqlite.pm (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/Bugzilla/DB/Sqlite.pm 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/DB/Sqlite.pm 2019-01-18 20:39:32 UTC (rev 240167)
@@ -219,6 +219,7 @@
my ($self, $date, $format) = @_;
$format = "%Y.%m.%d %H:%M:%S" if !$format;
$format =~ s/\%i/\%M/g;
+ $format =~ s/\%s/\%S/g;
return "STRFTIME(" . $self->quote($format) . ", $date)";
}
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/Install/Filesystem.pm (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/Bugzilla/Install/Filesystem.pm 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/Install/Filesystem.pm 2019-01-18 20:39:32 UTC (rev 240167)
@@ -31,7 +31,6 @@
use File::Basename;
use File::Copy qw(move);
use File::Spec;
-use File::Slurp;
use IO::File;
use POSIX ();
@@ -541,7 +540,7 @@
# Remove old assets htaccess file to force recreation with correct values.
if (-e "$assetsdir/.htaccess") {
- if (read_file("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) {
+ if (read_text("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) {
unlink("$assetsdir/.htaccess");
}
}
@@ -787,22 +786,21 @@
# to product IDs.
sub _update_old_mining_filenames {
my ($miningdir) = @_;
+ my $dbh = Bugzilla->dbh;
my @conversion_errors;
- require Bugzilla::Product;
-
# We use a dummy product instance with ID 0, representing all products
my $product_all = {id => 0, name => '-All-'};
- bless($product_all, 'Bugzilla::Product');
print "Updating old charting data file names...";
- my @products = Bugzilla::Product->get_all();
+ my @products = @{ $dbh->selectall_arrayref('SELECT id, name FROM products
+ ORDER BY name', {Slice=>{}}) };
push(@products, $product_all);
foreach my $product (@products) {
- if (-e File::Spec->catfile($miningdir, $product->id)) {
+ if (-e File::Spec->catfile($miningdir, $product->{id})) {
push(@conversion_errors,
{ product => $product,
- message => 'A file named "' . $product->id .
+ message => 'A file named "' . $product->{id} .
'" already exists.' });
}
}
@@ -810,8 +808,8 @@
if (! @conversion_errors) {
# Renaming mining files should work now without a hitch.
foreach my $product (@products) {
- if (! rename(File::Spec->catfile($miningdir, $product->name),
- File::Spec->catfile($miningdir, $product->id))) {
+ if (! rename(File::Spec->catfile($miningdir, $product->{name}),
+ File::Spec->catfile($miningdir, $product->{id}))) {
push(@conversion_errors,
{ product => $product,
message => $! });
@@ -827,7 +825,7 @@
print " FAILED:\n";
foreach my $error (@conversion_errors) {
printf "Cannot rename charting data file for product %d (%s): %s\n",
- $error->{product}->id, $error->{product}->name,
+ $error->{product}->{id}, $error->{product}->{name},
$error->{message};
}
print "You need to empty the \"$miningdir\" directory, then run\n",
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/Install/Requirements.pm (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/Bugzilla/Install/Requirements.pm 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/Install/Requirements.pm 2019-01-18 20:39:32 UTC (rev 240167)
@@ -156,11 +156,6 @@
version => '1.0.1',
},
{
- package => 'File-Slurp',
- module => 'File::Slurp',
- version => '9999.13',
- },
- {
package => 'JSON-XS',
module => 'JSON::XS',
# 2.0 is the first version that will work with JSON::RPC.
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/JobQueue.pm (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/Bugzilla/JobQueue.pm 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/JobQueue.pm 2019-01-18 20:39:32 UTC (rev 240167)
@@ -14,8 +14,8 @@
use Bugzilla::Constants;
use Bugzilla::Error;
use Bugzilla::Install::Util qw(install_string);
+use Bugzilla::Util qw(read_text);
use File::Basename;
-use File::Slurp;
use base qw(TheSchwartz);
use fields qw(_worker_pidfile);
@@ -124,7 +124,7 @@
# And poll the PID to detect when the working has finished.
# We do this instead of system() to allow for the INT signal to
# interrup us and trigger kill_worker().
- my $pid = read_file($self->{_worker_pidfile}, err_mode => 'quiet');
+ my $pid = read_text($self->{_worker_pidfile}, err_mode => 'quiet');
if ($pid) {
sleep(3) while(kill(0, $pid));
}
@@ -139,7 +139,7 @@
sub kill_worker {
my $self = Bugzilla->job_queue();
if ($self->{_worker_pidfile} && -e $self->{_worker_pidfile}) {
- my $worker_pid = read_file($self->{_worker_pidfile});
+ my $worker_pid = read_text($self->{_worker_pidfile});
if ($worker_pid && kill(0, $worker_pid)) {
$self->debug("Stopping worker process");
system "$0 -f -p '" . $self->{_worker_pidfile} . "' stop";
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/Migrate.pm (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/Bugzilla/Migrate.pm 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/Migrate.pm 2019-01-18 20:39:32 UTC (rev 240167)
@@ -403,7 +403,7 @@
}
my $tz;
if ($time[6]) {
- $tz = Bugzilla->local_timezone->offset_as_string($time[6]);
+ $tz = DateTime::TimeZone->offset_as_string($time[6]);
}
else {
$tz = $self->config('timezone');
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/Template.pm (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/Bugzilla/Template.pm 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/Template.pm 2019-01-18 20:39:32 UTC (rev 240167)
@@ -32,7 +32,6 @@
use File::Basename qw(basename dirname);
use File::Find;
use File::Path qw(rmtree mkpath);
-use File::Slurp;
use File::Spec;
use IO::Dir;
use List::MoreUtils qw(firstidx);
@@ -509,7 +508,7 @@
next unless -e "$cgi_path/$files{$source}";
my $file = $skins_path . '/' . md5_hex($source) . '.css';
if (!-e $file) {
- my $content = read_file("$cgi_path/$files{$source}");
+ my $content = read_text("$cgi_path/$files{$source}");
# minify
$content =~ s{/\*.*?\*/}{}sg; # comments
@@ -519,7 +518,7 @@
# rewrite urls
$content =~ s{url\(([^\)]+)\)}{_css_url_rewrite($source, $1)}eig;
- write_file($file, "/* $files{$source} */\n" . $content . "\n");
+ write_text($file, "/* $files{$source} */\n" . $content . "\n");
}
push @minified, $file;
}
@@ -529,9 +528,9 @@
if (!-e $file) {
my $content = '';
foreach my $source (@minified) {
- $content .= read_file($source);
+ $content .= read_text($source);
}
- write_file($file, $content);
+ write_text($file, $content);
}
$file =~ s/^\Q$cgi_path\E\///o;
@@ -570,7 +569,7 @@
next unless -e "$cgi_path/$files{$source}";
my $file = $skins_path . '/' . md5_hex($source) . '.js';
if (!-e $file) {
- my $content = read_file("$cgi_path/$files{$source}");
+ my $content = read_text("$cgi_path/$files{$source}");
# minimal minification
$content =~ s#/\*.*?\*/##sg; # block comments
@@ -579,7 +578,7 @@
$content =~ s#\n{2,}#\n#g; # blank lines
$content =~ s#(^\s+|\s+$)##g; # whitespace at the start/end of file
- write_file($file, ";/* $files{$source} */\n" . $content . "\n");
+ write_text($file, ";/* $files{$source} */\n" . $content . "\n");
}
push @minified, $file;
}
@@ -589,9 +588,9 @@
if (!-e $file) {
my $content = '';
foreach my $source (@minified) {
- $content .= read_file($source);
+ $content .= read_text($source);
}
- write_file($file, $content);
+ write_text($file, $content);
}
$file =~ s/^\Q$cgi_path\E\///o;
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/Util.pm (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/Bugzilla/Util.pm 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/Util.pm 2019-01-18 20:39:32 UTC (rev 240167)
@@ -24,7 +24,7 @@
validate_email_syntax check_email_syntax clean_text
get_text template_var display_value disable_utf8
detect_encoding email_filter
- join_activity_entries);
+ join_activity_entries read_text write_text);
use Bugzilla::Constants;
use Bugzilla::RNG qw(irand);
@@ -39,6 +39,8 @@
use Text::Wrap;
use Encode qw(encode decode resolve_alias);
use Encode::Guess;
+use File::Basename qw(dirname);
+use File::Temp qw(tempfile);
sub trick_taint {
require Carp;
@@ -106,6 +108,29 @@
return $var;
}
+sub read_text {
+ my ($filename) = @_;
+ open my $fh, '<:encoding(utf-8)', $filename;
+ local $/ = undef;
+ my $content = <$fh>;
+ close $fh;
+ return $content;
+}
+
+sub write_text {
+ my ($filename, $content) = @_;
+ my ($tmp_fh, $tmp_filename) = tempfile('.tmp.XXXXXXXXXX',
+ DIR => dirname($filename),
+ UNLINK => 0,
+ );
+ binmode $tmp_fh, ':encoding(utf-8)';
+ print $tmp_fh $content;
+ close $tmp_fh;
+ # File::Temp tries for secure files, but File::Slurp used the umask.
+ chmod(0666 & ~umask, $tmp_filename);
+ rename $tmp_filename, $filename;
+}
+
sub html_light_quote {
my ($text) = @_;
# admin/table.html.tmpl calls |FILTER html_light| many times.
@@ -590,7 +615,7 @@
second => defined($time[0]) ? int($time[0]) : undef,
# If a timezone was specified, use it. Otherwise, use the
# local timezone.
- time_zone => Bugzilla->local_timezone->offset_as_string($time[6])
+ time_zone => DateTime::TimeZone->offset_as_string($time[6])
|| Bugzilla->local_timezone,
);
Modified: trunk/Websites/bugs.webkit.org/ChangeLog (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/ChangeLog 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/ChangeLog 2019-01-18 20:39:32 UTC (rev 240167)
@@ -1,3 +1,56 @@
+2019-01-18 Ling Ho <lin...@apple.com>
+
+ Update Bugzilla running on bugs.webkit.org and bugs.webkit-uat.org to version 5.0.4
+ https://bugs.webkit.org/show_bug.cgi?id=193477
+ <rdar://problem/37618737>
+
+ Reviewed by Lucas Forschler.
+
+ * Bugzilla/Config.pm:
+ (write_params):
+ (read_param_file):
+ * Bugzilla/Constants.pm:
+ * Bugzilla/DB/Sqlite.pm:
+ (sql_date_format):
+ * Bugzilla/Install/Filesystem.pm:
+ (update_filesystem):
+ (_update_old_mining_filenames):
+ * Bugzilla/Install/Requirements.pm:
+ (REQUIRED_MODULES):
+ * Bugzilla/JobQueue.pm:
+ (subprocess_worker):
+ (kill_worker):
+ * Bugzilla/Migrate.pm:
+ (parse_date):
+ * Bugzilla/Template.pm:
+ (_concatenate_css):
+ (_concatenate_js):
+ * Bugzilla/Util.pm:
+ (read_text):
+ (write_text):
+ (datetime_from):
+ * contrib/jb2bz.py:
+ (process_reply_file):
+ (maybe_add_attachment):
+ (process_text_plain):
+ (process_multi_part):
+ (process_jitterbug):
+ (process_mime_body): Deleted.
+ * docs/en/rst/conf.py:
+ * docs/en/rst/installing/linux.rst:
+ * docs/en/rst/installing/mac-os-x.rst:
+ * docs/en/rst/installing/migrating-from-2.inc.rst:
+ * docs/en/rst/installing/migrating.rst:
+ * docs/en/rst/installing/quick-start.rst:
+ * docs/en/rst/installing/upgrading-with-git.rst:
+ * docs/en/rst/installing/windows.rst:
+ * docs/en/rst/integrating/extensions.rst:
+ * docs/en/rst/integrating/skins.rst:
+ * editflagtypes.cgi:
+ (get_products_and_components):
+ * taskgraph.json:
+ * template/en/default/pages/release-notes.html.tmpl:
+
2018-10-05 Jer Noble <jer.no...@apple.com>
Radar links should be clickable on bugs.webkit.org
Modified: trunk/Websites/bugs.webkit.org/contrib/jb2bz.py (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/contrib/jb2bz.py 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/contrib/jb2bz.py 2019-01-18 20:39:32 UTC (rev 240167)
@@ -17,8 +17,8 @@
Share and enjoy.
"""
-import rfc822, mimetools, multifile, mimetypes, email.utils
-import sys, re, glob, StringIO, os, stat, time
+import email, mimetypes, email.utils
+import sys, re, glob, os, stat, time
import MySQLdb, getopt
# mimetypes doesn't include everything we might encounter, yet.
@@ -89,11 +89,25 @@
def process_reply_file(current, fname):
new_note = {}
reply = open(fname, "r")
- msg = rfc822.Message(reply)
- new_note['text'] = "%s\n%s" % (msg['From'], msg.fp.read())
- new_note['timestamp'] = email.utils.parsedate_tz(msg['Date'])
- current["notes"].append(new_note)
+ msg = email.message_from_file(reply)
+ # Add any attachments that may have been in a followup or reply
+ msgtype = msg.get_content_maintype()
+ if msgtype == "multipart":
+ for part in msg.walk():
+ new_note = {}
+ if part.get_filename() is None:
+ if part.get_content_type() == "text/plain":
+ new_note['timestamp'] = time.gmtime(email.utils.mktime_tz(email.utils.parsedate_tz(msg['Date'])))
+ new_note['text'] = "%s\n%s" % (msg['From'], part.get_payload())
+ current["notes"].append(new_note)
+ else:
+ maybe_add_attachment(part, current)
+ else:
+ new_note['text'] = "%s\n%s" % (msg['From'], msg.get_payload())
+ new_note['timestamp'] = time.gmtime(email.utils.mktime_tz(email.utils.parsedate_tz(msg['Date'])))
+ current["notes"].append(new_note)
+
def add_notes(current):
"""Add any notes that have been recorded for the current bug."""
process_notes_file(current, "%d.notes" % current['number'])
@@ -104,51 +118,48 @@
for f in glob.glob("%d.followup.*" % current['number']):
process_reply_file(current, f)
-def maybe_add_attachment(current, file, submsg):
+def maybe_add_attachment(submsg, current):
"""Adds the attachment to the current record"""
- cd = submsg["Content-Disposition"]
- m = re.search(r'filename="([^"]+)"', cd)
- if m == None:
+ attachment_filename = submsg.get_filename()
+ if attachment_filename is None:
return
- attachment_filename = m.group(1)
- if (submsg.gettype() == 'application/octet-stream'):
+
+ if (submsg.get_content_type() == 'application/octet-stream'):
# try get a more specific content-type for this attachment
- type, encoding = mimetypes.guess_type(m.group(1))
- if type == None:
- type = submsg.gettype()
+ mtype, encoding = mimetypes.guess_type(attachment_filename)
+ if mtype == None:
+ mtype = submsg.get_content_type()
else:
- type = submsg.gettype()
+ mtype = submsg.get_content_type()
- try:
- data = ""
- mimetools.decode(file, data, submsg.getencoding())
- except:
+ if mtype == 'application/x-pkcs7-signature':
return
- current['attachments'].append( ( attachment_filename, type, data.getvalue() ) )
+ if mtype == 'application/pkcs7-signature':
+ return
-def process_mime_body(current, file, submsg):
- data = ""
+ if mtype == 'application/pgp-signature':
+ return
+
+ if mtype == 'message/rfc822':
+ return
+
try:
- mimetools.decode(file, data, submsg.getencoding())
- current['description'] = data.getvalue()
+ data = ""
except:
return
+ current['attachments'].append( ( attachment_filename, mtype, data ) )
+
def process_text_plain(msg, current):
- current['description'] = msg.fp.read()
+ current['description'] = msg.get_payload()
-def process_multi_part(file, msg, current):
- mf = multifile.MultiFile(file)
- mf.push(msg.getparam("boundary"))
- while mf.next():
- submsg = mimetools.Message(file)
- if submsg.has_key("Content-Disposition"):
- maybe_add_attachment(current, mf, submsg)
+def process_multi_part(msg, current):
+ for part in msg.walk():
+ if part.get_filename() is None:
+ process_text_plain(part, current)
else:
- # This is the message body itself (always?), so process
- # accordingly
- process_mime_body(current, mf, submsg)
+ maybe_add_attachment(part, current)
def process_jitterbug(filename):
current = {}
@@ -158,17 +169,14 @@
current['description'] = ''
current['date-reported'] = ()
current['short-description'] = ''
-
+
print "Processing: %d" % current['number']
- file = open(filename, "r")
- create_date = os.fstat(file.fileno())
- msg = mimetools.Message(file)
+ mfile = open(filename, "r")
+ create_date = os.fstat(mfile.fileno())
+ msg = email.message_from_file(mfile)
- msgtype = msg.gettype()
-
- add_notes(current)
- current['date-reported'] = email.utils.parsedate_tz(msg['Date'])
+ current['date-reported'] = time.gmtime(email.utils.mktime_tz(email.utils.parsedate_tz(msg['Date'])))
if current['date-reported'] is None:
current['date-reported'] = time.gmtime(create_date[stat.ST_MTIME])
@@ -175,22 +183,23 @@
if current['date-reported'][0] < 1900:
current['date-reported'] = time.gmtime(create_date[stat.ST_MTIME])
- if msg.getparam('Subject') is not None:
+ if msg.has_key('Subject') is not False:
current['short-description'] = msg['Subject']
else:
current['short-description'] = "Unknown"
- if msgtype[:5] == 'text/':
+ msgtype = msg.get_content_maintype()
+ if msgtype == 'text':
process_text_plain(msg, current)
- elif msgtype[:5] == 'text':
- process_text_plain(msg, current)
- elif msgtype[:10] == "multipart/":
- process_multi_part(file, msg, current)
+ elif msgtype == "multipart":
+ process_multi_part(msg, current)
else:
# Huh? This should never happen.
print "Unknown content-type: %s" % msgtype
sys.exit(1)
+ add_notes(current)
+
# At this point we have processed the message: we have all of the notes and
# attachments stored, so it's time to add things to the database.
# The schema for JitterBug 2.14 can be found at:
@@ -219,6 +228,7 @@
try:
cursor.execute( "INSERT INTO bugs SET " \
"bug_id=%s," \
+ "priority='---'," \
"bug_severity='normal'," \
"bug_status=%s," \
"creation_ts=%s," \
@@ -242,7 +252,7 @@
version,
component,
resolution] )
-
+
# This is the initial long description associated with the bug report
cursor.execute( "INSERT INTO longdescs SET " \
"bug_id=%s," \
@@ -253,7 +263,7 @@
reporter,
time.strftime("%Y-%m-%d %H:%M:%S", current['date-reported'][:9]),
current['description'] ] )
-
+
# Add whatever notes are associated with this defect
for n in current['notes']:
cursor.execute( "INSERT INTO longdescs SET " \
@@ -265,15 +275,15 @@
reporter,
time.strftime("%Y-%m-%d %H:%M:%S", n['timestamp'][:9]),
n['text']])
-
+
# add attachments associated with this defect
for a in current['attachments']:
cursor.execute( "INSERT INTO attachments SET " \
- "bug_id=%s, creation_ts=%s, description='', mimetype=%s," \
+ "bug_id=%s, creation_ts=%s, description=%s, mimetype=%s," \
"filename=%s, submitter_id=%s",
[ current['number'],
time.strftime("%Y-%m-%d %H:%M:%S", current['date-reported'][:9]),
- a[1], a[0], reporter ])
+ a[0], a[1], a[0], reporter ])
cursor.execute( "INSERT INTO attach_data SET " \
"id=LAST_INSERT_ID(), thedata=%s",
[ a[2] ])
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/conf.py (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/conf.py 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/conf.py 2019-01-18 20:39:32 UTC (rev 240167)
@@ -44,7 +44,7 @@
# General information about the project.
project = u'Bugzilla'
-copyright = u'2014, The Bugzilla Team'
+copyright = u'2016, The Bugzilla Team'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -387,7 +387,7 @@
_on_rtd_ = os.environ.get('READTHEDOCS', None) == 'True'
if on_rtd:
- base_api_url = 'https://www.bugzilla.org/docs/5.0/en/html/api/'
+ base_api_url = 'https://www.bugzilla.org/docs/5.0/en/html/integrating/api/'
else:
base_api_url = '../integrating/api/'
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/installing/linux.rst (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/installing/linux.rst 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/installing/linux.rst 2019-01-18 20:39:32 UTC (rev 240167)
@@ -49,7 +49,7 @@
'perl(Daemon::Generic)' 'perl(Date::Format)' 'perl(DateTime)'
'perl(DateTime::TimeZone)' 'perl(DBI)' 'perl(Digest::SHA)' 'perl(Email::MIME)'
'perl(Email::Reply)' 'perl(Email::Sender)' 'perl(Encode)' 'perl(Encode::Detect)'
-'perl(File::MimeInfo::Magic)' 'perl(File::Slurp)' 'perl(GD)' 'perl(GD::Graph)'
+'perl(File::MimeInfo::Magic)' 'perl(GD)' 'perl(GD::Graph)'
'perl(GD::Text)' 'perl(HTML::FormatText::WithLinks)' 'perl(HTML::Parser)'
'perl(HTML::Scrubber)' 'perl(IO::Scalar)' 'perl(JSON::RPC)' 'perl(JSON::XS)'
'perl(List::MoreUtils)' 'perl(LWP::UserAgent)' 'perl(Math::Random::ISAAC)'
@@ -117,7 +117,7 @@
The best way to get Bugzilla is to check it out from git:
-:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla`
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla`
Run the above command in your home directory, replacing "X.X" with the 2-digit
version number of the stable release of Bugzilla that you want - e.g. "4.4".
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/installing/mac-os-x.rst (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/installing/mac-os-x.rst 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/installing/mac-os-x.rst 2019-01-18 20:39:32 UTC (rev 240167)
@@ -28,7 +28,7 @@
The best way to get Bugzilla is to check it out from git:
-:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla`
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla`
Run the above command in your home directory, replacing "X.X" with the 2-digit
version number of the stable release of Bugzilla that you want - e.g. "4.4".
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/installing/migrating-from-2.inc.rst (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/installing/migrating-from-2.inc.rst 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/installing/migrating-from-2.inc.rst 2019-01-18 20:39:32 UTC (rev 240167)
@@ -21,7 +21,7 @@
Once git is installed, run these commands to pull a copy of Bugzilla:
-:command:`git clone https://git.mozilla.org/bugzilla/bugzilla bugzilla-new`
+:command:`git clone https://github.com/bugzilla/bugzilla bugzilla-new`
:command:`cd bugzilla-new`
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/installing/migrating.rst (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/installing/migrating.rst 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/installing/migrating.rst 2019-01-18 20:39:32 UTC (rev 240167)
@@ -4,8 +4,7 @@
#########################################
Bugzilla has a framework you can use for migrating from other bug-tracking
-systems -
-`Bugzilla::Migrate <http://www.bugzilla.org/docs/tip/en/html/api/Bugzilla/Migrate.html>`_.
+systems - :api:`Bugzilla::Migrate <Bugzilla/Migrate.html>`.
It provides the infrastructure you will need,
but requires a module to be written to define the specifics of the system you
are coming from. One exists for
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/installing/quick-start.rst (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/installing/quick-start.rst 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/installing/quick-start.rst 2019-01-18 20:39:32 UTC (rev 240167)
@@ -64,7 +64,7 @@
:command:`cd /var/www/html`
-:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla bugzilla`
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla bugzilla`
(where "X.X" is the 2-digit version number of the stable release of Bugzilla
that you want - e.g. 5.0)
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/installing/upgrading-with-git.rst (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/installing/upgrading-with-git.rst 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/installing/upgrading-with-git.rst 2019-01-18 20:39:32 UTC (rev 240167)
@@ -9,6 +9,18 @@
with Bugzilla that will automatically do all of the database migration
for you.
+Bugzilla is now hosted on Github, but we used to be hosted on git.mozilla.org.
+If you got the code from git.mozilla.org, you need to point your
+checkout at Github instead. To find out, run:
+
+:command:`git remote -v`
+
+If you see "git.mozilla.org" anywhere in the output, then run:
+
+:command:`git remote set-url origin https://github.com/bugzilla/bugzilla`
+
+This change will only ever need to be done once.
+
.. include:: upgrading-with-1.inc.rst
You can see if you have local code customizations using:
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/installing/windows.rst (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/installing/windows.rst 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/installing/windows.rst 2019-01-18 20:39:32 UTC (rev 240167)
@@ -40,7 +40,7 @@
The best way to get Bugzilla is to check it out from git. Download and install
git from the `git website <http://git-scm.com/download>`_, and then run:
-:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla C:\\bugzilla`
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla C:\\bugzilla`
where "X.X" is the 2-digit version number of the stable release of Bugzilla
that you want (e.g. 5.0).
@@ -85,7 +85,6 @@
* URI
* List-MoreUtils
* Math-Random-ISAAC
-* File-Slurp
* JSON-XS
* Win32
* Win32-API
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/integrating/extensions.rst (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/integrating/extensions.rst 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/integrating/extensions.rst 2019-01-18 20:39:32 UTC (rev 240167)
@@ -11,8 +11,8 @@
written by other people on our wiki. You would need to
make sure that the extension in question works with your version of Bugzilla.
-Or, you can write your own extension. See the `Bugzilla Extension
-documentation <http://www.bugzilla.org/docs/tip/en/html/api/Bugzilla/Extension.html>`_
+Or, you can write your own extension. See the :api:`Bugzilla Extension
+documentation <Bugzilla/Extension.html>`
for the core documentation on how to do that. It would make sense to read
the section on :ref:`templates`. There is also a sample extension in
:file:`$BUGZILLA_HOME/extensions/Example/` which gives examples of how to
@@ -183,8 +183,8 @@
Because this kind of change is such a common request, we have added a
specific hook for it that :ref:`extensions` can call. It's called
-``bug_check_can_change_field``, and it's documented `in the Hooks
-documentation <http://www.bugzilla.org/docs/tip/en/html/api/Bugzilla/Hook.html#bug_check_can_change_field>`_.
+``bug_check_can_change_field``, and it's documented :api:`in the Hooks
+documentation <Bugzilla/Hook.html#bug_check_can_change_field>`.
Checking Syntax
===============
Modified: trunk/Websites/bugs.webkit.org/docs/en/rst/integrating/skins.rst (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/docs/en/rst/integrating/skins.rst 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/docs/en/rst/integrating/skins.rst 2019-01-18 20:39:32 UTC (rev 240167)
@@ -8,7 +8,7 @@
find some more listed
`on the wiki <https://wiki.mozilla.org/Bugzilla:Addons#Skins>`_, and there
are a couple more which are part of
-`bugzilla.mozilla.org <http://git.mozilla.org/?p=webtools/bmo/bugzilla.git>`_.
+`bugzilla.mozilla.org <https://github.com/mozilla-bteam/bmo>`_.
However, in each
case you may need to check that the skin supports the version of Bugzilla
you have.
Modified: trunk/Websites/bugs.webkit.org/editflagtypes.cgi (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/editflagtypes.cgi 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/editflagtypes.cgi 2019-01-18 20:39:32 UTC (rev 240167)
@@ -453,7 +453,7 @@
# Let's sort the list by classifications.
@products = ();
- push(@products, @{$class{$_->id}}) foreach Bugzilla::Classification->get_all;
+ push(@products, @{$class{$_->id} || []}) foreach Bugzilla::Classification->get_all;
}
}
Modified: trunk/Websites/bugs.webkit.org/taskgraph.json (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/taskgraph.json 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/taskgraph.json 2019-01-18 20:39:32 UTC (rev 240167)
@@ -17,8 +17,8 @@
"provisionerId": "aws-provisioner-v1",
"workerType": "b2gtest",
"payload": {
- "image": "dklawren/docker-bugzilla",
- "command": ["/runtests.sh"],
+ "image": "bugzilla/bugzilla-ci",
+ "command": ["runtests.sh"],
"env": {
"TEST_SUITE": "sanity"
},
@@ -54,8 +54,8 @@
"provisionerId": "aws-provisioner-v1",
"workerType": "b2gtest",
"payload": {
- "image": "dklawren/docker-bugzilla",
- "command": ["/runtests.sh"],
+ "image": "bugzilla/bugzilla-ci",
+ "command": ["runtests.sh"],
"env": {
"TEST_SUITE": "docs"
},
@@ -91,8 +91,8 @@
"provisionerId": "aws-provisioner-v1",
"workerType": "b2gtest",
"payload": {
- "image": "dklawren/docker-bugzilla",
- "command": ["/runtests.sh"],
+ "image": "bugzilla/bugzilla-ci",
+ "command": ["runtests.sh"],
"env": {
"TEST_SUITE": "webservices"
},
@@ -133,8 +133,8 @@
"provisionerId": "aws-provisioner-v1",
"workerType": "b2gtest",
"payload": {
- "image": "dklawren/docker-bugzilla",
- "command": ["/runtests.sh"],
+ "image": "bugzilla/bugzilla-ci",
+ "command": ["runtests.sh"],
"env": {
"TEST_SUITE": "selenium"
},
@@ -141,7 +141,7 @@
"artifacts": {
"public/runtests_log": {
"type": "file",
- "path": "/runtests.log",
+ "path": "/tmp/runtests.log",
"expires": "2018-02-17T17:33:38.806Z"
},
"public/httpd_error_log": {
@@ -151,7 +151,7 @@
},
"public/selenium_log": {
"type": "file",
- "path": "/selenium.log",
+ "path": "/tmp/selenium.log",
"expires": "2018-02-17T17:33:38.806Z"
}
}
@@ -180,15 +180,16 @@
"provisionerId": "aws-provisioner-v1",
"workerType": "b2gtest",
"payload": {
- "image": "dklawren/docker-bugzilla:pgsql",
- "command": ["/runtests.sh"],
+ "image": "bugzilla/bugzilla-ci",
+ "command": ["runtests.sh"],
"env": {
+ "BUGS_DB_DRIVER": "pg",
"TEST_SUITE": "webservices"
},
"artifacts": {
"public/runtests_log": {
"type": "file",
- "path": "/runtests.log",
+ "path": "/tmp/runtests.log",
"expires": "2018-02-17T17:33:38.806Z"
},
"public/httpd_error_log": {
@@ -222,15 +223,16 @@
"provisionerId": "aws-provisioner-v1",
"workerType": "b2gtest",
"payload": {
- "image": "dklawren/docker-bugzilla:pgsql",
- "command": ["/runtests.sh"],
+ "image": "bugzilla/bugzilla-ci",
+ "command": ["runtests.sh"],
"env": {
+ "BUGS_DB_DRIVER": "pg",
"TEST_SUITE": "selenium"
},
"artifacts": {
"public/runtests_log": {
"type": "file",
- "path": "/runtests.log",
+ "path": "/tmp/runtests.log",
"expires": "2018-02-17T17:33:38.806Z"
},
"public/httpd_error_log": {
@@ -240,7 +242,7 @@
},
"public/selenium_log": {
"type": "file",
- "path": "/selenium.log",
+ "path": "/tmp/selenium.log",
"expires": "2018-02-17T17:33:38.806Z"
}
}
Modified: trunk/Websites/bugs.webkit.org/template/en/default/pages/release-notes.html.tmpl (240166 => 240167)
--- trunk/Websites/bugs.webkit.org/template/en/default/pages/release-notes.html.tmpl 2019-01-18 20:39:24 UTC (rev 240166)
+++ trunk/Websites/bugs.webkit.org/template/en/default/pages/release-notes.html.tmpl 2019-01-18 20:39:32 UTC (rev 240167)
@@ -43,6 +43,27 @@
<h2 id="point">Updates in this 5.0.x Release</h2>
+<h3>5.0.4</h3>
+
+<p>This release fixes one security issue. See the
+ <a href="" Advisory</a>
+ for details.</p>
+
+<p>This release also contains the following [% terms.bug %] fixes:</p>
+
+<ul>
+ <li><kbd>checksetup.pl</kbd> would fail to update Chart storage during pre-3.6 to 5.0 upgrade.
+ (<a href="" terms.Bug %] 1273846</a>)</li>
+ <li><kbd>editflagtypes.cgi</kbd> would crash when classifications are enabled and
+ the user did not have global <kbd>editcomponents</kbd> privileges.
+ (<a href="" terms.Bug %] 1310728</a>)</li>
+ <li>The <kbd>File::Slurp</kbd> would trigger warnings on perl 5.24.
+ (<a href="" terms.Bug %] 1301887</a>)</li>
+ <li>All the time entries in the 'when' column had the correct date but the time
+ was fixed to 00:00 when using Sqlite.
+ (<a href="" terms.Bug %] 1303702</a>)</li>
+</ul>
+
<h3>5.0.3</h3>
<p>This release fixes one security issue. See the
@@ -69,7 +90,7 @@
(<a href="" terms.Bug %] 1259881</a>)</li>
<li>An extension which allows user-controlled data to be used as a link in
tabs could trigger XSS if the data is not correctly sanitized.
- [%+ terms. Bugzilla %] no longer relies on the extension to do the sanity
+ [%+ terms.Bugzilla %] no longer relies on the extension to do the sanity
check. A vanilla installation is not affected as no tab is user-controlled.
(<a href="" terms.Bug %] 1250114</a>)</li>
<li>Extensions can now easily override the favicon used for the
@@ -174,7 +195,7 @@
<h3 id="req_modules">Required Perl Modules</h3>
[% INCLUDE req_table reqs = REQUIRED_MODULES
- new = ['File-Slurp','JSON-XS', 'Email-Sender']
+ new = ['JSON-XS', 'Email-Sender']
updated = ['DateTime', 'DateTime-TimeZone',
'Template-Toolkit', 'URI'] %]
@@ -204,7 +225,7 @@
tell whether or not you have these modules installed, and it will tell
you.</p>
-
+<a name="v50_feat"></a>
<h2 id="feat">New Features and Improvements</h2>
<ul>
