Update to 3.20150329. From the changelog:

  [ Joey Hess ]
  * Fix NULL ptr deref on ENOMEM in wrapper. (Thanks, igli)

  [ Simon McVittie ]
  * Really don't double-decode CGI submissions, even on Perl versions that
    bundle an old enough Encode.pm for that not to be a problem: the
    system might have a newer Encode.pm installed separately, like Fedora 20.
    (Closes: #776181; thanks, Anders Kaseorg)
  * If neither timezone nor TZ is set, set both to :/etc/localtime if
    we're on a GNU system and that file exists, or GMT otherwise
  * t/inline.t: accept translations of "Add a new post titled:"
    (Closes: #779365)
  * Consistently document command-line options as e.g. --refresh, not -refresh

  [ Amitai Schlair ]
  * In VCS-committed anonymous comments, link to url.

  [ Joey Hess ]
  * Fix XSS in openid selector. Thanks, Raghav Bisht. (Closes: #781483)

 -- Simon McVittie <smcv@debian.org>  Sun, 29 Mar 2015 21:48:24 +0100

Updating this leaf package during the freeze for the bugfixes.

3 files changed, 6 insertions, 62 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index d0cf07595b8..a841a1466e6 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.131 2015/01/07 16:09:23 schmonz Exp $
+# $NetBSD: Makefile,v 1.132 2015/03/30 11:32:49 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20150107
+DISTNAME=		ikiwiki_3.20150329
 PKGNAME=		${DISTNAME:S/_/-/}
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 7d07a7e5fe5..75d9f4c78a1 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.104 2015/01/07 16:09:23 schmonz Exp $
+$NetBSD: distinfo,v 1.105 2015/03/30 11:32:49 schmonz Exp $
 
-SHA1 (ikiwiki_3.20150107.tar.gz) = 9ef9f03c8565c2dda6fb78f26e1ec5349039818c
-RMD160 (ikiwiki_3.20150107.tar.gz) = 2ccb7097a4c72944bc073f115975fe541299837f
-Size (ikiwiki_3.20150107.tar.gz) = 3285794 bytes
-SHA1 (patch-IkiWiki_Plugin_comments.pm) = fd0dffac8e7f3928e48425e1840e70b8a4d68808
+SHA1 (ikiwiki_3.20150329.tar.gz) = 413ec18620360070ab5f02554143b8420b6d96ab
+RMD160 (ikiwiki_3.20150329.tar.gz) = a8cbc3f82f5e3a3aa7ba54ad306aa53d84dae04d
+Size (ikiwiki_3.20150329.tar.gz) = 3311195 bytes
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_comments.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_comments.pm
deleted file mode 100644
index 98e8c70420a..00000000000
--- a/www/ikiwiki/patches/patch-IkiWiki_Plugin_comments.pm
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-IkiWiki_Plugin_comments.pm,v 1.1 2015/01/07 16:09:23 schmonz Exp $
-
-For anonymous-style comments committed directly via the VCS (i.e.,
-imported from another CMS), link to the provided URL if any.
-
---- IkiWiki/Plugin/comments.pm.orig	2015-01-03 23:25:58.000000000 +0000
-+++ IkiWiki/Plugin/comments.pm
-@@ -223,22 +223,9 @@ sub preprocess {
- 		$commentauthor = gettext("Anonymous");
- 	}
- 
--	$commentstate{$page}{commentuser} = $commentuser;
--	$commentstate{$page}{commentopenid} = $commentopenid;
--	$commentstate{$page}{commentip} = $commentip;
--	$commentstate{$page}{commentauthor} = $commentauthor;
--	$commentstate{$page}{commentauthorurl} = $commentauthorurl;
--	$commentstate{$page}{commentauthoravatar} = $params{avatar};
--	if (! defined $pagestate{$page}{meta}{author}) {
--		$pagestate{$page}{meta}{author} = $commentauthor;
--	}
--	if (! defined $pagestate{$page}{meta}{authorurl}) {
--		$pagestate{$page}{meta}{authorurl} = $commentauthorurl;
--	}
--
- 	if ($config{comments_allowauthor}) {
- 		if (defined $params{claimedauthor}) {
--			$pagestate{$page}{meta}{author} = $params{claimedauthor};
-+			$commentauthor = $params{claimedauthor};
- 		}
- 
- 		if (defined $params{url}) {
-@@ -250,12 +237,21 @@ sub preprocess {
- 			}
- 
- 			if (safeurl($url)) {
--				$pagestate{$page}{meta}{authorurl} = $url;
-+				$commentauthorurl = $url;
- 			}
- 		}
- 	}
--	else {
-+
-+	$commentstate{$page}{commentuser} = $commentuser;
-+	$commentstate{$page}{commentopenid} = $commentopenid;
-+	$commentstate{$page}{commentip} = $commentip;
-+	$commentstate{$page}{commentauthor} = $commentauthor;
-+	$commentstate{$page}{commentauthorurl} = $commentauthorurl;
-+	$commentstate{$page}{commentauthoravatar} = $params{avatar};
-+	if (! defined $pagestate{$page}{meta}{author}) {
- 		$pagestate{$page}{meta}{author} = $commentauthor;
-+	}
-+	if (! defined $pagestate{$page}{meta}{authorurl}) {
- 		$pagestate{$page}{meta}{authorurl} = $commentauthorurl;
- 	}
-