Update to 3.20171001. From the changelog:

[ Joey Hess ]
* htmlscrubber: Add support for the video tag's loop and muted
  attributes. Those were not in the original html5 spec, but have been
  added in the whatwg html living standard and have wide browser support.
* emailauth, passwordauth: Avoid leaving cgisess_* files in the
  system temp directory.

[ Simon McVittie ]
* core: Don't decode the result of strftime if it is already tagged as
  UTF-8, as it might be since Perl >= 5.21.1. (Closes: #869240)
* img: Strip metadata from resized images when the deterministic config
  option is set. Thanks, intrigeri
* receive: Avoid asprintf() in IkiWiki::Receive, to avoid implicit
  declaration, potential misbehaviour on 64-bit platforms, and lack
  of portability to non-GNU platforms
* t: Add a regression test for untrusted git push
* receive: Fix untrusted git push with git (>= 2.11) by passing through
  the necessary environment variables to make the quarantine area work
* debian: Declare compliance with Debian Policy 4.1.1

[ Amitai Schleier ]
* l10n: Fix the build with po4a 0.52, by ensuring that msgstr ends
  with a newline if and only if msgid does

5 files changed, 8 insertions, 53 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 1510e1b1ec6..97dc44fb3e2 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.149 2017/06/24 13:10:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.150 2017/10/02 03:27:29 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20170622
+DISTNAME=		ikiwiki_3.20171001
 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 ce39508300e..c33185129e1 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2016/01/21 18:36:38 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.46 2017/10/02 03:27:29 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-comment
@@ -137,7 +137,6 @@ share/ikiwiki/examples/softwaresite/Makefile
 share/ikiwiki/examples/softwaresite/bugs.mdwn
 share/ikiwiki/examples/softwaresite/bugs/done.mdwn
 share/ikiwiki/examples/softwaresite/bugs/fails_to_frobnicate.mdwn
-share/ikiwiki/examples/softwaresite/bugs/hghg.mdwn
 share/ikiwiki/examples/softwaresite/bugs/needs_more_bugs.mdwn
 share/ikiwiki/examples/softwaresite/contact.mdwn
 share/ikiwiki/examples/softwaresite/doc.mdwn
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 953b1fc6cbf..98eaf2b89ce 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.122 2017/09/20 02:57:31 schmonz Exp $
+$NetBSD: distinfo,v 1.123 2017/10/02 03:27:29 schmonz Exp $
 
-SHA1 (ikiwiki_3.20170622.tar.xz) = 96e7582c93a3db23ac9600b5e24bff71a6dbc4be
-RMD160 (ikiwiki_3.20170622.tar.xz) = 97fd8872a5782592fa29f31eae96f8bc15573ca9
-SHA512 (ikiwiki_3.20170622.tar.xz) = f3d257a4aac3b5009462312381ee4904fe5032a0408a4988cdea3e1997f94d2e13bae0dd5b9228623ccd001b37539c33135db56025a1b46df6b6955502e9e9eb
-Size (ikiwiki_3.20170622.tar.xz) = 2633776 bytes
-SHA1 (patch-po_underlays_basewiki_ikiwiki_wikilink.da.po) = de90c6a3914545c706ffb5b9ec7249dc00bc6460
-SHA1 (patch-po_underlays_directives_ikiwiki_directive_meta.de.po) = 5a7f3e3bb4d4eca55379beb564974582f67985b2
+SHA1 (ikiwiki_3.20171001.tar.xz) = 9a9ca402e38abed89449609ddfc988ce3c60b316
+RMD160 (ikiwiki_3.20171001.tar.xz) = 3dff6be4423cd890bd434816634b2d13be996165
+SHA512 (ikiwiki_3.20171001.tar.xz) = 1f5c5a48aa95e6e3898fdb40826f90d554ff328c367133e69a2a2da4c9286e0e54ba2f2dcd57ff452fa3105c92b4d72297d771688661fb8ecf22b7a0cf78bd97
+Size (ikiwiki_3.20171001.tar.xz) = 2638780 bytes
diff --git a/www/ikiwiki/patches/patch-po_underlays_basewiki_ikiwiki_wikilink.da.po b/www/ikiwiki/patches/patch-po_underlays_basewiki_ikiwiki_wikilink.da.po
deleted file mode 100644
index 862a3fe4454..00000000000
--- a/www/ikiwiki/patches/patch-po_underlays_basewiki_ikiwiki_wikilink.da.po
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-po_underlays_basewiki_ikiwiki_wikilink.da.po,v 1.1 2017/09/20 02:57:32 schmonz Exp $
-
-Add upstream patch to fix build with po4a 0.52.
-
---- po/underlays/basewiki/ikiwiki/wikilink.da.po.orig	2017-06-22 08:24:57.000000000 +0000
-+++ po/underlays/basewiki/ikiwiki/wikilink.da.po
-@@ -31,9 +31,9 @@ msgid ""
- "[[WikiLink]], just put the name of the page to link to in double brackets.  "
- "For example `\\[[WikiLink]]`."
- msgstr ""
--"WikiLinks gør det muligt enkelt at lave henvisninger (linke) mellem sider i\n"
--"wikien. Opret en [[WikiLink]] ved at skrive siden du vil henvise til med\n"
--"dobbelte klammer omkring. Ekempelvis `\\[[WikiLink]]`.\n"
-+"WikiLinks gør det muligt enkelt at lave henvisninger (linke) mellem sider i "
-+"wikien. Opret en [[WikiLink]] ved at skrive siden du vil henvise til med "
-+"dobbelte klammer omkring. Ekempelvis `\\[[WikiLink]]`."
- 
- #. type: Plain text
- msgid ""
diff --git a/www/ikiwiki/patches/patch-po_underlays_directives_ikiwiki_directive_meta.de.po b/www/ikiwiki/patches/patch-po_underlays_directives_ikiwiki_directive_meta.de.po
deleted file mode 100644
index bc8d9a1cd0d..00000000000
--- a/www/ikiwiki/patches/patch-po_underlays_directives_ikiwiki_directive_meta.de.po
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-po_underlays_directives_ikiwiki_directive_meta.de.po,v 1.1 2017/09/20 02:57:32 schmonz Exp $
-
-Add upstream patch to fix build with po4a 0.52.
-
---- po/underlays/directives/ikiwiki/directive/meta.de.po.orig	2017-06-22 08:24:57.000000000 +0000
-+++ po/underlays/directives/ikiwiki/directive/meta.de.po
-@@ -71,7 +71,7 @@ msgid ""
- "  page name.\n"
- msgstr ""
- "  Überschreibt den Titel der Seite, der normalerweise dem Namen\n"
--"  der Seite entspricht."
-+"  der Seite entspricht.\n"
- 
- #. type: Plain text
- #, no-wrap
-@@ -362,7 +362,6 @@ msgid ""
- msgstr ""
- "  In beiden Fällen kann ein anzuspringender Anker auf der Zielseite\n"
- "  angegeben werden, indem die übliche `#ANKER`-Syntax verwendet wird.\n"
--" "
- 
- #. type: Bullet: '* '
- msgid "robots"