summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz@pkgsrc.org>2012-05-28 09:54:58 +0000
committerspz <spz@pkgsrc.org>2012-05-28 09:54:58 +0000
commit4b4e6bad7b1a0e71e679c852ae8eb694a1573e08 (patch)
tree3a5603dfcfc03a69a02f2e429fc30c15114bd0bf
parent52c31a76acd3d0cf210f94471920398b97ac29c2 (diff)
downloadpkgsrc-4b4e6bad7b1a0e71e679c852ae8eb694a1573e08.tar.gz
Pullup ticket #3809 - requested by schmonz
www/ikiwiki: security update Revisions pulled up: - www/ikiwiki/Makefile 1.94 - www/ikiwiki/distinfo 1.78 - www/ikiwiki/PLIST 1.36 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: schmonz Date: Thu May 17 05:51:05 UTC 2012 Modified Files: pkgsrc/www/ikiwiki: Makefile distinfo Log Message: Update to 3.20120516. From the changelog: * meta: Security fix; add missing sanitization of author and authorurl. Thanks, Raúl Benencia To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 pkgsrc/www/ikiwiki/Makefile cvs rdiff -u -r1.77 -r1.78 pkgsrc/www/ikiwiki/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: schmonz Date: Fri Apr 20 03:48:25 UTC 2012 Modified Files: pkgsrc/www/ikiwiki: Makefile PLIST distinfo Log Message: Update to 3.20120419. From the changelog: * Remove dead link from plugins/teximg. Closes: #664885 * inline: When the pagenames list includes pages that do not exist, skip them. * meta: Export author information in html <meta> tag. Closes: #664779 Thanks, Martin Michlmayr * notifyemail: New plugin, sends email notifications about new and changed pages, and allows subscribing to comments. * Added a "changes" hook. Renamed the "change" hook to "rendered", but the old hook name is called for now for back-compat. * meta: Support keywords header. Closes: #664780 Thanks, Martin Michlmayr * passwordauth: Fix url in password recovery email to be absolute. * httpauth: When it's the only auth method, avoid a pointless and confusing signin form, and go right to the httpauthurl. * rename: Allow rename to be started not from the edit page; return to the renamed page in this case. * remove: Support removing of pages in the transient underlay. (smcv) * inline, trail: The pagenames parameter is now a list of absolute pagenames, not relative wikilink type names. This is necessary to fix a bug, and makes pagenames more consistent with the pagespec used in the pages parameter. (smcv) * link: Fix renaming wikilinks that contain embedded urls. * graphviz: Handle self-links. * trail: Improve CSS, also display trail links at bottom of page, and a bug fix. (smcv) Add dependency on p5-HTML-Tree, suggested by Matthias Rampke in PR pkg/45688. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 pkgsrc/www/ikiwiki/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/ikiwiki/PLIST cvs rdiff -u -r1.76 -r1.77 pkgsrc/www/ikiwiki/distinfo
-rw-r--r--www/ikiwiki/Makefile5
-rw-r--r--www/ikiwiki/PLIST3
-rw-r--r--www/ikiwiki/distinfo5
3 files changed, 9 insertions, 4 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 97840fbb52c..0bdd3352029 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2012/03/20 12:01:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.92.2.1 2012/05/28 09:54:58 spz Exp $
#
-DISTNAME= ikiwiki_3.20120203
+DISTNAME= ikiwiki_3.20120516
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= www textproc
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
@@ -17,6 +17,7 @@ DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Disc
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
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index 533c82cc8c4..c1f597ea5c6 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2012/03/20 12:01:15 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.35.2.1 2012/05/28 09:55:47 spz Exp $
bin/ikiwiki
bin/ikiwiki-calendar
bin/ikiwiki-makerepo
@@ -429,6 +429,7 @@ share/ikiwiki/templates/feedlink.tmpl
share/ikiwiki/templates/googleform.tmpl
share/ikiwiki/templates/inlinepage.tmpl
share/ikiwiki/templates/microblog.tmpl
+share/ikiwiki/templates/notifyemail.tmpl
share/ikiwiki/templates/openid-selector.tmpl
share/ikiwiki/templates/page.tmpl
share/ikiwiki/templates/passwordmail.tmpl
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 704bed2d60b..1eff5ac2922 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.76 2012/03/20 12:01:16 schmonz Exp $
+$NetBSD: distinfo,v 1.76.2.1 2012/05/28 09:54:58 spz Exp $
SHA1 (ikiwiki_3.20120203.tar.gz) = 7b3b8085e4df55be8aeda650065798947412952b
RMD160 (ikiwiki_3.20120203.tar.gz) = 3c080f0554e43579ad8757a9106acf41c0785f3c
Size (ikiwiki_3.20120203.tar.gz) = 2807717 bytes
+SHA1 (ikiwiki_3.20120516.tar.gz) = e4b318b06491e2f2dbe9bdfc33e75615322e06e5
+RMD160 (ikiwiki_3.20120516.tar.gz) = 1d3acfb8eaad19764909af01ade4510ae8e296c8
+Size (ikiwiki_3.20120516.tar.gz) = 2846141 bytes