diff options
| -rwxr-xr-x | bin/rotate-photos | 2 | ||||
| -rw-r--r-- | carton.lock | 56 | ||||
| m--------- | commonlib | 0 | ||||
| -rw-r--r-- | cpanfile | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Photo.pm | 2 |
6 files changed, 4 insertions, 60 deletions
diff --git a/bin/rotate-photos b/bin/rotate-photos index 31a60ff6c..7b8109d65 100755 --- a/bin/rotate-photos +++ b/bin/rotate-photos @@ -16,7 +16,7 @@ use FindBin; use lib "$FindBin::Bin/../perllib"; use lib "$FindBin::Bin/../commonlib/perllib"; -use Digest::SHA1 qw(sha1_hex); +use Digest::SHA qw(sha1_hex); use Utils; use mySociety::Config; diff --git a/carton.lock b/carton.lock index b10e07f3b..9ef6aa916 100644 --- a/carton.lock +++ b/carton.lock @@ -13406,62 +13406,6 @@ "target" : "Digest::HMAC_MD5", "version" : "1.03" }, - "Digest::SHA1" : { - "dist" : "Digest-SHA1-2.13", - "mymeta" : { - "abstract" : "Perl interface to the SHA-1 algorithm", - "author" : [ - "Gisle Aas <gisle@activestate.com>" - ], - "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.120921", - "license" : [ - "perl_5" - ], - "meta-spec" : { - "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" - }, - "name" : "Digest-SHA1", - "no_index" : { - "directory" : [ - "t", - "inc" - ] - }, - "prereqs" : { - "build" : { - "requires" : { - "ExtUtils::MakeMaker" : "0" - } - }, - "configure" : { - "requires" : { - "ExtUtils::MakeMaker" : "0" - } - }, - "runtime" : { - "requires" : { - "Digest::base" : "1.00", - "perl" : "5.004" - } - } - }, - "release_status" : "stable", - "version" : "2.13", - "x_repository" : "http://github.com/gisle/digest-sha1" - }, - "name" : "Digest::SHA1", - "pathname" : "G/GA/GAAS/Digest-SHA1-2.13.tar.gz", - "provides" : { - "Digest::SHA1" : { - "file" : "Digest/SHA1.pm", - "version" : "2.13" - } - }, - "target" : "Digest::SHA1", - "version" : "2.13" - }, "Dir::Self" : { "dist" : "Dir-Self-0.10", "mymeta" : { diff --git a/commonlib b/commonlib -Subproject 86fbca1e11effc7afacefa722ca871ada0ee69f +Subproject 9582d37bc63e51581d90fdee59bafedd5863f09 @@ -36,7 +36,7 @@ requires 'DBIx::Class::InflateColumn::DateTime'; requires 'DBIx::Class::ResultSet'; requires 'DBIx::Class::Schema::Loader'; requires 'Digest::MD5'; -requires 'Digest::SHA1'; +requires 'Digest::SHA'; requires 'Email::Send'; requires 'Email::Send::SMTP'; requires 'Email::Simple'; diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 84a406a97..e2547019b 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -6,7 +6,7 @@ BEGIN { extends 'Catalyst::Controller'; } use Path::Class; use POSIX qw(strftime strcoll); -use Digest::SHA1 qw(sha1_hex); +use Digest::SHA qw(sha1_hex); use mySociety::EmailUtil qw(is_valid_email); use if !$ENV{TRAVIS}, 'Image::Magick'; diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index 279623922..6a94f92e8 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -5,7 +5,7 @@ use namespace::autoclean; BEGIN {extends 'Catalyst::Controller'; } use DateTime::Format::HTTP; -use Digest::SHA1 qw(sha1_hex); +use Digest::SHA qw(sha1_hex); use File::Path; use File::Slurp; use Path::Class; |