Fri Oct 17 11:50:43 2014 UTC ()
Update to 3.20141016. From the changelog:

[ Joey Hess ]
* Fix crash that can occur when only_committed_changes is set and a
  file is deleted from the underlay.

[ Simon McVittie ]
* core: avoid dangerous use of CGI->param in list context, which led
  to a security flaw in Bugzilla; as far as we can tell, ikiwiki
  is not vulnerable to a similar attack, but it's best to be safe
* core: new reverse_proxy option prevents ikiwiki from trying to detect
  how to make self-referential URLs by using the CGI environment variables,
  for instance when it's deployed behind a HTTP reverse proxy
  (Closes: #745759)
* core: the default User-Agent is now "ikiwiki/$version" to work around
  ModSecurity rules assuming that only malware uses libwww-perl
* core: use protocol-relative URLs (e.g. //www.example.com/wiki) so that
  https stays on https and http stays on http, particularly if the
  html5 option is enabled
* core: avoid mixed content when a https cgiurl links to http static pages
  on the same server (the static pages are assumed to be accessible via
  https too)
* core: force the correct top URL in w3mmode
* google plugin: Use search form
* docwiki: replace Paypal and Flattr buttons with text links
* comments: don't record the IP address in the wiki if the user is
  logged in via passwordauth or httpauth
* templates: add ARIA roles to some page elements, if html5 is enabled.
  Thanks, Patrick

pkgsrc changes:
* For the python option, add missing py-expat dependency.


(schmonz)
diff -r1.126 -r1.127 pkgsrc/www/ikiwiki/Makefile
diff -r1.102 -r1.103 pkgsrc/www/ikiwiki/distinfo
diff -r1.16 -r1.17 pkgsrc/www/ikiwiki/options.mk
diff -r1.1 -r0 pkgsrc/www/ikiwiki/patches/patch-Makefile.PL
cvs diff -r1.126 -r1.127 pkgsrc/www/ikiwiki/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/Makefile 2014/10/03 18:37:11 1.126
+++ pkgsrc/www/ikiwiki/Makefile 2014/10/17 11:50:42 1.127
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.126 2014/10/03 18:37:11 schmonz Exp $ 1# $NetBSD: Makefile,v 1.127 2014/10/17 11:50:42 schmonz Exp $
2# 2#
3 3
4DISTNAME= ikiwiki_3.20140916 4DISTNAME= ikiwiki_3.20141016
5PKGNAME= ${DISTNAME:S/_/-/} 5PKGNAME= ${DISTNAME:S/_/-/}
6PKGREVISION= 1 
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= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://ikiwiki.info/ 10HOMEPAGE= http://ikiwiki.info/
12COMMENT= Flexible static site generator with dynamic features 11COMMENT= Flexible static site generator with dynamic features
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount 14DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount
16DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI 15DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
17DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser 16DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
18DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template 17DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
19DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree 18DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
@@ -26,31 +25,26 @@ DEPENDS+= p5-XML-Atom-[0-9]*:../../text @@ -26,31 +25,26 @@ DEPENDS+= p5-XML-Atom-[0-9]*:../../text
26DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed 25DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed
27DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple 26DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
28DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS 27DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
29DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo 28DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
30DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext 29DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext
31DEPENDS+= p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML 30DEPENDS+= p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML
32#DEPENDS+= po4a-[0-9]*:../../textproc/po4a 31#DEPENDS+= po4a-[0-9]*:../../textproc/po4a
33 32
34WRKSRC= ${WRKDIR}/${PKGBASE} 33WRKSRC= ${WRKDIR}/${PKGBASE}
35PERL5_PACKLIST= auto/IkiWiki/.packlist 34PERL5_PACKLIST= auto/IkiWiki/.packlist
36USE_LANGUAGES= c 35USE_LANGUAGES= c
37USE_TOOLS+= gmake msgfmt perl:run xgettext 36USE_TOOLS+= gmake msgfmt perl:run xgettext
38 37
39REPLACE_PERL+= Makefile.PL *.in *.cgi *.pm* */*.pm* */*/*.pm* */*.t 
40REPLACE_PERL+= *.setup */*.setup */*/*.setup 
41REPLACE_PERL+= ikiwiki-mass-rebuild ikiwiki-update-wikilist 
42REPLACE_PERL+= gitremotes mdwn2man pm_filter po/po2wiki 
43REPLACE_PERL+= plugins/externaldemo # XXX not installed 
44# find . -type f -print | \ 38# find . -type f -print | \
45# perl -ne 'open(F, "<$_"); $l=<F>; print if $l =~ m|^#!/usr/bin/perl|' 39# perl -ne 'open(F, "<$_"); $l=<F>; print if $l =~ m|^#!/usr/bin/perl|'
46REPLACE_PYTHON+= plugins/proxy.py plugins/pythondemo plugins/rst 40REPLACE_PYTHON+= plugins/proxy.py plugins/pythondemo plugins/rst
47 41
48MAKE_FLAGS+= W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin 42MAKE_FLAGS+= W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin
49MAKE_FLAGS+= SYSCONFDIR=${PKG_SYSCONFDIR:Q} 43MAKE_FLAGS+= SYSCONFDIR=${PKG_SYSCONFDIR:Q}
50MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q} 44MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
51 45
52INSTALL_MAKE_FLAGS+= SYSCONFDIR=${EGDIR:Q} 46INSTALL_MAKE_FLAGS+= SYSCONFDIR=${EGDIR:Q}
53 47
54PKG_SYSCONFSUBDIR= ${PKGBASE} 48PKG_SYSCONFSUBDIR= ${PKGBASE}
55EGDIR= ${PREFIX}/share/examples/${PKGBASE} 49EGDIR= ${PREFIX}/share/examples/${PKGBASE}
56.for f in auto.setup auto-blog.setup wikilist 50.for f in auto.setup auto-blog.setup wikilist
cvs diff -r1.102 -r1.103 pkgsrc/www/ikiwiki/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/distinfo 2014/09/19 05:24:15 1.102
+++ pkgsrc/www/ikiwiki/distinfo 2014/10/17 11:50:42 1.103
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
1$NetBSD: distinfo,v 1.102 2014/09/19 05:24:15 schmonz Exp $ 1$NetBSD: distinfo,v 1.103 2014/10/17 11:50:42 schmonz Exp $
2 2
3SHA1 (ikiwiki_3.20140916.tar.gz) = a9f167e736caf480143e3086e11143b2b2ee9946 3SHA1 (ikiwiki_3.20141016.tar.gz) = 472b3899eb3ca64b5a8d564b0de29f62e1847318
4RMD160 (ikiwiki_3.20140916.tar.gz) = 22f37b96f91a4c0303655538c0762c1c8caace49 4RMD160 (ikiwiki_3.20141016.tar.gz) = db9ebfa5fa61516f089611804d9f15073b2f1b89
5Size (ikiwiki_3.20140916.tar.gz) = 3213411 bytes 5Size (ikiwiki_3.20141016.tar.gz) = 3254923 bytes
6SHA1 (patch-Makefile.PL) = 283bbdbecf1248b2c1d2244be8462f8bfe2d950f 
cvs diff -r1.16 -r1.17 pkgsrc/www/ikiwiki/options.mk (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/options.mk 2014/09/16 17:53:01 1.16
+++ pkgsrc/www/ikiwiki/options.mk 2014/10/17 11:50:42 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.16 2014/09/16 17:53:01 schmonz Exp $ 1# $NetBSD: options.mk,v 1.17 2014/10/17 11:50:42 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki 3PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki
4PKG_SUPPORTED_OPTIONS= cgi imagemagick python w3m 4PKG_SUPPORTED_OPTIONS= cgi imagemagick python w3m
5PKG_SUPPORTED_OPTIONS+= cvs git svn # not mutually exclusive 5PKG_SUPPORTED_OPTIONS+= cvs git svn # not mutually exclusive
6PKG_SUPPORTED_OPTIONS+= ikiwiki-amazon-s3 ikiwiki-highlight ikiwiki-search 6PKG_SUPPORTED_OPTIONS+= ikiwiki-amazon-s3 ikiwiki-highlight ikiwiki-search
7PKG_SUGGESTED_OPTIONS= cgi 7PKG_SUGGESTED_OPTIONS= cgi
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11.if !empty(PKG_OPTIONS:Mcgi) 11.if !empty(PKG_OPTIONS:Mcgi)
12DEPENDS+= p5-CGI-[0-9]*:../../www/p5-CGI 12DEPENDS+= p5-CGI-[0-9]*:../../www/p5-CGI
13DEPENDS+= p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder 13DEPENDS+= p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder
14DEPENDS+= p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session 14DEPENDS+= p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session
@@ -41,26 +41,27 @@ DEPENDS+= p5-highlight-[0-9]*:../../text @@ -41,26 +41,27 @@ DEPENDS+= p5-highlight-[0-9]*:../../text
41.if !empty(PKG_OPTIONS:Mikiwiki-search) 41.if !empty(PKG_OPTIONS:Mikiwiki-search)
42DEPENDS+= p5-Search-Xapian-[0-9]*:../../textproc/p5-Search-Xapian 42DEPENDS+= p5-Search-Xapian-[0-9]*:../../textproc/p5-Search-Xapian
43DEPENDS+= xapian-omega-[0-9]*:../../textproc/xapian-omega 43DEPENDS+= xapian-omega-[0-9]*:../../textproc/xapian-omega
44.endif 44.endif
45 45
46.if !empty(PKG_OPTIONS:Mimagemagick) 46.if !empty(PKG_OPTIONS:Mimagemagick)
47DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick 47DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
48# suggest ghostscript (required for PDF-to-PNG thumbnailing) 48# suggest ghostscript (required for PDF-to-PNG thumbnailing)
49# and libmagickcore-extra (required for SVG-to-PNG thumbnailing) 49# and libmagickcore-extra (required for SVG-to-PNG thumbnailing)
50.endif 50.endif
51 51
52.if !empty(PKG_OPTIONS:Mpython) 52.if !empty(PKG_OPTIONS:Mpython)
53DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils 53DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
 54DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
54.else 55.else
55PYTHON_FOR_BUILD_ONLY= yes 56PYTHON_FOR_BUILD_ONLY= yes
56.endif 57.endif
57 58
58.if !empty(PKG_OPTIONS:Msvn) 59.if !empty(PKG_OPTIONS:Msvn)
59DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base 60DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base
60.endif 61.endif
61 62
62PLIST_VARS+= w3m 63PLIST_VARS+= w3m
63.if !empty(PKG_OPTIONS:Mw3m) 64.if !empty(PKG_OPTIONS:Mw3m)
64DEPENDS+= w3m-[0-9]*:../../www/w3m 65DEPENDS+= w3m-[0-9]*:../../www/w3m
65PLIST.w3m= yes 66PLIST.w3m= yes
66INSTALLATION_DIRS+= share/doc/${PKGBASE}/w3mmode 67INSTALLATION_DIRS+= share/doc/${PKGBASE}/w3mmode
File Deleted: pkgsrc/www/ikiwiki/patches/patch-Makefile.PL