diff options
author | ohauer <ohauer@FreeBSD.org> | 2016-05-18 19:12:04 +0000 |
---|---|---|
committer | ohauer <ohauer@FreeBSD.org> | 2016-05-18 19:12:04 +0000 |
commit | c6d30716a8ff5a15ef91c88055644ca3ee84fefc (patch) | |
tree | bfecec7270109512d4e7e280a446a472dacf6b82 | |
parent | 2e391e93faa1e97727616fce0b8860616c619789 (diff) | |
download | FreeBSD-ports-c6d30716a8ff5a15ef91c88055644ca3ee84fefc.zip FreeBSD-ports-c6d30716a8ff5a15ef91c88055644ca3ee84fefc.tar.gz |
- update to 5.0.3
Thanks to Mokhi for review latest 5.0.x PR's and patches!
Security: CVE-2016-2803
Security: 036d6c38-1c5b-11e6-b9e0-20cf30e32f6d
-rw-r--r-- | devel/bugzilla50/Makefile | 3 | ||||
-rw-r--r-- | devel/bugzilla50/distinfo | 5 | ||||
-rw-r--r-- | devel/bugzilla50/files/patch-Bugzilla_Attachment.pm | 23 | ||||
-rw-r--r-- | devel/bugzilla50/files/patch-PR206103 | 150 | ||||
-rw-r--r-- | devel/bugzilla50/files/patch-whine.pl | 22 |
5 files changed, 26 insertions, 177 deletions
diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile index b56373e..cb3a0b4 100644 --- a/devel/bugzilla50/Makefile +++ b/devel/bugzilla50/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 5.0.2 -PORTREVISION= 2 +PORTVERSION= 5.0.3 CATEGORIES= devel MASTER_SITES= MOZILLA/webtools MOZILLA/webtools/archived diff --git a/devel/bugzilla50/distinfo b/devel/bugzilla50/distinfo index 346af00..2a3816f 100644 --- a/devel/bugzilla50/distinfo +++ b/devel/bugzilla50/distinfo @@ -1,2 +1,3 @@ -SHA256 (bugzilla/bugzilla-5.0.2.tar.gz) = 82fa7bc8e27cfc9fe42d3fce3bfb6e7536bba245d76c2ee268d56253d16e3de3 -SIZE (bugzilla/bugzilla-5.0.2.tar.gz) = 4004728 +TIMESTAMP = 1463597613 +SHA256 (bugzilla/bugzilla-5.0.3.tar.gz) = 594d1d6813f4731b71fbbf3809d4d7e3511f1cd73e12fcad9f498319ff2fcadc +SIZE (bugzilla/bugzilla-5.0.3.tar.gz) = 4069689 diff --git a/devel/bugzilla50/files/patch-Bugzilla_Attachment.pm b/devel/bugzilla50/files/patch-Bugzilla_Attachment.pm deleted file mode 100644 index 2a27f37..0000000 --- a/devel/bugzilla50/files/patch-Bugzilla_Attachment.pm +++ /dev/null @@ -1,23 +0,0 @@ -# Bug 1235270 - Set submitter_id before calling _check_data() -# https://bugzilla.mozilla.org/show_bug.cgi?id=1235270 -# Status: Upstreamed, pending next release - ---- Bugzilla/Attachment.pm.orig 2015-12-22 21:22:10 UTC -+++ Bugzilla/Attachment.pm -@@ -865,6 +865,8 @@ sub create { - sub run_create_validators { - my ($class, $params) = @_; - -+ $params->{submitter_id} = Bugzilla->user->id || ThrowUserError('invalid_user'); -+ - # Let's validate the attachment content first as it may - # alter some other attachment attributes. - $params->{data} = $class->_check_data($params); -@@ -872,7 +874,6 @@ sub run_create_validators { - - $params->{creation_ts} ||= Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)'); - $params->{modification_time} = $params->{creation_ts}; -- $params->{submitter_id} = Bugzilla->user->id || ThrowUserError('invalid_user'); - - return $params; - } diff --git a/devel/bugzilla50/files/patch-PR206103 b/devel/bugzilla50/files/patch-PR206103 deleted file mode 100644 index c137632..0000000 --- a/devel/bugzilla50/files/patch-PR206103 +++ /dev/null @@ -1,150 +0,0 @@ -# PR 206103 -# Upstream PR: https://bugzilla.mozilla.org/show_bug.cgi?id=1235395 -Index: files/patch-Bugzilla_Mailer.pm -=================================================================== ---- files/patch-Bugzilla_Mailer.pm.orig 2016-01-10 16:55:40 UTC -+++ files/patch-Bugzilla_Mailer.pm -@@ -0,0 +1,101 @@ -+# Bug 1235395 - whine.pl broken due to a missing generate_email() routine -+# https://bugzilla.mozilla.org/show_bug.cgi?id=1235395 -+# Status: Upstreamed, pending next release -+ -+--- Bugzilla/Mailer.pm.orig 2015-12-22 21:22:10 UTC -++++ Bugzilla/Mailer.pm -+@@ -12,13 +12,13 @@ use strict; -+ use warnings; -+ -+ use parent qw(Exporter); -+-@Bugzilla::Mailer::EXPORT = qw(MessageToMTA build_thread_marker); -+- -++@Bugzilla::Mailer::EXPORT = qw(MessageToMTA build_thread_marker generate_email); -+ use Bugzilla::Constants; -+ use Bugzilla::Error; -+ use Bugzilla::Hook; -+ use Bugzilla::MIME; -+ use Bugzilla::Util; -++use Bugzilla::User; -+ -+ use Date::Format qw(time2str); -+ -+@@ -161,6 +161,67 @@ sub send_staged_mail { -+ } -+ } -+ -++sub generate_email { -++ my ($vars, $templates) = @_; -++ my ($lang, $email_format, $msg_text, $msg_html, $msg_header); -++ state $use_utf8 = Bugzilla->params->{'utf8'}; -++ -++ if ($vars->{to_user}) { -++ $lang = $vars->{to_user}->setting('lang'); -++ $email_format = $vars->{to_user}->setting('email_format'); -++ } else { -++ # If there are users in the CC list who don't have an account, -++ # use the default language for email notifications. -++ $lang = Bugzilla::User->new()->setting('lang'); -++ # However we cannot fall back to the default email_format, since -++ # it may be HTML, and many of the includes used in the HTML -++ # template require a valid user object. Instead we fall back to -++ # the plaintext template. -++ $email_format = 'text_only'; -++ } -++ -++ my $template = Bugzilla->template_inner($lang); -++ -++ $template->process($templates->{header}, $vars, \$msg_header) -++ || ThrowTemplateError($template->error()); -++ $template->process($templates->{text}, $vars, \$msg_text) -++ || ThrowTemplateError($template->error()); -++ -++ my @parts = ( -++ Bugzilla::MIME->create( -++ attributes => { -++ content_type => 'text/plain', -++ charset => $use_utf8 ? 'UTF-8' : 'iso-8859-1', -++ encoding => 'quoted-printable', -++ }, -++ body_str => $msg_text, -++ ) -++ ); -++ if ($templates->{html} && $email_format eq 'html') { -++ $template->process($templates->{html}, $vars, \$msg_html) -++ || ThrowTemplateError($template->error()); -++ push @parts, Bugzilla::MIME->create( -++ attributes => { -++ content_type => 'text/html', -++ charset => $use_utf8 ? 'UTF-8' : 'iso-8859-1', -++ encoding => 'quoted-printable', -++ }, -++ body_str => $msg_html, -++ ); -++ } -++ -++ my $email = Bugzilla::MIME->new($msg_header); -++ if (scalar(@parts) == 1) { -++ $email->content_type_set($parts[0]->content_type); -++ } else { -++ $email->content_type_set('multipart/alternative'); -++ # Some mail clients need same encoding for each part, even empty ones. -++ $email->charset_set('UTF-8') if $use_utf8; -++ } -++ $email->parts_set(\@parts); -++ return $email; -++} -++ -+ 1; -+ -+ __END__ -+@@ -173,6 +234,10 @@ Bugzilla::Mailer - Provides methods for -+ -+ =over -+ -++=item C<generate_email> -++ -++Generates a multi-part email message, using the supplied list of templates. -++ -+ =item C<MessageToMTA> -+ -+ Sends the passed message to the mail transfer agent. ---- files/patch-Bugzilla_Product.pm.orig 2016-01-10 16:55:40 UTC -+++ files/patch-Bugzilla_Product.pm -@@ -0,0 +1,14 @@ -+# Bug 1235395 - whine.pl broken due to a missing generate_email() routine -+# https://bugzilla.mozilla.org/show_bug.cgi?id=1235395 -+# Status: Upstreamed, pending next release -+ -+--- Bugzilla/Product.pm.orig 2015-12-22 21:22:10 UTC -++++ Bugzilla/Product.pm -+@@ -22,7 +22,6 @@ use Bugzilla::Milestone; -+ use Bugzilla::Field; -+ use Bugzilla::Status; -+ use Bugzilla::Install::Requirements; -+-use Bugzilla::Mailer; -+ use Bugzilla::Series; -+ use Bugzilla::Hook; -+ use Bugzilla::FlagType; ---- files/patch-whine.pl.orig 2016-01-10 16:55:40 UTC -+++ files/patch-whine.pl -@@ -0,0 +1,22 @@ -+# Bug 1235395 - whine.pl broken due to a missing generate_email() routine -+# https://bugzilla.mozilla.org/show_bug.cgi?id=1235395 -+# Status: Upstreamed, pending next release -+ -+--- whine.pl.orig 2015-12-22 21:22:11 UTC -++++ whine.pl -+@@ -13,14 +13,13 @@ -+ use 5.10.1; -+ use strict; -+ use warnings; -+- -+ use lib qw(. lib); -+ -+ use Bugzilla; -+ use Bugzilla::Constants; -+ use Bugzilla::Search; -+ use Bugzilla::User; -+-use Bugzilla::Mailer; -++use Bugzilla::Mailer qw(MessageToMTA generate_email); -+ use Bugzilla::Util; -+ use Bugzilla::Group; -+ diff --git a/devel/bugzilla50/files/patch-whine.pl b/devel/bugzilla50/files/patch-whine.pl new file mode 100644 index 0000000..5d44d77 --- /dev/null +++ b/devel/bugzilla50/files/patch-whine.pl @@ -0,0 +1,22 @@ +# Bug 1235395 - whine.pl broken due to a missing generate_email() routine +# https://bugzilla.mozilla.org/show_bug.cgi?id=1235395 +# Status: Upstreamed, pending next release + +--- whine.pl.orig 2015-12-22 21:22:11 UTC ++++ whine.pl +@@ -13,14 +13,13 @@ + use 5.10.1; + use strict; + use warnings; +- + use lib qw(. lib); + + use Bugzilla; + use Bugzilla::Constants; + use Bugzilla::Search; + use Bugzilla::User; +-use Bugzilla::Mailer; ++use Bugzilla::Mailer qw(MessageToMTA generate_email); + use Bugzilla::Util; + use Bugzilla::Group; + |