Use Digest::SHA built into perl rather than external Digest::SHA1 to simplify dependencies. Closes: #591040
parent
d1a5d00156
commit
fee00fdb7a
|
@ -16,7 +16,6 @@ perl -MCPAN -e 'install Bundle::IkiWiki::Extras'
|
||||||
|
|
||||||
=head1 CONTENTS
|
=head1 CONTENTS
|
||||||
|
|
||||||
Digest::SHA1
|
|
||||||
Authen::Passphrase
|
Authen::Passphrase
|
||||||
Search::Xapian
|
Search::Xapian
|
||||||
RPC::XML
|
RPC::XML
|
||||||
|
|
|
@ -37,10 +37,10 @@ sub render_graph (\%) {
|
||||||
$src .= "}\n";
|
$src .= "}\n";
|
||||||
|
|
||||||
# Use the sha1 of the graphviz code as part of its filename.
|
# Use the sha1 of the graphviz code as part of its filename.
|
||||||
eval q{use Digest::SHA1};
|
eval q{use Digest::SHA};
|
||||||
error($@) if $@;
|
error($@) if $@;
|
||||||
my $dest=$params{page}."/graph-".
|
my $dest=$params{page}."/graph-".
|
||||||
IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
|
IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)).
|
||||||
".png";
|
".png";
|
||||||
will_render($params{page}, $dest);
|
will_render($params{page}, $dest);
|
||||||
|
|
||||||
|
|
|
@ -190,15 +190,15 @@ sub pageterm ($) {
|
||||||
# 240 is the number used by omindex to decide when to hash an
|
# 240 is the number used by omindex to decide when to hash an
|
||||||
# overlong term. This does not use a compatible hash method though.
|
# overlong term. This does not use a compatible hash method though.
|
||||||
if (length $page > 240) {
|
if (length $page > 240) {
|
||||||
eval q{use Digest::SHA1};
|
eval q{use Digest::SHA};
|
||||||
if ($@) {
|
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;
|
return undef;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Note no colon, therefore it's guaranteed to not overlap
|
# Note no colon, therefore it's guaranteed to not overlap
|
||||||
# with a page with the same name as the hash..
|
# 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 {
|
else {
|
||||||
return "U:".$page;
|
return "U:".$page;
|
||||||
|
|
|
@ -122,10 +122,10 @@ sub preprocess (@) {
|
||||||
|
|
||||||
# Use the sha1 of the php code that generates the sparkline as
|
# Use the sha1 of the php code that generates the sparkline as
|
||||||
# the base for its filename.
|
# the base for its filename.
|
||||||
eval q{use Digest::SHA1};
|
eval q{use Digest::SHA};
|
||||||
error($@) if $@;
|
error($@) if $@;
|
||||||
my $fn=$params{page}."/sparkline-".
|
my $fn=$params{page}."/sparkline-".
|
||||||
IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($php)).
|
IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($php)).
|
||||||
".png";
|
".png";
|
||||||
will_render($params{page}, $fn);
|
will_render($params{page}, $fn);
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
|
||||||
* meta: Allow syntax closer to html meta to be used.
|
* meta: Allow syntax closer to html meta to be used.
|
||||||
* Add new disable hook, allowing plugins to perform cleanup after they
|
* Add new disable hook, allowing plugins to perform cleanup after they
|
||||||
have been disabled.
|
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
|
-- Joey Hess <joeyh@debian.org> Fri, 23 Jul 2010 14:00:32 -0400
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
|
||||||
libxml-feed-perl, libmailtools-perl, perlmagick,
|
libxml-feed-perl, libmailtools-perl, perlmagick,
|
||||||
libfile-mimeinfo-perl, libcrypt-ssleay-perl,
|
libfile-mimeinfo-perl, libcrypt-ssleay-perl,
|
||||||
liblocale-gettext-perl (>= 1.05-1), libtext-typography-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,
|
libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
|
||||||
libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
|
libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
|
||||||
po4a (>= 0.35-1), gettext, libyaml-perl
|
po4a (>= 0.35-1), gettext, libyaml-perl
|
||||||
|
|
|
@ -22,4 +22,4 @@ Some example graphs:
|
||||||
[[!graph src="a -- b -- c -- a;" prog="circo" type="graph"]]
|
[[!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.
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
This plugin adds full text search to ikiwiki, using the
|
This plugin adds full text search to ikiwiki, using the
|
||||||
[xapian](http://xapian.org/) engine, its
|
[xapian](http://xapian.org/) engine, its
|
||||||
[omega](http://xapian.org/docs/omega/overview.html) frontend, and the
|
[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.
|
perl modules.
|
||||||
|
|
||||||
The [[ikiwiki/searching]] page describes how to write search queries.
|
The [[ikiwiki/searching]] page describes how to write search queries.
|
||||||
|
|
|
@ -16,7 +16,7 @@ to use the plugin, you will need:
|
||||||
php can find it when `sparkline/Sparkline.php` is required.
|
php can find it when `sparkline/Sparkline.php` is required.
|
||||||
* The GD PHP module used by the Sparkline library.
|
* The GD PHP module used by the Sparkline library.
|
||||||
* A "php" program in the path, that can run standalone php programs.
|
* 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:
|
On a Debian system, this can be accomplished by installing these packages:
|
||||||
`libsparkline-php` `php5-gd` `php5-cli` `libdigest-sha1-perl`
|
`libsparkline-php` `php5-gd` `php5-cli` `libdigest-sha1-perl`
|
||||||
|
|
|
@ -31,7 +31,6 @@ Requires: perl(HTML::Scrubber)
|
||||||
Requires: perl(XML::Simple)
|
Requires: perl(XML::Simple)
|
||||||
Requires: perl(CGI::FormBuilder)
|
Requires: perl(CGI::FormBuilder)
|
||||||
Requires: perl(CGI::Session)
|
Requires: perl(CGI::Session)
|
||||||
Requires: perl(Digest::SHA1)
|
|
||||||
|
|
||||||
Requires: python-docutils
|
Requires: python-docutils
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue