Index: Makefile =================================================================== --- Makefile (revision 539319) +++ Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 5.0.4 -PORTREVISION= 1 +PORTVERSION= 5.0.6 CATEGORIES= devel MASTER_SITES= MOZILLA/webtools MOZILLA/webtools/archived Index: distinfo =================================================================== --- distinfo (revision 539319) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518801572 -SHA256 (bugzilla/bugzilla-5.0.4.tar.gz) = 6b3eb93d20bdfb170803748682d04cb1b6dc60019d7d16c29c4b7f97d2b85bee -SIZE (bugzilla/bugzilla-5.0.4.tar.gz) = 3994094 +TIMESTAMP = 1592331451 +SHA256 (bugzilla/bugzilla-5.0.6.tar.gz) = dd41a4b0a3a1df0d193bc056f2e3711d7b5605718a00bf6e5d4177bf1be86f77 +SIZE (bugzilla/bugzilla-5.0.6.tar.gz) = 3970724 Index: files/patch-PR207213 =================================================================== --- files/patch-PR207213 (revision 539319) +++ files/patch-PR207213 (nonexistent) @@ -1,63 +0,0 @@ -# Upstream PR: https://bugzilla.mozilla.org/show_bug.cgi?id=1128119 -=================================================================== ---- extensions/MoreBugUrl/Extension.pm.orig 2016-02-15 15:30:02 UTC -+++ extensions/MoreBugUrl/Extension.pm -@@ -22,6 +22,7 @@ use constant MORE_SUB_CLASSES => qw( - Bugzilla::Extension::MoreBugUrl::PHP - Bugzilla::Extension::MoreBugUrl::Redmine - Bugzilla::Extension::MoreBugUrl::Savane -+ Bugzilla::Extension::MoreBugUrl::Phabricator - ); - - # We need to update bug_see_also table because both ---- extensions/MoreBugUrl/lib/Phabricator.pm.orig 2016-02-15 15:40:28 UTC -+++ extensions/MoreBugUrl/lib/Phabricator.pm -@@ -0,0 +1,41 @@ -+# This Source Code Form is subject to the terms of the Mozilla Public -+# License, v. 2.0. If a copy of the MPL was not distributed with this -+# file, You can obtain one at http://mozilla.org/MPL/2.0/. -+# -+# This Source Code Form is "Incompatible With Secondary Licenses", as -+# defined by the Mozilla Public License, v. 2.0. -+ -+package Bugzilla::Extension::MoreBugUrl::Phabricator; -+ -+use 5.10.1; -+use strict; -+use warnings; -+ -+use parent qw(Bugzilla::BugUrl); -+ -+############################### -+#### Methods #### -+############################### -+ -+sub should_handle { -+ my ($class, $uri) = @_; -+ return ($uri->path =~ m|^/T\d+$|) ? 1 : 0; -+} -+ -+sub _check_value { -+ my $class = shift; -+ -+ my $uri = $class->SUPER::_check_value(@_); -+ -+ # Phabricator URLs have only one form: -+ # http://example.com/T111 -+ -+ # Make sure there are no query parameters. -+ $uri->query(undef); -+ # And remove any # part if there is one. -+ $uri->fragment(undef); -+ -+ return $uri; -+} -+ -+1; ---- extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl.orig 2015-12-22 21:22:11 UTC -+++ extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl -@@ -14,3 +14,4 @@ -
  • A b[% %]ug on b[% %]ugs.php.net.
    • -
  • An issue in a Redmine installation.
    • -
  • A b[% %]ug in a Savane installation.
    • -+
  • A task in a Phabricator installation.
    • Property changes on: files/patch-PR207213 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-PR619847 =================================================================== --- files/patch-PR619847 (revision 539319) +++ files/patch-PR619847 (nonexistent) @@ -1,41 +0,0 @@ ---- attachment.cgi.orig 2018-05-31 17:40:51 UTC -+++ attachment.cgi -@@ -25,8 +25,8 @@ use Bugzilla::Attachment; - use Bugzilla::Attachment::PatchReader; - use Bugzilla::Token; - --use Encode qw(encode find_encoding); --use Encode::MIME::Header; # Required to alter Encode::Encoding{'MIME-Q'}. -+use Encode qw(find_encoding); -+use URI::Escape qw(uri_escape_utf8); - - # For most scripts we don't make $cgi and $template global variables. But - # when preparing Bugzilla for mod_perl, this script used these -@@ -341,11 +341,8 @@ sub view { - # escape quotes and backslashes in the filename, per RFCs 2045/822 - $filename =~ s/\\/\\\\/g; # escape backslashes - $filename =~ s/"/\\"/g; # escape quotes -- -- # Avoid line wrapping done by Encode, which we don't need for HTTP -- # headers. See discussion in bug 328628 for details. -- local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 10000; -- $filename = encode('MIME-Q', $filename); -+ # Follow RFC 6266 section 4.1 (which itself points to RFC 5987 section 3.2) -+ $filename = uri_escape_utf8($filename); - - my $disposition = Bugzilla->params->{'allow_attachment_display'} ? 'inline' : 'attachment'; - -@@ -363,8 +360,11 @@ sub view { - } - } - } -- print $cgi->header(-type=>"$contenttype; name=\"$filename\"", -- -content_disposition=> "$disposition; filename=\"$filename\"", -+ # IE8 and older do not support RFC 6266. So for these old browsers -+ # we still pass the old 'filename' attribute. Modern browsers will -+ # automatically pick the new 'filename*' attribute. -+ print $cgi->header(-type=> $contenttype, -+ -content_disposition=> "$disposition; filename=\"$filename\"; filename*=UTF-8''$filename", - -content_length => $attachment->datasize); - disable_utf8(); - print $attachment->data; Property changes on: files/patch-PR619847 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 539319) +++ pkg-plist (working copy) @@ -1,4 +1,73 @@ +%%CONTRIB%%%%WWWDIR%%/contrib/Bugzilla.pm +%%CONTRIB%%%%WWWDIR%%/contrib/README +%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-queue.rhel +%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-queue.suse +%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-submit/README +%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-submit/bugdata.txt +%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-submit/bugzilla-submit +%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-submit/bugzilla-submit.xml +%%CONTRIB%%%%WWWDIR%%/contrib/bz_webservice_demo.pl +%%CONTRIB%%%%WWWDIR%%/contrib/bzdbcopy.pl +%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/bugcount +%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/bugids +%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/buglist +%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/bugs +%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/bugslink +%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/makequery +%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/query.conf +%%CONTRIB%%%%WWWDIR%%/contrib/console.pl +%%CONTRIB%%%%WWWDIR%%/contrib/convert-workflow.pl +%%CONTRIB%%%%WWWDIR%%/contrib/extension-convert.pl +%%CONTRIB%%%%WWWDIR%%/contrib/fixperms.pl +%%CONTRIB%%%%WWWDIR%%/contrib/jb2bz.py +%%CONTRIB%%%%WWWDIR%%/contrib/merge-users.pl +%%CONTRIB%%%%WWWDIR%%/contrib/mysqld-watcher.pl +%%CONTRIB%%%%WWWDIR%%/contrib/new-yui.sh +%%CONTRIB%%%%WWWDIR%%/contrib/recode.pl +%%CONTRIB%%%%WWWDIR%%/contrib/sendbugmail.pl +%%CONTRIB%%%%WWWDIR%%/contrib/sendunsentbugmail.pl +%%CONTRIB%%%%WWWDIR%%/contrib/syncLDAP.pl +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/Config.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/Extension.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/disabled +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/BitBucket.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/GetSatisfaction.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/PHP.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Phabricator.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/RT.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Redmine.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/ReviewBoard.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Rietveld.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Savane.pm +%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/Config.pm +%%VOTING%%%%WWWDIR%%/extensions/Voting/Extension.pm +%%VOTING%%%%WWWDIR%%/extensions/Voting/disabled +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/messages-messages.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/pages/voting.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/pages/voting/user.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/voting/delete-all.html.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl +%%VOTING%%%%WWWDIR%%/extensions/Voting/web/style.css %%WWWDIR%%/.htaccess +%%WWWDIR%%/.perltidyrc %%WWWDIR%%/Bugzilla.pm %%WWWDIR%%/Bugzilla/Attachment.pm %%WWWDIR%%/Bugzilla/Attachment/PatchReader.pm @@ -161,35 +230,7 @@ %%WWWDIR%%/colchange.cgi %%WWWDIR%%/collectstats.pl %%WWWDIR%%/config.cgi -%%CONTRIB%%%%WWWDIR%%/contrib/Bugzilla.pm -%%CONTRIB%%%%WWWDIR%%/contrib/README -%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-queue.rhel -%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-queue.suse -%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-submit/README -%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-submit/bugdata.txt -%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-submit/bugzilla-submit -%%CONTRIB%%%%WWWDIR%%/contrib/bugzilla-submit/bugzilla-submit.xml -%%CONTRIB%%%%WWWDIR%%/contrib/bz_webservice_demo.pl -%%CONTRIB%%%%WWWDIR%%/contrib/bzdbcopy.pl -%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/bugcount -%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/bugids -%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/buglist -%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/bugs -%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/bugslink -%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/makequery -%%CONTRIB%%%%WWWDIR%%/contrib/cmdline/query.conf -%%CONTRIB%%%%WWWDIR%%/contrib/console.pl -%%CONTRIB%%%%WWWDIR%%/contrib/convert-workflow.pl -%%CONTRIB%%%%WWWDIR%%/contrib/extension-convert.pl -%%CONTRIB%%%%WWWDIR%%/contrib/fixperms.pl -%%CONTRIB%%%%WWWDIR%%/contrib/jb2bz.py -%%CONTRIB%%%%WWWDIR%%/contrib/merge-users.pl -%%CONTRIB%%%%WWWDIR%%/contrib/mysqld-watcher.pl -%%CONTRIB%%%%WWWDIR%%/contrib/new-yui.sh -%%CONTRIB%%%%WWWDIR%%/contrib/recode.pl -%%CONTRIB%%%%WWWDIR%%/contrib/sendbugmail.pl -%%CONTRIB%%%%WWWDIR%%/contrib/sendunsentbugmail.pl -%%CONTRIB%%%%WWWDIR%%/contrib/syncLDAP.pl +%%WWWDIR%%/contrib/perl-fmt %%WWWDIR%%/createaccount.cgi %%WWWDIR%%/describecomponents.cgi %%WWWDIR%%/describekeywords.cgi @@ -211,45 +252,6 @@ %%WWWDIR%%/editworkflow.cgi %%WWWDIR%%/email_in.pl %%WWWDIR%%/enter_bug.cgi -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/Config.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/Extension.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/disabled -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/BitBucket.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/GetSatisfaction.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/PHP.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Phabricator.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/RT.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Redmine.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/ReviewBoard.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Rietveld.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/lib/Savane.pm -%%MOREBUGURL%%%%WWWDIR%%/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/Config.pm -%%VOTING%%%%WWWDIR%%/extensions/Voting/Extension.pm -%%VOTING%%%%WWWDIR%%/extensions/Voting/disabled -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/messages-messages.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/pages/voting.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/pages/voting/user.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/voting/delete-all.html.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl -%%VOTING%%%%WWWDIR%%/extensions/Voting/web/style.css %%WWWDIR%%/images/csv.png %%WWWDIR%%/images/favicon.ico %%WWWDIR%%/images/ical.png