@matheusbsbs / matheus-bagliano / commits / 7d5b30e09f

gitweb: hard-depend on the Digest::MD5 5.8 module

Since my d48b284183 ("perl: bump the required Perl version to 5.8 from 5.6.[21]", 2010-09-24), we've depended on 5.8, so there's no reason to conditionally require Digest::MD5 anymore. It was released with perl v5.7.3[1] The initial introduction of the dependency in e9fdd74e53 ("gitweb: (gr)avatar support", 2009-06-30) says as much, this also undoes part of the later 2e9c8789b7 ("gitweb: Mention optional Perl modules in INSTALL", 2011-02-04) since gitweb will always be run on at least 5.8, so there's no need to mention Digest::MD5 as a required module in the documentation, let's instead say that we require perl 5.8. 1. $ corelist Digest::MD5 Data for 2015-02-14 Digest::MD5 was first released with perl v5.7.3 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Mar 3, 2018 at 15:38 UTC 7d5b30e09fc705b84bba57ac655263ab6d8f71a6
2 files changed +5 -15
gitweb/INSTALL
+1 -2
@@ -29,12 +29,11 @@ Requirements
29 ------------
30
31 - Core git tools
32 - - Perl
32 + - Perl 5.8
33 - Perl modules: CGI, Encode, Fcntl, File::Find, File::Basename.
34 - web server
35
36 The following optional Perl modules are required for extra features
37 - - Digest::MD5 - for gravatar support
37 - CGI::Fast and FCGI - for running gitweb as FastCGI script
38 - HTML::TagCloud - for fancy tag cloud in project list view
39 - HTTP::Date or Time::ParseDate - to support If-Modified-Since for feeds
gitweb/gitweb.perl
+4 -13
@@ -20,6 +20,8 @@ use Fcntl ':mode';
20 use File::Find qw();
21 use File::Basename qw(basename);
22 use Time::HiRes qw(gettimeofday tv_interval);
23 +use Digest::MD5 qw(md5_hex);
24 +
25 binmode STDOUT, ':utf8';
26
27 if (!defined($CGI::VERSION) || $CGI::VERSION < 4.08) {
@@ -490,7 +492,6 @@ our %feature = (
492 # Currently available providers are gravatar and picon.
493 # If an unknown provider is specified, the feature is disabled.
494
493 - # Gravatar depends on Digest::MD5.
495 # Picon currently relies on the indiana.edu database.
496
497 # To enable system wide have in $GITWEB_CONFIG
@@ -1166,18 +1167,8 @@ sub configure_gitweb_features {
1167 our @snapshot_fmts = gitweb_get_feature('snapshot');
1168 @snapshot_fmts = filter_snapshot_fmts(@snapshot_fmts);
1169
1169 - # check that the avatar feature is set to a known provider name,
1170 - # and for each provider check if the dependencies are satisfied.
1171 - # if the provider name is invalid or the dependencies are not met,
1172 - # reset $git_avatar to the empty string.
1170 our ($git_avatar) = gitweb_get_feature('avatar');
1174 - if ($git_avatar eq 'gravatar') {
1175 - $git_avatar = '' unless (eval { require Digest::MD5; 1; });
1176 - } elsif ($git_avatar eq 'picon') {
1177 - # no dependencies
1178 - } else {
1179 - $git_avatar = '';
1180 - }
1171 + $git_avatar = '' unless $git_avatar =~ /^(?:gravatar|picon)$/s;
1172
1173 our @extra_branch_refs = gitweb_get_feature('extra-branch-refs');
1174 @extra_branch_refs = filter_and_validate_refs (@extra_branch_refs);
@@ -2167,7 +2158,7 @@ sub gravatar_url {
2158 my $size = shift;
2159 $avatar_cache{$email} ||=
2160 "//www.gravatar.com/avatar/" .
2170 - Digest::MD5::md5_hex($email) . "?s=";
2161 + md5_hex($email) . "?s=";
2162 return $avatar_cache{$email} . $size;
2163 }
2164