diff options
author | reed <reed> | 2008-06-05 13:57:08 +0000 |
---|---|---|
committer | reed <reed> | 2008-06-05 13:57:08 +0000 |
commit | c01849be227123b2f68e8955a16f04cf1afefb9e (patch) | |
tree | f0ee4c4ef3701fb1d4539416927f1da506920263 /www | |
parent | d696e235d152a98e9d2b9a942b625bee9688d84d (diff) | |
download | pkgsrc-c01849be227123b2f68e8955a16f04cf1afefb9e.tar.gz |
Update to 2.48.
See http://ikiwiki.info/news/ for complete list of changes.
Major changes include:
- "fixes an important security hole"
- new plugins: amazon_s3, pingee, pinger
patch-aa removed, fixed now.
Diffstat (limited to 'www')
-rw-r--r-- | www/ikiwiki/Makefile | 4 | ||||
-rw-r--r-- | www/ikiwiki/PLIST | 3 | ||||
-rw-r--r-- | www/ikiwiki/distinfo | 9 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-aa | 15 |
4 files changed, 8 insertions, 23 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 8cd9c92d532..a57e302d70a 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2008/04/29 00:05:41 reed Exp $ +# $NetBSD: Makefile,v 1.13 2008/06/05 13:57:09 reed Exp $ # -DISTNAME= ikiwiki_2.44 +DISTNAME= ikiwiki_2.48 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index ddad5771dfe..15c207f203b 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2008/04/29 00:05:41 reed Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/06/05 13:57:09 reed Exp $ bin/ikiwiki bin/ikiwiki-makerepo bin/ikiwiki-transition @@ -92,6 +92,7 @@ share/ikiwiki/templates/titlepage.tmpl share/locale/bg/LC_MESSAGES/ikiwiki.mo share/locale/cs/LC_MESSAGES/ikiwiki.mo share/locale/da/LC_MESSAGES/ikiwiki.mo +share/locale/de/LC_MESSAGES/ikiwiki.mo share/locale/es/LC_MESSAGES/ikiwiki.mo share/locale/fr/LC_MESSAGES/ikiwiki.mo share/locale/gu/LC_MESSAGES/ikiwiki.mo diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index af3cdfd0c3e..a32b5c2f4e3 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2008/04/29 00:05:41 reed Exp $ +$NetBSD: distinfo,v 1.5 2008/06/05 13:57:09 reed Exp $ -SHA1 (ikiwiki_2.44.tar.gz) = ec296188c771035a94a36059e7ff51854890ffde -RMD160 (ikiwiki_2.44.tar.gz) = 6976a8e822ec7c5f9656cd42819c87262a81e568 -Size (ikiwiki_2.44.tar.gz) = 701112 bytes -SHA1 (patch-aa) = 768a6f23bfb3a5c5450d2fbe1c970ec0f2195a75 +SHA1 (ikiwiki_2.48.tar.gz) = dcca59d164f7cafb9e638a02df04c1f6bd967e42 +RMD160 (ikiwiki_2.48.tar.gz) = 03c3f2b30977645e4113a5d00e14c183332c4868 +Size (ikiwiki_2.48.tar.gz) = 729477 bytes diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa deleted file mode 100644 index 5663e71b0f4..00000000000 --- a/www/ikiwiki/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2008/04/29 00:05:41 reed Exp $ - ---- pm_filter.orig 2008-04-18 11:27:18 -0700 -+++ pm_filter 2008-04-28 14:51:50 -0700 -@@ -20,6 +20,9 @@ - $_="use lib '$libdir';\n"; - } - } --elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!/usr/bin/perl) -T$}) { -+elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!.*perl.*?) -T$}) { - $_=qq{$1\n}; - } -+if (/^\$ENV{PATH}="(.*)";/) { -+ $_="\$ENV{PATH}=\"$1:$prefix/bin\";\n"; -+} |