diff options
author | schmonz <schmonz@pkgsrc.org> | 2016-05-07 05:58:53 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2016-05-07 05:58:53 +0000 |
commit | 99005aa5b73a39915a949be91be8a76096c7b8a8 (patch) | |
tree | 4f9930e5aa97527471cb3cb39751a6e05d8529dc /www/ikiwiki | |
parent | a2a34dc465892581c487f13628a53171947cbf04 (diff) | |
download | pkgsrc-99005aa5b73a39915a949be91be8a76096c7b8a8.tar.gz |
Update to 3.20160506. From the changelog:
[ Simon McVittie ]
* img: stop ImageMagick trying to be clever if filenames contain a colon,
avoiding mis-processing
* HTML-escape error messages, in one case avoiding potential cross-site
scripting (OVE-20160505-0012)
* Mitigate ImageMagick vulnerabilities such as CVE-2016-3714:
- img: force common Web formats to be interpreted according to extension,
so that "allowed_attachments: '*.jpg'" does what one might expect
- img: restrict to JPEG, PNG and GIF images by default, again mitigating
CVE-2016-3714 and similar vulnerabilities
- img: check that the magic number matches what we would expect from
the extension before giving common formats to ImageMagick
* d/control: use https for Homepage
* d/control: add Vcs-Browser
[ Joey Hess ]
* img: Add back support for SVG images, bypassing ImageMagick and
simply passing the SVG through to the browser, which is supported by all
commonly used browsers these days.
SVG scaling by img directives has subtly changed; where before
size=wxh would preserve aspect ratio, this cannot be done when passing
them through and so specifying both a width and height can change
the SVG's aspect ratio.
* loginselector: When only openid and emailauth are enabled, but
passwordauth is not, avoid showing a "Other" box which opens an
empty form.
[ Amitai Schlair ]
* mdwn: Process .md like .mdwn, but disallow web creation.
[ Florian Wagner ]
* git: Correctly handle filenames starting with a dash in add/rm/mv.
-- Simon McVittie <smcv@debian.org> Fri, 06 May 2016 07:54:26 +0100
Diffstat (limited to 'www/ikiwiki')
-rw-r--r-- | www/ikiwiki/Makefile | 4 | ||||
-rw-r--r-- | www/ikiwiki/distinfo | 11 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-t_cvs.t | 19 |
3 files changed, 7 insertions, 27 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 97063b27fa9..c673988d6e8 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.138 2016/03/06 19:30:06 schmonz Exp $ +# $NetBSD: Makefile,v 1.139 2016/05/07 05:58:53 schmonz Exp $ # -DISTNAME= ikiwiki_3.20160121 +DISTNAME= ikiwiki_3.20160506 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index ca97dfc2e0b..657b4c735cd 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.111 2016/03/06 19:30:06 schmonz Exp $ +$NetBSD: distinfo,v 1.112 2016/05/07 05:58:53 schmonz Exp $ -SHA1 (ikiwiki_3.20160121.tar.gz) = add644497a852e52d87b03fa8eafa496a5ecd71a -RMD160 (ikiwiki_3.20160121.tar.gz) = e9aadc3a36077d0c1fbb9333a1b65d77cc7b56dd -SHA512 (ikiwiki_3.20160121.tar.gz) = bbbf37e6c9413db158c80ee85953019f4dc0bb862ecc06b934c037372ffcb414e8a8927cf8bd19585fb4069849679ac16b6ea79fe6601ab11be5a4702224e1c9 -Size (ikiwiki_3.20160121.tar.gz) = 3403392 bytes -SHA1 (patch-t_cvs.t) = f4076b1670e5a3b8e10f23a4c714eb230f9d28b4 +SHA1 (ikiwiki_3.20160506.tar.gz) = 1427f7e2cae0afb828b5c6e8121057b9b7309f2b +RMD160 (ikiwiki_3.20160506.tar.gz) = fb9d24b291a4f6c7d8c721d64e89c20c22885b49 +SHA512 (ikiwiki_3.20160506.tar.gz) = 6f0268414b00fd42a17af7720b6d296c5dba9863bf5b4119c6308091d664c57e472ce37e6d150cc701bdeeb69e743a03a3e6ef9f2ae9311ecc9a8c558f36e784 +Size (ikiwiki_3.20160506.tar.gz) = 3434284 bytes diff --git a/www/ikiwiki/patches/patch-t_cvs.t b/www/ikiwiki/patches/patch-t_cvs.t deleted file mode 100644 index 6f6258323a4..00000000000 --- a/www/ikiwiki/patches/patch-t_cvs.t +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-t_cvs.t,v 1.1 2016/03/06 19:30:06 schmonz Exp $ - -From upstream git (b422295): Fix CVS tests by uninverting $installed. - ---- t/cvs.t.orig 2016-01-21 09:53:28.000000000 +0000 -+++ t/cvs.t -@@ -609,10 +609,10 @@ sub _generate_and_configure_post_commit_ - - require IkiWiki::Wrapper; - if ($installed) { -- $IkiWiki::program_to_wrap = 'ikiwiki.out'; -+ $IkiWiki::program_to_wrap = `which ikiwiki`; - } - else { -- $IkiWiki::program_to_wrap = `which ikiwiki`; -+ $IkiWiki::program_to_wrap = './ikiwiki.out'; - } - # XXX substitute its interpreter to Makefile's $(PERL) - # XXX best solution: do this to all scripts during build |