Add MESSAGE -- remind to update custom templates on upgrades

Upgrade to 2.44. Many changes. Here are a couple of them:

  * The security fix in the last release had buggy handling of data:image,
    now fixed. Closes: #465110 (CVE-2008-0808, CVE-2008-0809)
  * htmlscrubber security fix: Block javascript in uris.

Adds new tool: ikiwiki-transition

No longer installs rst and externaldemo plugins.

Add patch based on bugs I found -- both fixes are now upstream.

5 files changed, 51 insertions, 18 deletions

diff --git a/www/ikiwiki/MESSAGE b/www/ikiwiki/MESSAGE
new file mode 100644
index 00000000000..5c6e18e4650
--- /dev/null
+++ b/www/ikiwiki/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2008/04/29 00:05:41 reed Exp $
+
+If you use custom templates, make sure they are correct when upgrading
+ikiwiki.
+
+===========================================================================
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 7024be4f878..8cd9c92d532 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2008/04/12 22:43:13 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/29 00:05:41 reed Exp $
 #
 
-DISTNAME=	ikiwiki_2.15
-PKGREVISION=	1
+DISTNAME=	ikiwiki_2.44
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
@@ -66,14 +65,16 @@ USE_TOOLS=	gmake perl:run xgettext
 # TODO: check these
 REPLACE_PERL+=	IkiWiki.pm ikiwiki-w3m.cgi mdwn2man pm_filter
 REPLACE_PERL+=	ikiwiki.in ikiwiki-mass-rebuild ikiwiki-update-wikilist
+REPLACE_PERL+=	ikiwiki-transition
 REPLACE_PERL+=	t/*.t IkiWiki/*.pm IkiWiki/*/*.pm
 REPLACE_PERL+=	doc/ikiwiki.setup doc/w3mmode/ikiwiki.setup
-REPLACE_PERL+=	plugins/externaldemo
+#REPLACE_PERL+=	plugins/externaldemo	# not installed anymore
 
-REPLACE_PYTHON+=	plugins/rst
+# not installed anymore
+#REPLACE_PYTHON+=	plugins/rst
 # TODO: add an rst option
 # rst plugin (reStructuredText) needs the python-docutils module
-CHECK_INTERPRETER_SKIP+=	lib/ikiwiki/plugins/rst
+#CHECK_INTERPRETER_SKIP+=	lib/ikiwiki/plugins/rst
 
 SUBST_CLASSES+=	makefile
 SUBST_STAGE.makefile=	post-patch
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index 465495a2bc9..ddad5771dfe 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/29 00:05:41 reed Exp $
 bin/ikiwiki
 bin/ikiwiki-makerepo
+bin/ikiwiki-transition
 bin/ikiwiki-update-wikilist
-lib/ikiwiki/plugins/externaldemo
-lib/ikiwiki/plugins/rst
 ${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
 man/man1/ikiwiki-makerepo.1
+man/man1/ikiwiki-transition.1
 man/man1/ikiwiki-update-wikilist.1
 man/man1/ikiwiki.1
 man/man8/ikiwiki-mass-rebuild.8
@@ -16,17 +16,27 @@ ${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup
 share/ikiwiki/basewiki/blog.mdwn
 share/ikiwiki/basewiki/favicon.ico
 share/ikiwiki/basewiki/helponformatting.mdwn
+share/ikiwiki/basewiki/ikiwiki.mdwn
+share/ikiwiki/basewiki/ikiwiki/blog.mdwn
+share/ikiwiki/basewiki/ikiwiki/formatting.mdwn
+share/ikiwiki/basewiki/ikiwiki/markdown.mdwn
+share/ikiwiki/basewiki/ikiwiki/openid.mdwn
+share/ikiwiki/basewiki/ikiwiki/pagespec.mdwn
+share/ikiwiki/basewiki/ikiwiki/preprocessordirective.mdwn
+share/ikiwiki/basewiki/ikiwiki/subpage.mdwn
+share/ikiwiki/basewiki/ikiwiki/subpage/linkingrules.mdwn
+share/ikiwiki/basewiki/ikiwiki/wikilink.mdwn
 share/ikiwiki/basewiki/index.mdwn
 share/ikiwiki/basewiki/local.css
 share/ikiwiki/basewiki/markdown.mdwn
 share/ikiwiki/basewiki/openid.mdwn
 share/ikiwiki/basewiki/pagespec.mdwn
 share/ikiwiki/basewiki/preprocessordirective.mdwn
+share/ikiwiki/basewiki/recentchanges.mdwn
 share/ikiwiki/basewiki/sandbox.mdwn
 share/ikiwiki/basewiki/shortcuts.mdwn
 share/ikiwiki/basewiki/style.css
 share/ikiwiki/basewiki/subpage.mdwn
-share/ikiwiki/basewiki/subpage/linkingrules.mdwn
 share/ikiwiki/basewiki/templates.mdwn
 share/ikiwiki/basewiki/templates/note.mdwn
 share/ikiwiki/basewiki/templates/popup.mdwn
@@ -66,12 +76,12 @@ share/ikiwiki/templates/archivepage.tmpl
 share/ikiwiki/templates/atomitem.tmpl
 share/ikiwiki/templates/atompage.tmpl
 share/ikiwiki/templates/blogpost.tmpl
+share/ikiwiki/templates/change.tmpl
 share/ikiwiki/templates/editpage.tmpl
 share/ikiwiki/templates/estseek.conf
 share/ikiwiki/templates/feedlink.tmpl
 share/ikiwiki/templates/inlinepage.tmpl
 share/ikiwiki/templates/misc.tmpl
-share/ikiwiki/templates/notifymail.tmpl
 share/ikiwiki/templates/page.tmpl
 share/ikiwiki/templates/passwordmail.tmpl
 share/ikiwiki/templates/recentchanges.tmpl
@@ -93,11 +103,10 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo
 @dirrm share/ikiwiki/smiley
 @dirrm share/ikiwiki/basewiki/wikiicons
 @dirrm share/ikiwiki/basewiki/templates
-@dirrm share/ikiwiki/basewiki/subpage
+@dirrm share/ikiwiki/basewiki/ikiwiki/subpage
+@dirrm share/ikiwiki/basewiki/ikiwiki
 @dirrm share/ikiwiki/basewiki
 @dirrm share/ikiwiki
 ${PLIST.w3m}@dirrm share/doc/ikiwiki/w3mmode
 @dirrm share/doc/ikiwiki
 ${PLIST.w3m}@dirrm libexec/w3m/cgi-bin
-@dirrm lib/ikiwiki/plugins
-@dirrm lib/ikiwiki
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 4a5780acc32..af3cdfd0c3e 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/12/05 04:09:53 reed Exp $
+$NetBSD: distinfo,v 1.4 2008/04/29 00:05:41 reed Exp $
 
-SHA1 (ikiwiki_2.15.tar.gz) = adc8c69ab3390a0131a96f5eafe20a9c2ce5997d
-RMD160 (ikiwiki_2.15.tar.gz) = 7a2f1604bbadc08c421eed3393aeaaece6f8ef0d
-Size (ikiwiki_2.15.tar.gz) = 592461 bytes
+SHA1 (ikiwiki_2.44.tar.gz) = ec296188c771035a94a36059e7ff51854890ffde
+RMD160 (ikiwiki_2.44.tar.gz) = 6976a8e822ec7c5f9656cd42819c87262a81e568
+Size (ikiwiki_2.44.tar.gz) = 701112 bytes
+SHA1 (patch-aa) = 768a6f23bfb3a5c5450d2fbe1c970ec0f2195a75
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
new file mode 100644
index 00000000000..5663e71b0f4
--- /dev/null
+++ b/www/ikiwiki/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.4 2008/04/29 00:05:41 reed Exp $
+
+--- pm_filter.orig	2008-04-18 11:27:18 -0700
++++ pm_filter	2008-04-28 14:51:50 -0700
+@@ -20,6 +20,9 @@
+ 		$_="use lib '$libdir';\n";
+ 	}
+ }
+-elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!/usr/bin/perl) -T$}) {
++elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!.*perl.*?) -T$}) {
+ 	$_=qq{$1\n};
+ }
++if (/^\$ENV{PATH}="(.*)";/) {
++	$_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";
++}