Tue Apr 29 00:05:41 2008 UTC ()
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.


(reed)
diff -r0 -r1.1 pkgsrc/www/ikiwiki/MESSAGE
diff -r1.11 -r1.12 pkgsrc/www/ikiwiki/Makefile
diff -r1.4 -r1.5 pkgsrc/www/ikiwiki/PLIST
diff -r1.3 -r1.4 pkgsrc/www/ikiwiki/distinfo
diff -r0 -r1.4 pkgsrc/www/ikiwiki/patches/patch-aa
File Added: pkgsrc/www/ikiwiki/MESSAGE
===========================================================================
$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.

===========================================================================
cvs diff -r1.11 -r1.12 pkgsrc/www/ikiwiki/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/Makefile 2008/04/12 22:43:13 1.11
+++ pkgsrc/www/ikiwiki/Makefile 2008/04/29 00:05:41 1.12
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.11 2008/04/12 22:43:13 jlam Exp $ 1# $NetBSD: Makefile,v 1.12 2008/04/29 00:05:41 reed Exp $
2# 2#
3 3
4DISTNAME= ikiwiki_2.15 4DISTNAME= ikiwiki_2.44
5PKGREVISION= 1 
6PKGNAME= ${DISTNAME:S/_/-/} 5PKGNAME= ${DISTNAME:S/_/-/}
7CATEGORIES= www textproc 6CATEGORIES= www textproc
8MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} 7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
9 8
10MAINTAINER= reed@NetBSD.org 9MAINTAINER= reed@NetBSD.org
11HOMEPAGE= http://ikiwiki.info/ 10HOMEPAGE= http://ikiwiki.info/
12COMMENT= Wiki compiler 11COMMENT= Wiki compiler
13 12
14PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki 13PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki
15PKG_SUPPORTED_OPTIONS= imagemagick svn w3m 14PKG_SUPPORTED_OPTIONS= imagemagick svn w3m
16PKG_SUGGESTED_OPTIONS= # none on by default 15PKG_SUGGESTED_OPTIONS= # none on by default
17 16
18.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
@@ -56,34 +55,36 @@ INSTALLATION_DIRS+= share/doc/ikiwiki/w3 @@ -56,34 +55,36 @@ INSTALLATION_DIRS+= share/doc/ikiwiki/w3
56.else 55.else
57SUBST_SED.makefile+= -e 's,^\(.*install .*/lib/w3m/cgi-bin\),\#\1,' 56SUBST_SED.makefile+= -e 's,^\(.*install .*/lib/w3m/cgi-bin\),\#\1,'
58.endif 57.endif
59 58
60INSTALLATION_DIRS+= share/doc/ikiwiki 59INSTALLATION_DIRS+= share/doc/ikiwiki
61WRKSRC= ${WRKDIR}/ikiwiki 60WRKSRC= ${WRKDIR}/ikiwiki
62PERL5_PACKLIST= auto/IkiWiki/.packlist 61PERL5_PACKLIST= auto/IkiWiki/.packlist
63USE_LANGUAGES= # none 62USE_LANGUAGES= # none
64USE_TOOLS= gmake perl:run xgettext 63USE_TOOLS= gmake perl:run xgettext
65 64
66# TODO: check these 65# TODO: check these
67REPLACE_PERL+= IkiWiki.pm ikiwiki-w3m.cgi mdwn2man pm_filter 66REPLACE_PERL+= IkiWiki.pm ikiwiki-w3m.cgi mdwn2man pm_filter
68REPLACE_PERL+= ikiwiki.in ikiwiki-mass-rebuild ikiwiki-update-wikilist 67REPLACE_PERL+= ikiwiki.in ikiwiki-mass-rebuild ikiwiki-update-wikilist
 68REPLACE_PERL+= ikiwiki-transition
69REPLACE_PERL+= t/*.t IkiWiki/*.pm IkiWiki/*/*.pm 69REPLACE_PERL+= t/*.t IkiWiki/*.pm IkiWiki/*/*.pm
70REPLACE_PERL+= doc/ikiwiki.setup doc/w3mmode/ikiwiki.setup 70REPLACE_PERL+= doc/ikiwiki.setup doc/w3mmode/ikiwiki.setup
71REPLACE_PERL+= plugins/externaldemo 71#REPLACE_PERL+= plugins/externaldemo # not installed anymore
72 72
73REPLACE_PYTHON+= plugins/rst 73# not installed anymore
 74#REPLACE_PYTHON+= plugins/rst
74# TODO: add an rst option 75# TODO: add an rst option
75# rst plugin (reStructuredText) needs the python-docutils module 76# rst plugin (reStructuredText) needs the python-docutils module
76CHECK_INTERPRETER_SKIP+= lib/ikiwiki/plugins/rst 77#CHECK_INTERPRETER_SKIP+= lib/ikiwiki/plugins/rst
77 78
78SUBST_CLASSES+= makefile 79SUBST_CLASSES+= makefile
79SUBST_STAGE.makefile= post-patch 80SUBST_STAGE.makefile= post-patch
80SUBST_FILES.makefile= Makefile.PL 81SUBST_FILES.makefile= Makefile.PL
81SUBST_SED.makefile+= -e 's,share/man/man,${PKGMANDIR}/man,g' 82SUBST_SED.makefile+= -e 's,share/man/man,${PKGMANDIR}/man,g'
82 83
83post-install: 84post-install:
84 ${INSTALL_DATA} ${WRKSRC}/html/ikiwiki.setup \ 85 ${INSTALL_DATA} ${WRKSRC}/html/ikiwiki.setup \
85 ${PREFIX}/share/doc/ikiwiki/ 86 ${PREFIX}/share/doc/ikiwiki/
86.if !empty(PKG_OPTIONS:Mw3m) 87.if !empty(PKG_OPTIONS:Mw3m)
87 ${INSTALL_DATA} ${WRKSRC}/html/w3mmode.html \ 88 ${INSTALL_DATA} ${WRKSRC}/html/w3mmode.html \
88 ${PREFIX}/share/doc/ikiwiki/ 89 ${PREFIX}/share/doc/ikiwiki/
89 ${INSTALL_DATA} ${WRKSRC}/doc/w3mmode/ikiwiki.setup \ 90 ${INSTALL_DATA} ${WRKSRC}/doc/w3mmode/ikiwiki.setup \
cvs diff -r1.4 -r1.5 pkgsrc/www/ikiwiki/PLIST (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/PLIST 2008/04/12 22:43:13 1.4
+++ pkgsrc/www/ikiwiki/PLIST 2008/04/29 00:05:41 1.5
@@ -1,42 +1,52 @@ @@ -1,42 +1,52 @@
1@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:13 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.5 2008/04/29 00:05:41 reed Exp $
2bin/ikiwiki 2bin/ikiwiki
3bin/ikiwiki-makerepo 3bin/ikiwiki-makerepo
 4bin/ikiwiki-transition
4bin/ikiwiki-update-wikilist 5bin/ikiwiki-update-wikilist
5lib/ikiwiki/plugins/externaldemo 
6lib/ikiwiki/plugins/rst 
7${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi 6${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
8man/man1/ikiwiki-makerepo.1 7man/man1/ikiwiki-makerepo.1
 8man/man1/ikiwiki-transition.1
9man/man1/ikiwiki-update-wikilist.1 9man/man1/ikiwiki-update-wikilist.1
10man/man1/ikiwiki.1 10man/man1/ikiwiki.1
11man/man8/ikiwiki-mass-rebuild.8 11man/man8/ikiwiki-mass-rebuild.8
12sbin/ikiwiki-mass-rebuild 12sbin/ikiwiki-mass-rebuild
13share/doc/ikiwiki/ikiwiki.setup 13share/doc/ikiwiki/ikiwiki.setup
14${PLIST.w3m}share/doc/ikiwiki/w3mmode.html 14${PLIST.w3m}share/doc/ikiwiki/w3mmode.html
15${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup 15${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup
16share/ikiwiki/basewiki/blog.mdwn 16share/ikiwiki/basewiki/blog.mdwn
17share/ikiwiki/basewiki/favicon.ico 17share/ikiwiki/basewiki/favicon.ico
18share/ikiwiki/basewiki/helponformatting.mdwn 18share/ikiwiki/basewiki/helponformatting.mdwn
 19share/ikiwiki/basewiki/ikiwiki.mdwn
 20share/ikiwiki/basewiki/ikiwiki/blog.mdwn
 21share/ikiwiki/basewiki/ikiwiki/formatting.mdwn
 22share/ikiwiki/basewiki/ikiwiki/markdown.mdwn
 23share/ikiwiki/basewiki/ikiwiki/openid.mdwn
 24share/ikiwiki/basewiki/ikiwiki/pagespec.mdwn
 25share/ikiwiki/basewiki/ikiwiki/preprocessordirective.mdwn
 26share/ikiwiki/basewiki/ikiwiki/subpage.mdwn
 27share/ikiwiki/basewiki/ikiwiki/subpage/linkingrules.mdwn
 28share/ikiwiki/basewiki/ikiwiki/wikilink.mdwn
19share/ikiwiki/basewiki/index.mdwn 29share/ikiwiki/basewiki/index.mdwn
20share/ikiwiki/basewiki/local.css 30share/ikiwiki/basewiki/local.css
21share/ikiwiki/basewiki/markdown.mdwn 31share/ikiwiki/basewiki/markdown.mdwn
22share/ikiwiki/basewiki/openid.mdwn 32share/ikiwiki/basewiki/openid.mdwn
23share/ikiwiki/basewiki/pagespec.mdwn 33share/ikiwiki/basewiki/pagespec.mdwn
24share/ikiwiki/basewiki/preprocessordirective.mdwn 34share/ikiwiki/basewiki/preprocessordirective.mdwn
 35share/ikiwiki/basewiki/recentchanges.mdwn
25share/ikiwiki/basewiki/sandbox.mdwn 36share/ikiwiki/basewiki/sandbox.mdwn
26share/ikiwiki/basewiki/shortcuts.mdwn 37share/ikiwiki/basewiki/shortcuts.mdwn
27share/ikiwiki/basewiki/style.css 38share/ikiwiki/basewiki/style.css
28share/ikiwiki/basewiki/subpage.mdwn 39share/ikiwiki/basewiki/subpage.mdwn
29share/ikiwiki/basewiki/subpage/linkingrules.mdwn 
30share/ikiwiki/basewiki/templates.mdwn 40share/ikiwiki/basewiki/templates.mdwn
31share/ikiwiki/basewiki/templates/note.mdwn 41share/ikiwiki/basewiki/templates/note.mdwn
32share/ikiwiki/basewiki/templates/popup.mdwn 42share/ikiwiki/basewiki/templates/popup.mdwn
33share/ikiwiki/basewiki/wikiicons/diff.png 43share/ikiwiki/basewiki/wikiicons/diff.png
34share/ikiwiki/basewiki/wikiicons/openidlogin-bg.gif 44share/ikiwiki/basewiki/wikiicons/openidlogin-bg.gif
35share/ikiwiki/basewiki/wikilink.mdwn 45share/ikiwiki/basewiki/wikilink.mdwn
36share/ikiwiki/smiley/smileys.mdwn 46share/ikiwiki/smiley/smileys.mdwn
37share/ikiwiki/smiley/smileys/alert.png 47share/ikiwiki/smiley/smileys/alert.png
38share/ikiwiki/smiley/smileys/angry.png 48share/ikiwiki/smiley/smileys/angry.png
39share/ikiwiki/smiley/smileys/attention.png 49share/ikiwiki/smiley/smileys/attention.png
40share/ikiwiki/smiley/smileys/biggrin.png 50share/ikiwiki/smiley/smileys/biggrin.png
41share/ikiwiki/smiley/smileys/checkmark.png 51share/ikiwiki/smiley/smileys/checkmark.png
42share/ikiwiki/smiley/smileys/devil.png 52share/ikiwiki/smiley/smileys/devil.png
@@ -56,48 +66,47 @@ share/ikiwiki/smiley/smileys/smile.png @@ -56,48 +66,47 @@ share/ikiwiki/smiley/smileys/smile.png
56share/ikiwiki/smiley/smileys/smile2.png 66share/ikiwiki/smiley/smileys/smile2.png
57share/ikiwiki/smiley/smileys/smile3.png 67share/ikiwiki/smiley/smileys/smile3.png
58share/ikiwiki/smiley/smileys/smile4.png 68share/ikiwiki/smiley/smileys/smile4.png
59share/ikiwiki/smiley/smileys/star_off.png 69share/ikiwiki/smiley/smileys/star_off.png
60share/ikiwiki/smiley/smileys/star_on.png 70share/ikiwiki/smiley/smileys/star_on.png
61share/ikiwiki/smiley/smileys/thumbs-up.png 71share/ikiwiki/smiley/smileys/thumbs-up.png
62share/ikiwiki/smiley/smileys/tired.png 72share/ikiwiki/smiley/smileys/tired.png
63share/ikiwiki/smiley/smileys/tongue.png 73share/ikiwiki/smiley/smileys/tongue.png
64share/ikiwiki/templates/aggregatepost.tmpl 74share/ikiwiki/templates/aggregatepost.tmpl
65share/ikiwiki/templates/archivepage.tmpl 75share/ikiwiki/templates/archivepage.tmpl
66share/ikiwiki/templates/atomitem.tmpl 76share/ikiwiki/templates/atomitem.tmpl
67share/ikiwiki/templates/atompage.tmpl 77share/ikiwiki/templates/atompage.tmpl
68share/ikiwiki/templates/blogpost.tmpl 78share/ikiwiki/templates/blogpost.tmpl
 79share/ikiwiki/templates/change.tmpl
69share/ikiwiki/templates/editpage.tmpl 80share/ikiwiki/templates/editpage.tmpl
70share/ikiwiki/templates/estseek.conf 81share/ikiwiki/templates/estseek.conf
71share/ikiwiki/templates/feedlink.tmpl 82share/ikiwiki/templates/feedlink.tmpl
72share/ikiwiki/templates/inlinepage.tmpl 83share/ikiwiki/templates/inlinepage.tmpl
73share/ikiwiki/templates/misc.tmpl 84share/ikiwiki/templates/misc.tmpl
74share/ikiwiki/templates/notifymail.tmpl 
75share/ikiwiki/templates/page.tmpl 85share/ikiwiki/templates/page.tmpl
76share/ikiwiki/templates/passwordmail.tmpl 86share/ikiwiki/templates/passwordmail.tmpl
77share/ikiwiki/templates/recentchanges.tmpl 87share/ikiwiki/templates/recentchanges.tmpl
78share/ikiwiki/templates/rssitem.tmpl 88share/ikiwiki/templates/rssitem.tmpl
79share/ikiwiki/templates/rsspage.tmpl 89share/ikiwiki/templates/rsspage.tmpl
80share/ikiwiki/templates/searchform.tmpl 90share/ikiwiki/templates/searchform.tmpl
81share/ikiwiki/templates/titlepage.tmpl 91share/ikiwiki/templates/titlepage.tmpl
82share/locale/bg/LC_MESSAGES/ikiwiki.mo 92share/locale/bg/LC_MESSAGES/ikiwiki.mo
83share/locale/cs/LC_MESSAGES/ikiwiki.mo 93share/locale/cs/LC_MESSAGES/ikiwiki.mo
84share/locale/da/LC_MESSAGES/ikiwiki.mo 94share/locale/da/LC_MESSAGES/ikiwiki.mo
85share/locale/es/LC_MESSAGES/ikiwiki.mo 95share/locale/es/LC_MESSAGES/ikiwiki.mo
86share/locale/fr/LC_MESSAGES/ikiwiki.mo 96share/locale/fr/LC_MESSAGES/ikiwiki.mo
87share/locale/gu/LC_MESSAGES/ikiwiki.mo 97share/locale/gu/LC_MESSAGES/ikiwiki.mo
88share/locale/pl/LC_MESSAGES/ikiwiki.mo 98share/locale/pl/LC_MESSAGES/ikiwiki.mo
89share/locale/sv/LC_MESSAGES/ikiwiki.mo 99share/locale/sv/LC_MESSAGES/ikiwiki.mo
90share/locale/vi/LC_MESSAGES/ikiwiki.mo 100share/locale/vi/LC_MESSAGES/ikiwiki.mo
91@dirrm share/ikiwiki/templates 101@dirrm share/ikiwiki/templates
92@dirrm share/ikiwiki/smiley/smileys 102@dirrm share/ikiwiki/smiley/smileys
93@dirrm share/ikiwiki/smiley 103@dirrm share/ikiwiki/smiley
94@dirrm share/ikiwiki/basewiki/wikiicons 104@dirrm share/ikiwiki/basewiki/wikiicons
95@dirrm share/ikiwiki/basewiki/templates 105@dirrm share/ikiwiki/basewiki/templates
96@dirrm share/ikiwiki/basewiki/subpage 106@dirrm share/ikiwiki/basewiki/ikiwiki/subpage
 107@dirrm share/ikiwiki/basewiki/ikiwiki
97@dirrm share/ikiwiki/basewiki 108@dirrm share/ikiwiki/basewiki
98@dirrm share/ikiwiki 109@dirrm share/ikiwiki
99${PLIST.w3m}@dirrm share/doc/ikiwiki/w3mmode 110${PLIST.w3m}@dirrm share/doc/ikiwiki/w3mmode
100@dirrm share/doc/ikiwiki 111@dirrm share/doc/ikiwiki
101${PLIST.w3m}@dirrm libexec/w3m/cgi-bin 112${PLIST.w3m}@dirrm libexec/w3m/cgi-bin
102@dirrm lib/ikiwiki/plugins 
103@dirrm lib/ikiwiki 
cvs diff -r1.3 -r1.4 pkgsrc/www/ikiwiki/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/distinfo 2007/12/05 04:09:53 1.3
+++ pkgsrc/www/ikiwiki/distinfo 2008/04/29 00:05:41 1.4
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.3 2007/12/05 04:09:53 reed Exp $ 1$NetBSD: distinfo,v 1.4 2008/04/29 00:05:41 reed Exp $
2 2
3SHA1 (ikiwiki_2.15.tar.gz) = adc8c69ab3390a0131a96f5eafe20a9c2ce5997d 3SHA1 (ikiwiki_2.44.tar.gz) = ec296188c771035a94a36059e7ff51854890ffde
4RMD160 (ikiwiki_2.15.tar.gz) = 7a2f1604bbadc08c421eed3393aeaaece6f8ef0d 4RMD160 (ikiwiki_2.44.tar.gz) = 6976a8e822ec7c5f9656cd42819c87262a81e568
5Size (ikiwiki_2.15.tar.gz) = 592461 bytes 5Size (ikiwiki_2.44.tar.gz) = 701112 bytes
 6SHA1 (patch-aa) = 768a6f23bfb3a5c5450d2fbe1c970ec0f2195a75
File Added: pkgsrc/www/ikiwiki/patches/Attic/patch-aa
$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";
+}