head	1.10;
access;
symbols
	pkgsrc-2013Q2:1.10.0.8
	pkgsrc-2013Q2-base:1.10
	pkgsrc-2012Q4:1.10.0.6
	pkgsrc-2012Q4-base:1.10
	pkgsrc-2011Q4:1.10.0.4
	pkgsrc-2011Q4-base:1.10
	pkgsrc-2011Q2:1.10.0.2
	pkgsrc-2011Q2-base:1.10
	pkgsrc-2009Q4:1.8.0.2
	pkgsrc-2009Q4-base:1.8
	pkgsrc-2008Q4:1.2.0.2
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.1.0.2
	pkgsrc-2008Q3-base:1.1;
locks; strict;
comment	@# @;


1.10
date	2011.03.29.12.51.10;	author schmonz;	state dead;
branches;
next	1.9;

1.9
date	2011.03.23.22.25.06;	author schmonz;	state Exp;
branches;
next	1.8;

1.8
date	2009.12.22.23.23.27;	author schmonz;	state dead;
branches;
next	1.7;

1.7
date	2009.12.02.21.38.43;	author schmonz;	state Exp;
branches;
next	1.6;

1.6
date	2009.08.30.23.30.08;	author schmonz;	state dead;
branches;
next	1.5;

1.5
date	2009.08.12.21.14.35;	author schmonz;	state Exp;
branches;
next	1.4;

1.4
date	2009.07.24.05.09.02;	author schmonz;	state dead;
branches;
next	1.3;

1.3
date	2009.07.09.22.15.09;	author schmonz;	state Exp;
branches;
next	1.2;

1.2
date	2008.10.06.15.34.01;	author schmonz;	state dead;
branches;
next	1.1;

1.1
date	2008.09.22.15.09.05;	author schmonz;	state Exp;
branches;
next	;


desc
@@


1.10
log
@Update to 3.20110328. From the changelog:

* Yaml formatted setup files are now produced by default.
  (Perl formatted setup files can still be used.)
* Add timezone setting in setup file. This alows time zone to be configured
  via the web.
* comment: Better fix to avoid showing comments of subpages, while
  not breaking manual inlining of comments.
* meta: Security fix; don't allow alternative stylesheets to be added
  on pages where the htmlscrubber is enabled.

(Updating this leaf package during the freeze for the security and
bug fixes.)
@
text
@$NetBSD: patch-ac,v 1.9 2011/03/23 22:25:06 schmonz Exp $

--- IkiWiki/Plugin/aggregate.pm.orig	2011-03-21 18:44:36.000000000 +0000
+++ IkiWiki/Plugin/aggregate.pm
@@@@ -70,8 +70,8 @@@@ sub checkconfig () {
 	if (! defined $config{aggregateinternal}) {
 		$config{aggregateinternal}=1;
 	}
-	if (! defined $config{cookies}) {
-		$config{cookies}={ file => "$ENV{HOME}/.ikiwiki/cookies" };
+	if (! defined $config{cookiejar}) {
+		$config{cookiejar}={ file => "$ENV{HOME}/.ikiwiki/cookies" };
 	}
 
 	# This is done here rather than in a refresh hook because it
@


1.9
log
@Update to 3.20110321. From the changelog:

* comment: Don't show comments of subpages on parent pages.
  (Fixes bug introduced in version 3.20100505.)
* darcs: Fix multiple issues preventing rcs_diff from working.
* aggregate: Read cookies from ~/.ikiwiki/cookies by default.
  Also, the cookiejar configuration setting can be used by
  other plugins to provide a custom `cookie_jar` object for LWP::UserAgent.
  (Thanks, schmonz)
* Avoid escaping / characters in filenames when building the cgiurl,
  as this confuses eg, cvsweb.
@
text
@d1 1
a1 1
$NetBSD$
@


1.8
log
@Update to 3.20091218. From the changelog:

* Add complete Spanish basewiki translation done by Fernando Gonzalez de
    Requena.
* Improve javascript onload handling.
* monotone: Deal with format change in version 0.45.
    (Thanks, Richard Levitte)
* cvs: Add missing bit to Automator.
* attachment: Fix reversion in attachment sorting by age.
* Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and
    goto.

Updating this leaf during the freeze for the bugfixes.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.7 2009/12/02 21:38:43 schmonz Exp $
d3 13
a15 12
--- IkiWiki/Setup/Automator.pm.orig	2009-12-01 16:07:46.000000000 -0500
+++ IkiWiki/Setup/Automator.pm
@@@@ -66,6 +66,9 @@@@ sub import (@@) {
 		elsif ($config{rcs} eq 'darcs') {
 			$config{darcs_wrapper}=$config{repository}."/_darcs/ikiwiki-wrapper";
 		}
+		elsif ($config{rcs} eq 'cvs') {
+			$config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
+		}
 		elsif ($config{rcs} eq 'bzr') {
 			# TODO
 		}
@


1.7
log
@Update to 3.20091202. From the changelog:

* meta: Generate meta description tags even when the html scrubber is enabled.
* meta: Allow use of DESCRIPTION in templates to get at the meta
  description value. (Thanks, NicolasLimare)
* inline: Use caching of inlined pages to speed up builds of inlines
  that include feeds. Speedup of about 25% for small inlines; could
  be much larger for inlines of many, or complex pages.
* Added (incomplete) Turkish po file. Closes: #556744 Thanks, Recai Oktas
* date: New plugin that allows inserting date directives that expand
  to pretty-printed dates, using the same formatting as used for page
  modification date display, etc.
* htmllink: Allow a title attribute to be specified.
* calendar: Add title attributes for all links in the calendars.
* calendar: Fix month wraparound error that broke in December.

pkgsrc changes:

* In the automated setup, recognize CVS as a VCS (found by agc@@).
* In MESSAGE, link to <URL:http://ikiwiki.info/setup/> (ditto).
@
text
@d1 1
a1 1
$NetBSD$
@


1.6
log
@Update to 3.1415926. From the changelog:

 * [ Joey Hess ]
   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
     the old version, but continue. Closes: #541205
   * inline: Avoid use of my $_ as it fails with older perls.
     Closes: #541215
   * Add discussionpage configuration setting.
   * Several optimisations, including speedups to orphans and brokenlinks
     calculation.
   * meta, img: Fix bugs in dependency code. (smcv)
   * Allow building ikiwiki on systems w/o po4a --
     building of the translated underlays will be skipped in this case.
   * Add basic styling of po plugin's languages list.
   * inline: Display an error if feedpages is specified and fails to match
     due to a problem such as created_before being told to check against
     a page that does not exist.
   * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective
     pages from the basewiki.
   * Updated French program translation from Philippe Batailler.
     Closes: #542036
   * po: Fixed to run rcs_add ralative to srcdir.
   * Italian program translation from Luca Bruno.
   * Fix example blog's tags/life to not have a broken PageSpec.
     Closes: #543510
   * Optimize the dependencies list. This also fixes a bug
     that could cause repeated refreshes of the wiki to grow
     increasingly larger dependency lists, and get increasingly
     slower. (smcv)
   * Rebuild wikis on upgrade to this version to fix bloat caused
     by the dependency bug.
   * Further optimisation of dependency handling by adding a special
     case for simple page dependencies. (smcv)
   * htmltidy: Return an error message if tidy fails. Closes: #543722
   * po: Fix name of translated toplevel index page. (intrigeri)
   * po: Fix display of links from a translated page to itself (ntrigeri)
   * Add Czech basewiki translation from Miroslav Kure.
   * po: fix interdiction to create pages of type po (intrigeri)
   * po: po: favor the type of linking page's masterpage on page creation
     (intrigeri)
   * img: Don't generate new verison of image if it is scaled to be
     larger in either dimension.
 * [ Josh Triplett ]
   * teximg: Replace the insufficient blacklist with the built-in security
     mechanisms of TeX. (CVE-2009-2944)

In order to fix a performance bug, all wikis need to be rebuilt on
upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist,
use ikiwiki-mass-rebuild to force a rebuild.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.5 2009/08/12 21:14:35 schmonz Exp $
d3 12
a14 17
--- po/Makefile.orig	2009-07-21 10:58:12.000000000 -0400
+++ po/Makefile
@@@@ -63,12 +63,12 @@@@ underlays_copy_stamp:
 	# copy all the files we want to translate into a srcdir
 	for file in `cd ..; find underlays -follow -name \*.mdwn`; do \
 		install -d $$(dirname $$file); \
-		cp -aL ../$$file $$file 2>/dev/null || \
+		cp -pRL ../$$file $$file 2>/dev/null || \
 		install -m 644 ../$$file $$file; \
 	done
 	install -d underlays/directives/ikiwiki/directive
 	for file in `cd ..; find doc/ikiwiki/directive/ -maxdepth 1 -type f`; do \
-		cp -a ../$$file underlays/directives/ikiwiki/directive ||  \
+		cp -pR ../$$file underlays/directives/ikiwiki/directive ||  \
 		install -m 644 ../$$file underlays/directives/ikiwiki/directive; \
 	done
 	install -d underlays/empty
@


1.5
log
@Update to 3.141592. From the changelog:

* Add new hooks: canremove, canrename, rename. (intrigeri)
* rename: Refactor subpage rename handling code into rename hook.
    (intrigeri)
* po: New plugin, suporting translation of wiki pages using po
    files. (intrigeri)
* Add build machinery to build po files to translate the underlay wikis,
* Add further build machinery to generate translated underlays from
    the po file, for use by wikis whose primary language is not English.
* Add Danish basewiki translation by Jonas Smedegaard.
* img: Fix adding of dependency from page to the image.
* pagestats: add among parameter, which only counts links from
    specified pages (smcv)
* pagestats: when making a tag cloud, don't emit links where the
    tag is unused (smcv)
* map: Avoid emitting an unclosed ul element if the map is empty.
    (harishcm)
* inline: Add pagenames parameter that can be used to list a set
    of pages to inline, in a specific order, without using a PageSpec.
    (smcv)
* Add getsource plugin (Will, smcv)

Note that the new po plugin won't work until textproc/po4a is updated
to at least 0.34. Any takers?
@
text
@d1 1
a1 1
$NetBSD$
@


1.4
log
@Update to 3.14159. From the changelog:

* svn: Fix rcs_rename to properly scope call to dirname.
* img: Pass the align parameter through to the generated img tag.
* Move OpenID pretty-printing from openid plugin to core (smcv)

pkgsrc changes:

* Add PKG_SYSCONFDIR support.
* Parameterize pkgsrc-configured paths in Makefile.PL so the patch
    can go upstream.
* Retire legacy amazon_s3 option.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.3 2009/07/09 22:15:09 schmonz Exp $
d3 17
a19 15
--- IkiWiki/Plugin/svn.pm.orig	2009-05-27 16:32:36.000000000 -0400
+++ IkiWiki/Plugin/svn.pm
@@@@ -243,10 +243,10 @@@@ sub rcs_rename ($$) {
 	
 	if (-d "$config{srcdir}/.svn") {
 		# Add parent directory for $dest
-		my $parent=dirname($dest);
+		my $parent=IkiWiki::dirname($dest);
 		if (! -d "$config{srcdir}/$parent/.svn") {
 			while (! -d "$config{srcdir}/$parent/.svn") {
-				$parent=dirname($dest);
+				$parent=IkiWiki::dirname($dest);
 			}
 			if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
 				warn("svn add $parent failed\n");
@


1.3
log
@Update to 3.1415. From the changelog:

* img: Fix extra double quote with alt text. (smcv)
* Updated French debconf templates translation. Closes: #535103
* openid: Support Net::OpenID 2.x when pretty-printing openids. (smcv)
* highlight: Fix utf-8 encoding bug. Closes: #535028
* comment: Make comment directives no longer use the internal
    "\_comment" form, and document the comment directive syntax.
* Avoid relying on translators preserving the case when translating
    "discussion", which caused Discussion pages to get unwanted
    Discussion links.
* Tighten up matching of bare words inside directives; do not allow
    an unterminated triple string to be treated as a series of bare
    words. Fixes runaway regexp recursion/backtracking in strange
    situations.
* Setup automator: Check that each plugin added to the generated
    setup file can be loaded and that its config is ok. If a plugin
    fails for any reason, disable it in the generated file. Closes:
    #532001
* pagecount: Fix broken optimisation for * pagespec.
* goto: Support being passed a page title that is not a valid page
    name, to support several cases including mercurial's long user
    names on the RecentChanges page, and urls with spaces being
    handled by the 404 plugin.
* Optimise use of gettext, and avoid ugly warnings if Locale::gettext
    is not available. Closes: #532285
* meta: Add openid delegate parameter to allow delegating only
    openid or openid2.
* Disable the Preferences link if no plugin with an auth hook is enabled.
* Updated French translation. Closes: #532654
* aggregate: Fix storing of changed md5.
* aggregate: Avoid resetting ctime when an item md5 changes.
* highlight: New plugin supporting syntax highlighting of pretty
    much anything.
* debian/control: Add suggests for libhighlight-perl, although that
    package is not yet created by Debian's highlight source package.
    (See #529869)
* format: Provide a htmlizefallback hook that other plugins can use
    to handle formats that are not suitable for general-purpose
    htmlize hooks. Used by highlight.
* Fix test suite to not rely on an installed copy of ikiwiki after
    underlaydir change. Closes: #530502
* Danish translation update. Closes: #530877
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Update to 2.66. From the changelog:

   * recentchanges: Fix redirects to non-page files.
   * aggregate: Avoid uninitialized value warnings for pages with no recorded
     ctime.
   * attachment: Add admin() pagespec to test if the uploading user is a wiki
     admin.
   * git: Fix handling of utf-8 filenames in recentchanges.
   * tag: Make edit link for new tags ensure that the tags are created
     inside tagbase, when it's set.
   * template: Make edit link for new templates ensure the page is located
     under toplevel templates directory.
   * htmlscrubber: Add a config setting that can be used to disable the
     scrubber acting on a set of pages.
   * Expand usage message and add --help. Closes: #[500344]
   * Beautify urls used in various places. (smcv)
   * Export pagetitle, titlepage, linkpage.
   * htmltidy: Avoid returning undef if tidy fails. Also avoid returning the
     untidied content if tidy crashes. In either case, it seems best to tidy
     the content to nothing.
   * htmltidy: Avoid spewing tidy errors to stderr.
   * Reorganize index file, add a format version field. Upgrades to the new
     index format should be transparent.
   * Add %wikistate, which is like %pagestate except not specific to a given
     page, and is preserved across rebuilds.
   * editpage: Be more aggressive (and less buggy) about cleaning up
     temporary files rendered during page preview.
   * Add an indexpages option, which causes foo/index.mdwn to be the source
     for page foo when foo.mdwn doesn't exist. Also, when it's enabled,
     creating a new page will save it to foo/index.mdwn by default.
     Closes: #[474611]
     (Sponsored by The TOVA Company.)
   * httpauth: Document that ikiwiki.cgi has to be in a directory subject to
     authentication. Closes: #[500524]
   * inline: Fix handling of rootpage that doesn't exist.
   * attachment: Support adding attachments to pages even as they are being
     created.
   * remove, rename: Allow acting on attachments as a page is being created.
   * Updated French translation. Closes: #[500929]
   * progress: Display an error if the progress cannot be parsed, and allow
     the percent parameter to only optionally end with "%".
   * Fix reversion in use of ikiwiki -verbose -setup with a setup file that
     enables syslog. Setup output is once again output to stdout in this
     case.
   * edittemplate: Default new page file type to the same type as the template.
     (willu)
   * edittemplate: Add "silent" parameter. (Willu)
   * edittemplate: Link to template, to allow creating it. (Willu)
   * editpage: Add a missing check that the page name contains only legal
     characters, in addition to the existing check for pruned filenames.
   * Print a debug message if a page has multiple source files.
   * Add keepextension parameter to htmlize hook. (Willu)
   * rename, remove: Don't rely on a form parameter to tell whether the page
     should be treated as an attachment.
   * rename: Add support for moving SubPages of a page when renaming it.
     (Sponsored by The TOVA Company.)
   * rename: Hide type field from rename form when renaming attachments.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.1 2008/09/22 15:09:05 schmonz Exp $
d3 15
a17 49
--- 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 ($) { #{{{
@


1.1
log
@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.
@
text
@d1 1
a1 1
$NetBSD$
@