diff options
| author | schmonz <schmonz> | 2011-03-29 12:51:10 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2011-03-29 12:51:10 +0000 |
| commit | 7268efa327065aca4304d6c23c43b5db5ebf686d (patch) | |
| tree | b47feccdefe3ffc2514e43d94b99aa39875692a0 /www | |
| parent | 329caac59e761eb56618db32b6aab56d7e248099 (diff) | |
| download | pkgsrc-7268efa327065aca4304d6c23c43b5db5ebf686d.tar.gz | |
Update to 3.20110328. From the changelog:
* Yaml formatted setup files are now produced by default.
(Perl formatted setup files can still be used.)
* Add timezone setting in setup file. This alows time zone to be configured
via the web.
* comment: Better fix to avoid showing comments of subpages, while
not breaking manual inlining of comments.
* meta: Security fix; don't allow alternative stylesheets to be added
on pages where the htmlscrubber is enabled.
(Updating this leaf package during the freeze for the security and
bug fixes.)
Diffstat (limited to 'www')
| -rw-r--r-- | www/ikiwiki/Makefile | 5 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 9 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-ac | 15 |
3 files changed, 7 insertions, 22 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 99707447360..fd7328ffbba 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.75 2011/03/23 22:25:05 schmonz Exp $ +# $NetBSD: Makefile,v 1.76 2011/03/29 12:51:10 schmonz Exp $ # -DISTNAME= ikiwiki_3.20110321 +DISTNAME= ikiwiki_3.20110328 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} @@ -30,6 +30,7 @@ DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext +DEPENDS+= p5-YAML-[0-9]*:../../textproc/p5-YAML #DEPENDS+= po4a-[0-9]*:../../textproc/po4a WRKSRC= ${WRKDIR}/${PKGBASE} diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index 2fbab247693..228afa13280 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.60 2011/03/23 22:25:05 schmonz Exp $ +$NetBSD: distinfo,v 1.61 2011/03/29 12:51:10 schmonz Exp $ -SHA1 (ikiwiki_3.20110321.tar.gz) = b7b2d7b4c390f760f9d6c659b1048b8c176dc2fd -RMD160 (ikiwiki_3.20110321.tar.gz) = 568050510e31fe1908042179d42259b7fb4d5609 -Size (ikiwiki_3.20110321.tar.gz) = 2340126 bytes +SHA1 (ikiwiki_3.20110328.tar.gz) = b7f83da63f1b7541fff0a651d73bcfd5b52a4787 +RMD160 (ikiwiki_3.20110328.tar.gz) = fcddf59617ba64a94b481733368d3cc2661ab6fc +Size (ikiwiki_3.20110328.tar.gz) = 2341626 bytes SHA1 (patch-aa) = 0ddf4825daec821bf93978c665af99645c5538c0 SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903 -SHA1 (patch-ac) = 621983c0405f747566a9bed2a01261d58741a5bd SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac deleted file mode 100644 index 303014b90ae..00000000000 --- a/www/ikiwiki/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.9 2011/03/23 22:25:06 schmonz Exp $ - ---- IkiWiki/Plugin/aggregate.pm.orig 2011-03-21 18:44:36.000000000 +0000 -+++ IkiWiki/Plugin/aggregate.pm -@@ -70,8 +70,8 @@ sub checkconfig () { - if (! defined $config{aggregateinternal}) { - $config{aggregateinternal}=1; - } -- if (! defined $config{cookies}) { -- $config{cookies}={ file => "$ENV{HOME}/.ikiwiki/cookies" }; -+ if (! defined $config{cookiejar}) { -+ $config{cookiejar}={ file => "$ENV{HOME}/.ikiwiki/cookies" }; - } - - # This is done here rather than in a refresh hook because it |