Use Digest::SHA built into perl rather than external Digest::SHA1 to simplify depende...

diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm
index 5bbd7b8c62f5e05f9e9d5434df95a94c7d1933b8..64e907306544b150a48cc0668ded1f3cccae745e 100644 (file)
--- a/Bundle/IkiWiki/Extras.pm
+++ b/Bundle/IkiWiki/Extras.pm
@@ -16,7 +16,6 @@ perl -MCPAN -e 'install Bundle::IkiWiki::Extras'
 
 =head1 CONTENTS
 
-Digest::SHA1
 Authen::Passphrase
 Search::Xapian
 RPC::XML

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index dfd66a03e2250723132caa75c2f9d5da2e2c4fc2..4ed8b89f165847832762408c05b0abedc21aaf6c 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -37,10 +37,10 @@ sub render_graph (\%) {
        $src .= "}\n";
 
        # Use the sha1 of the graphviz code as part of its filename.
-       eval q{use Digest::SHA1};
+       eval q{use Digest::SHA};
        error($@) if $@;
        my $dest=$params{page}."/graph-".
-               IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
+               IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)).
                ".png";
        will_render($params{page}, $dest);
 

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 1cf762fce162fd6b7355c536bb5d06232d8a16ae..8fb9dff0ca082bb16b6332c052e848408db162b8 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -190,15 +190,15 @@ sub pageterm ($) {
        # 240 is the number used by omindex to decide when to hash an
        # overlong term. This does not use a compatible hash method though.
        if (length $page > 240) {
-               eval q{use Digest::SHA1};
+               eval q{use Digest::SHA};
                if ($@) {
-                       debug("search: ".sprintf(gettext("need Digest::SHA1 to index %s"), $page)) if $@;
+                       debug("search: ".sprintf(gettext("need Digest::SHA to index %s"), $page)) if $@;
                        return undef;
                }
 
                # Note no colon, therefore it's guaranteed to not overlap
                # with a page with the same name as the hash..
-               return "U".lc(Digest::SHA1::sha1_hex($page));
+               return "U".lc(Digest::SHA::sha1_hex($page));
        }
        else {
                return "U:".$page;

diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 1b1d04cba6e7c2e2510a51758a9cfd5439eb4ce5..e28d2605a2c1802e6afe798cab14548529d55936 100644 (file)
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -122,10 +122,10 @@ sub preprocess (@) {
 
        # Use the sha1 of the php code that generates the sparkline as
        # the base for its filename.
-       eval q{use Digest::SHA1};
+       eval q{use Digest::SHA};
         error($@) if $@;
        my $fn=$params{page}."/sparkline-".
-               IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($php)).
+               IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($php)).
                ".png";
        will_render($params{page}, $fn);
 

diff --git a/debian/changelog b/debian/changelog
index 5645b34d462e907dc2d13fdc2bf710495d8d1dd5..25123cecc788e23282d25403a82c000e71df5d8a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
   * meta: Allow syntax closer to html meta to be used.
   * Add new disable hook, allowing plugins to perform cleanup after they
     have been disabled.
+  * Use Digest::SHA built into perl rather than external Digest::SHA1
+    to simplify dependencies. Closes: #591040
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
 

diff --git a/debian/control b/debian/control
index 0562a4a99bbb3b3e35aba5c6ec858bb01646cc8f..049a685b0d7fc3ce9b912f0e8f011b6d08533c5d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
   libxml-feed-perl, libmailtools-perl, perlmagick,
   libfile-mimeinfo-perl, libcrypt-ssleay-perl,
   liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl,
-  libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl,
+  libtext-csv-perl, graphviz, libnet-amazon-s3-perl,
   libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
   libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
   po4a (>= 0.35-1), gettext, libyaml-perl

diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn
index 65130ae8c65fcf0fab149ab87551f7ba82d4c211..d57d7dc947c4c12486d235b35463e8e71ddef7c2 100644 (file)
--- a/doc/plugins/graphviz.mdwn
+++ b/doc/plugins/graphviz.mdwn
@@ -22,4 +22,4 @@ Some example graphs:
 [[!graph src="a -- b -- c -- a;" prog="circo" type="graph"]]
 """]]
 
-This plugin uses the [[!cpan Digest::SHA1]] perl module.
+This plugin uses the [[!cpan Digest::SHA]] perl module.

diff --git a/doc/plugins/search.mdwn b/doc/plugins/search.mdwn
index 92cc5945a27489c9118e272582bd15651456c3dd..e95739cf36569171e863e7587c3613bea53f4b50 100644 (file)
--- a/doc/plugins/search.mdwn
+++ b/doc/plugins/search.mdwn
@@ -4,7 +4,7 @@
 This plugin adds full text search to ikiwiki, using the
 [xapian](http://xapian.org/) engine, its
 [omega](http://xapian.org/docs/omega/overview.html) frontend, and the
-[[!cpan Search::Xapian]], [[!cpan Digest::SHA1]], and [[!cpan HTML::Scrubber]]
+[[!cpan Search::Xapian]], [[!cpan Digest::SHA]], and [[!cpan HTML::Scrubber]]
 perl modules.
 
 The [[ikiwiki/searching]] page describes how to write search queries.

diff --git a/doc/plugins/sparkline.mdwn b/doc/plugins/sparkline.mdwn
index ee3928d7ed4835df89a9731381e381ac737bb684..83e24a27d54a8912c70e089c17b37b00f745e050 100644 (file)
--- a/doc/plugins/sparkline.mdwn
+++ b/doc/plugins/sparkline.mdwn
@@ -16,7 +16,7 @@ to use the plugin, you will need:
   php can find it when `sparkline/Sparkline.php` is required.
 * The GD PHP module used by the Sparkline library.
 * A "php" program in the path, that can run standalone php programs.
-* [[!cpan Digest::SHA1]]
+* [[!cpan Digest::SHA]]
 
 On a Debian system, this can be accomplished by installing these packages:
 `libsparkline-php` `php5-gd` `php5-cli` `libdigest-sha1-perl`

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 43065b7f59a6c2316e0669b8a07e22668ddf310f..ca579470429e80704b67dfdb3be0e03ca07c9f03 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -31,7 +31,6 @@ Requires:       perl(HTML::Scrubber)
 Requires:       perl(XML::Simple)
 Requires:       perl(CGI::FormBuilder)
 Requires:       perl(CGI::Session)
-Requires:       perl(Digest::SHA1)
 
 Requires:       python-docutils