Mon Mar 30 11:32:50 2015 UTC ()
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.


(schmonz)
diff -r1.131 -r1.132 pkgsrc/www/ikiwiki/Makefile
diff -r1.104 -r1.105 pkgsrc/www/ikiwiki/distinfo
diff -r1.1 -r0 pkgsrc/www/ikiwiki/patches/patch-IkiWiki_Plugin_comments.pm
cvs diff -r1.131 -r1.132 pkgsrc/www/ikiwiki/Makefile (switch to unified diff)

--- pkgsrc/www/ikiwiki/Makefile 2015/01/07 16:09:23 1.131
+++ pkgsrc/www/ikiwiki/Makefile 2015/03/30 11:32:49 1.132
@@ -1,78 +1,78 @@ @@ -1,78 +1,78 @@
1# $NetBSD: Makefile,v 1.131 2015/01/07 16:09:23 schmonz Exp $ 1# $NetBSD: Makefile,v 1.132 2015/03/30 11:32:49 schmonz Exp $
2# 2#
3 3
4DISTNAME= ikiwiki_3.20150107 4DISTNAME= ikiwiki_3.20150329
5PKGNAME= ${DISTNAME:S/_/-/} 5PKGNAME= ${DISTNAME:S/_/-/}
6CATEGORIES= www textproc 6CATEGORIES= www textproc
7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} 7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://ikiwiki.info/ 10HOMEPAGE= http://ikiwiki.info/
11COMMENT= Flexible static site generator with dynamic features 11COMMENT= Flexible static site generator with dynamic features
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14# ./pm_filter /usr/pkg 3.20141016 /usr/pkg/lib/perl5/vendor_perl/5.20.0 < ikiwiki.in > ikiwiki.out 14# ./pm_filter /usr/pkg 3.20141016 /usr/pkg/lib/perl5/vendor_perl/5.20.0 < ikiwiki.in > ikiwiki.out
15# sh: ./pm_filter: not found 15# sh: ./pm_filter: not found
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount 18DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount
19DEPENDS+= p5-URI>=1.36:../../www/p5-URI 19DEPENDS+= p5-URI>=1.36:../../www/p5-URI
20DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser 20DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
21DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template 21DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
22DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree 22DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
23DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail 23DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail
24DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration 24DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration
25DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate 25DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
26DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber 26DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
27DEPENDS+= p5-JSON-[0-9]*:../../converters/p5-JSON 27DEPENDS+= p5-JSON-[0-9]*:../../converters/p5-JSON
28DEPENDS+= p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML 28DEPENDS+= p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML
29DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom 29DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
30DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed 30DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed
31DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple 31DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
32DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS 32DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
33DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo 33DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
34DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext 34DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext
35DEPENDS+= p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML 35DEPENDS+= p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML
36 36
37WRKSRC= ${WRKDIR}/${PKGBASE} 37WRKSRC= ${WRKDIR}/${PKGBASE}
38PERL5_PACKLIST= auto/IkiWiki/.packlist 38PERL5_PACKLIST= auto/IkiWiki/.packlist
39USE_LANGUAGES= c 39USE_LANGUAGES= c
40USE_TOOLS+= gmake msgfmt perl:run xgettext 40USE_TOOLS+= gmake msgfmt perl:run xgettext
41 41
42REPLACE_PERL+= IkiWiki/Plugin/calendar.pm 42REPLACE_PERL+= IkiWiki/Plugin/calendar.pm
43# find . -type f -print | \ 43# find . -type f -print | \
44# perl -ne 'open(F, "<$_"); $l=<F>; print if $l =~ m|^#!/usr/bin/perl|' 44# perl -ne 'open(F, "<$_"); $l=<F>; print if $l =~ m|^#!/usr/bin/perl|'
45REPLACE_PYTHON+= plugins/proxy.py plugins/pythondemo plugins/rst 45REPLACE_PYTHON+= plugins/proxy.py plugins/pythondemo plugins/rst
46 46
47BUILD_TARGET= extra_build all 47BUILD_TARGET= extra_build all
48 48
49MAKE_FLAGS+= W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin 49MAKE_FLAGS+= W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin
50MAKE_FLAGS+= SYSCONFDIR=${PKG_SYSCONFDIR:Q} 50MAKE_FLAGS+= SYSCONFDIR=${PKG_SYSCONFDIR:Q}
51MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q} 51MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
52 52
53INSTALL_MAKE_FLAGS+= SYSCONFDIR=${EGDIR:Q} 53INSTALL_MAKE_FLAGS+= SYSCONFDIR=${EGDIR:Q}
54 54
55PKG_SYSCONFSUBDIR= ${PKGBASE} 55PKG_SYSCONFSUBDIR= ${PKGBASE}
56EGDIR= ${PREFIX}/share/examples/${PKGBASE} 56EGDIR= ${PREFIX}/share/examples/${PKGBASE}
57.for f in auto.setup auto-blog.setup wikilist 57.for f in auto.setup auto-blog.setup wikilist
58CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 58CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
59.endfor 59.endfor
60 60
61#SPECIAL_PERMS+= ${PREFIX}/bin/ikiwiki-update-wikilist ... 61#SPECIAL_PERMS+= ${PREFIX}/bin/ikiwiki-update-wikilist ...
62 62
63TEST_TARGET= test 63TEST_TARGET= test
64 64
65.include "options.mk" 65.include "options.mk"
66 66
67pre-configure: 67pre-configure:
68 find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f 68 find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f
69 69
70.include "../../mk/bsd.prefs.mk" 70.include "../../mk/bsd.prefs.mk"
71 71
72.if ${OPSYS} == "SunOS" 72.if ${OPSYS} == "SunOS"
73TOOLS_PLATFORM.find= # empty, to force GNU find from pkgsrc findutils 73TOOLS_PLATFORM.find= # empty, to force GNU find from pkgsrc findutils
74.endif 74.endif
75 75
76.include "../../lang/perl5/module.mk" 76.include "../../lang/perl5/module.mk"
77.include "../../lang/python/application.mk" 77.include "../../lang/python/application.mk"
78.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.104 -r1.105 pkgsrc/www/ikiwiki/distinfo (switch to unified diff)

--- pkgsrc/www/ikiwiki/distinfo 2015/01/07 16:09:23 1.104
+++ pkgsrc/www/ikiwiki/distinfo 2015/03/30 11:32:49 1.105
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
1$NetBSD: distinfo,v 1.104 2015/01/07 16:09:23 schmonz Exp $ 1$NetBSD: distinfo,v 1.105 2015/03/30 11:32:49 schmonz Exp $
2 2
3SHA1 (ikiwiki_3.20150107.tar.gz) = 9ef9f03c8565c2dda6fb78f26e1ec5349039818c 3SHA1 (ikiwiki_3.20150329.tar.gz) = 413ec18620360070ab5f02554143b8420b6d96ab
4RMD160 (ikiwiki_3.20150107.tar.gz) = 2ccb7097a4c72944bc073f115975fe541299837f 4RMD160 (ikiwiki_3.20150329.tar.gz) = a8cbc3f82f5e3a3aa7ba54ad306aa53d84dae04d
5Size (ikiwiki_3.20150107.tar.gz) = 3285794 bytes 5Size (ikiwiki_3.20150329.tar.gz) = 3311195 bytes
6SHA1 (patch-IkiWiki_Plugin_comments.pm) = fd0dffac8e7f3928e48425e1840e70b8a4d68808 
File Deleted: pkgsrc/www/ikiwiki/patches/Attic/patch-IkiWiki_Plugin_comments.pm