diff options
author | schmonz <schmonz> | 2008-09-22 15:09:05 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2008-09-22 15:09:05 +0000 |
commit | 478d337f928b9ecaea844362ce1e280d79fafe8b (patch) | |
tree | dabff6fc883a1999f5b95b47c4499b8b6646a769 /www/ikiwiki/patches | |
parent | 9584c8ada0d3fbc1d2c06961f8a09505fde10275 (diff) | |
download | pkgsrc-478d337f928b9ecaea844362ce1e280d79fafe8b.tar.gz |
Update to 2.64, plus a few bugfixes that'll be in 2.65. From the changelog:
* aggregate: Expire excess or old items on the same pass that adds them,
not only on subsequent passes.
* editdiff: Broken since 2.62 due to wrong syntax, now fixed.
* aggregate: Support atom feeds with only a summary element, and no content
elements.
* Avoid uninitialised value when --dumpsetup is used and no
srcdir/destdir specified.
* ddate: Stop clobbering timeformat when not enabled.
* progress: New plugin to generate progress bars (willu)
* Add allow\_symlinks\_before\_srcdir to config so websetup doesn't eat it.
* img: Support sizes like 200x. Closes: #[475149](http://bugs.debian.org/475149)
* goodstuff: Remove otl plugin from the bundle since it needs a
significant external dependency and is not commonly used. If
you use otl, make sure you explicitly enable it now.
* goodstuff: Add more, progress, and table plugins to the bundle.
* Improve error message if external plugin fails to load. Closes:
#[498458](http://bugs.debian.org/498458)
* Directive documentation broken out of the plugin documentation
and into pages suitable to be used as an underlay. Thanks to
Willu for doing most of the tedious work.
* Move the directive documentation into its own underlay, separate
from basewiki, since it's sorta large compared to the rest of
basewiki.
* listdirectives: Enable use of the directives underlay.
* Removed the obsolete blog page from the basewiki. ikiwiki/blog
still remains, but is now deprecated too.
* Removed old redirecton pages from basewiki (helponformatting,
markdown, openid, pagespec, preprocessordirective, subpage,
wikilink).
* inline: Treat rootpage as a link, so that it can refer to a subpage
without hardcoding the path.
Diffstat (limited to 'www/ikiwiki/patches')
-rw-r--r-- | www/ikiwiki/patches/patch-ab | 13 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-ac | 51 |
2 files changed, 64 insertions, 0 deletions
diff --git a/www/ikiwiki/patches/patch-ab b/www/ikiwiki/patches/patch-ab new file mode 100644 index 00000000000..b4695bd8016 --- /dev/null +++ b/www/ikiwiki/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2008/09/22 15:09:05 schmonz Exp $ + +--- IkiWiki/Plugin/editdiff.pm.orig 2008-09-08 12:30:11.000000000 -0400 ++++ IkiWiki/Plugin/editdiff.pm +@@ -56,7 +56,7 @@ sub formbuilder_setup { #{{{ + my %params=@_; + my $form=$params{form}; + +- return if defined ! $form->field("do") || $form->field("do") ne "edit"; ++ return if ! defined $form->field("do") || $form->field("do") ne "edit"; + + my $page=$form->field("page"); + $page = IkiWiki::possibly_foolish_untaint($page); diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac new file mode 100644 index 00000000000..094736495d8 --- /dev/null +++ b/www/ikiwiki/patches/patch-ac @@ -0,0 +1,51 @@ +$NetBSD: patch-ac,v 1.1 2008/09/22 15:09:05 schmonz Exp $ + +--- IkiWiki/Plugin/aggregate.pm.orig 2008-09-08 12:30:11.000000000 -0400 ++++ IkiWiki/Plugin/aggregate.pm +@@ -421,7 +421,7 @@ sub expire () { #{{{ + my $count=0; + my %seen; + foreach my $item (sort { $IkiWiki::pagectime{$b->{page}} <=> $IkiWiki::pagectime{$a->{page}} } +- grep { exists $_->{page} && $_->{feed} eq $feed->{name} && $IkiWiki::pagectime{$_->{page}} } ++ grep { exists $_->{page} && $_->{feed} eq $feed->{name} } + values %guids) { + if ($feed->{expireage}) { + my $days_old = (time - $IkiWiki::pagectime{$item->{page}}) / 60 / 60 / 24; +@@ -520,12 +520,18 @@ sub aggregate (@) { #{{{ + } + + foreach my $entry ($f->entries) { ++ my $content=$content=$entry->content->body; ++ # atom feeds may have no content, only a summary ++ if (! defined $content && ref $entry->summary) { ++ $content=$entry->summary->body; ++ } ++ + add_page( + feed => $feed, + copyright => $f->copyright, + title => defined $entry->title ? decode_entities($entry->title) : "untitled", + link => $entry->link, +- content => defined $entry->content->body ? $entry->content->body : "", ++ content => defined $content ? $content : "", + guid => defined $entry->id ? $entry->id : time."_".$feed->{name}, + ctime => $entry->issued ? ($entry->issued->epoch || time) : time, + ); +@@ -612,10 +618,13 @@ sub add_page (@) { #{{{ + writefile(htmlfn($guid->{page}), $config{srcdir}, + $template->output); + +- # Set the mtime, this lets the build process get the right creation +- # time on record for the new page. +- utime $mtime, $mtime, pagefile($guid->{page}) +- if defined $mtime && $mtime <= time; ++ if (defined $mtime && $mtime <= time) { ++ # Set the mtime, this lets the build process get the right ++ # creation time on record for the new page. ++ utime $mtime, $mtime, pagefile($guid->{page}); ++ # Store it in pagectime for expiry code to use also. ++ $IkiWiki::pagectime{$guid->{page}}=$mtime; ++ } + } #}}} + + sub htmlescape ($) { #{{{ |