diff options
author | schmonz <schmonz@pkgsrc.org> | 2014-09-16 17:53:01 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2014-09-16 17:53:01 +0000 |
commit | b593f02a2ac05f8620387880cfc3d5f0f91401e1 (patch) | |
tree | 520c94cdbf7d5a87b37f8245aabe5332637deee8 /www/ikiwiki | |
parent | f7bcca2425bd39039babf2514a25a42959aa6917 (diff) | |
download | pkgsrc-b593f02a2ac05f8620387880cfc3d5f0f91401e1.tar.gz |
Update to 3.20140916. From the changelog:
* Don't double-decode CGI submissions with Encode.pm >= 2.53,
fixing "Error: Cannot decode string with wide characters".
Thanks, Antoine Beaupré
* Avoid making trails depend on everything in the wiki by giving them
a better way to sort the pages
* Don't let users post comments that won't be displayed
* Fix encoding of Unicode strings in Python plugins.
Thanks, chrysn
* Improve performance and correctness of the [[!if]] directive
* Let [[!inline rootpage=foo postform=no]] disable the posting form
* Switch default [[!man]] shortcut to manpages.debian.org. Closes: #700322
* Add UUID and TIME variables to edittemplate. Closes: #752827
Thanks, Jonathon Anderson
* Display pages in linkmaps as their pagetitle (no underscore escapes).
Thanks, chrysn
* Fix aspect ratio when scaling small images, and add support for
converting SVG and PDF graphics to PNG.
Thanks, chrysn
- suggest ghostscript (required for PDF-to-PNG thumbnailing)
and libmagickcore-extra (required for SVG-to-PNG thumbnailing)
- build-depend on ghostscript so the test for scalable images can be run
* In the CGI wrapper, incorporate $config{ENV} into the environment
before executing Perl code, so that PERL5LIB can point to a
non-system-wide installation of IkiWiki.
Thanks, Lafayette Chamber Singers Webmaster
* filecheck: accept MIME types not containing ';'
* autoindex: index files in underlays if the resulting pages aren't
going to be committed. Closes: #611068
* Add [[!templatebody]] directive so template pages don't have to be
simultaneously a valid template and valid HTML
* Add myself to Uploaders and release to Debian
-- Simon McVittie <smcv@debian.org> Fri, 12 Sep 2014 21:23:58 +0100
pkgsrc changes:
* Add 'cgi' option, enabled by default
* Add 'git' option, disabled by default
Updating during the freeze because it's a leaf with many fixes,
including our local patches.
Diffstat (limited to 'www/ikiwiki')
-rw-r--r-- | www/ikiwiki/Makefile | 8 | ||||
-rw-r--r-- | www/ikiwiki/PLIST | 3 | ||||
-rw-r--r-- | www/ikiwiki/distinfo | 10 | ||||
-rw-r--r-- | www/ikiwiki/options.mk | 22 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-IkiWiki.pm | 16 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-IkiWiki_CGI.pm | 32 |
6 files changed, 26 insertions, 65 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 9ded8bd7838..11059a73c7f 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.123 2014/09/13 00:08:21 schmonz Exp $ +# $NetBSD: Makefile,v 1.124 2014/09/16 17:53:01 schmonz Exp $ # -DISTNAME= ikiwiki_3.20140815 +DISTNAME= ikiwiki_3.20140916 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 2 CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} @@ -17,8 +16,6 @@ DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree -DEPENDS+= p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session -DEPENDS+= p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate @@ -66,7 +63,6 @@ TEST_TARGET= test .include "options.mk" pre-configure: - rm -f ${WRKSRC}/doc/examples/blog/posts/Test.html find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f .include "../../mk/bsd.prefs.mk" diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index 6c3a6421d07..38c394a5bc7 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.39 2014/02/27 23:47:12 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.40 2014/09/16 17:53:01 schmonz Exp $ bin/ikiwiki bin/ikiwiki-calendar bin/ikiwiki-makerepo @@ -108,6 +108,7 @@ share/ikiwiki/directives/ikiwiki/directive/table.mdwn share/ikiwiki/directives/ikiwiki/directive/tag.mdwn share/ikiwiki/directives/ikiwiki/directive/taglink.mdwn share/ikiwiki/directives/ikiwiki/directive/template.mdwn +share/ikiwiki/directives/ikiwiki/directive/templatebody.mdwn share/ikiwiki/directives/ikiwiki/directive/testpagespec.mdwn share/ikiwiki/directives/ikiwiki/directive/teximg.mdwn share/ikiwiki/directives/ikiwiki/directive/toc.mdwn diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index bb5984f3af3..4a07a8fc300 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.100 2014/09/13 00:08:21 schmonz Exp $ +$NetBSD: distinfo,v 1.101 2014/09/16 17:53:01 schmonz Exp $ -SHA1 (ikiwiki_3.20140815.tar.gz) = 069b14c8cc22ef7db1a4f162763312c54379042d -RMD160 (ikiwiki_3.20140815.tar.gz) = 2e7b2c0e6fb1513157b2d152bc5d3afe9018871f -Size (ikiwiki_3.20140815.tar.gz) = 3261039 bytes -SHA1 (patch-IkiWiki.pm) = 5f82b1ebbe3ff11e8b18a167eec97de571b1980a -SHA1 (patch-IkiWiki_CGI.pm) = 43b3ceb4e5e429d0c6cc481d66cd0beca0a2eecc +SHA1 (ikiwiki_3.20140916.tar.gz) = a9f167e736caf480143e3086e11143b2b2ee9946 +RMD160 (ikiwiki_3.20140916.tar.gz) = 22f37b96f91a4c0303655538c0762c1c8caace49 +Size (ikiwiki_3.20140916.tar.gz) = 3213411 bytes diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk index d2b914005e0..28dc2c09b13 100644 --- a/www/ikiwiki/options.mk +++ b/www/ikiwiki/options.mk @@ -1,12 +1,20 @@ -# $NetBSD: options.mk,v 1.15 2014/08/18 01:37:35 schmonz Exp $ +# $NetBSD: options.mk,v 1.16 2014/09/16 17:53:01 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki -PKG_SUPPORTED_OPTIONS= cvs ikiwiki-amazon-s3 -PKG_SUPPORTED_OPTIONS+= ikiwiki-highlight ikiwiki-search -PKG_SUPPORTED_OPTIONS+= imagemagick python svn w3m +PKG_SUPPORTED_OPTIONS= cgi imagemagick python w3m +PKG_SUPPORTED_OPTIONS+= cvs git svn # not mutually exclusive +PKG_SUPPORTED_OPTIONS+= ikiwiki-amazon-s3 ikiwiki-highlight ikiwiki-search +PKG_SUGGESTED_OPTIONS= cgi .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mcgi) +DEPENDS+= p5-CGI-[0-9]*:../../www/p5-CGI +DEPENDS+= p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder +DEPENDS+= p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session +DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File +.endif + .if !empty(PKG_OPTIONS:Mcvs) . if !exists(/usr/bin/cvs) DEPENDS+= cvs-[0-9]*:../../devel/scmcvs @@ -17,6 +25,10 @@ DEPENDS+= p5-File-chdir-[0-9]*:../../devel/p5-File-chdir DEPENDS+= p5-File-ReadBackwards-[0-9]*:../../textproc/p5-File-ReadBackwards .endif +.if !empty(PKG_OPTIONS:Mgit) +DEPENDS+= git-base-[0-9]*:../../devel/git-base +.endif + .if !empty(PKG_OPTIONS:Mikiwiki-amazon-s3) DEPENDS+= p5-Net-Amazon-S3-[0-9]*:../../net/p5-Net-Amazon-S3 DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo @@ -33,6 +45,8 @@ DEPENDS+= xapian-omega-[0-9]*:../../textproc/xapian-omega .if !empty(PKG_OPTIONS:Mimagemagick) DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick +# suggest ghostscript (required for PDF-to-PNG thumbnailing) +# and libmagickcore-extra (required for SVG-to-PNG thumbnailing) .endif .if !empty(PKG_OPTIONS:Mpython) diff --git a/www/ikiwiki/patches/patch-IkiWiki.pm b/www/ikiwiki/patches/patch-IkiWiki.pm deleted file mode 100644 index fa0e7722a8e..00000000000 --- a/www/ikiwiki/patches/patch-IkiWiki.pm +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-IkiWiki.pm,v 1.1 2014/08/23 13:02:37 schmonz Exp $ - -Squelch commit warning with wiki.n.o's unusual (scheme-less) $config{url}. - ---- IkiWiki.pm.orig 2014-07-02 19:45:57.000000000 +0000 -+++ IkiWiki.pm -@@ -607,7 +607,8 @@ sub checkconfig () { - - $local_cgiurl = $cgiurl->path; - -- if ($cgiurl->scheme ne $baseurl->scheme or -+ if (!defined $baseurl->scheme or -+ $cgiurl->scheme ne $baseurl->scheme or - $cgiurl->authority ne $baseurl->authority) { - # too far apart, fall back to absolute URLs - $local_url = "$config{url}/"; diff --git a/www/ikiwiki/patches/patch-IkiWiki_CGI.pm b/www/ikiwiki/patches/patch-IkiWiki_CGI.pm deleted file mode 100644 index 7218d68f151..00000000000 --- a/www/ikiwiki/patches/patch-IkiWiki_CGI.pm +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-IkiWiki_CGI.pm,v 1.1 2014/09/13 00:08:22 schmonz Exp $ - -Cherry-pick feb21eb from upstream git to avoid Unicode being decoded -twice in CGI forms under Perl 5.20 (with bundled Encode.pm 2.53). - ---- IkiWiki/CGI.pm.orig 2014-07-02 19:45:57.000000000 +0000 -+++ IkiWiki/CGI.pm -@@ -110,11 +110,23 @@ sub decode_cgi_utf8 ($) { - } - } - -+sub safe_decode_utf8 ($) { -+ my $octets = shift; -+ # call decode_utf8 on >= 5.20 only if it's not already decoded, -+ # otherwise it balks, on < 5.20, always call it -+ if ($] < 5.02 || !Encode::is_utf8($octets)) { -+ return decode_utf8($octets); -+ } -+ else { -+ return $octets; -+ } -+} -+ - sub decode_form_utf8 ($) { - if ($] >= 5.01) { - my $form = shift; - foreach my $f ($form->field) { -- my @value=map { decode_utf8($_) } $form->field($f); -+ my @value=map { safe_decode_utf8($_) } $form->field($f); - $form->field(name => $f, - value => \@value, - force => 1, |