From: Simon McVittie <smcv@debian.org>
Date: Thu, 28 Jul 2016 09:48:04 +0000 (+0100)
Subject: Merge branch 'master' into debian-jessie-backports
X-Git-Tag: debian/3.20170111_bpo8+1~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7269c9af3e55dc478792d8ea010ab9b794190a66?ds=sidebyside;hp=-c

Merge branch 'master' into debian-jessie-backports
---

7269c9af3e55dc478792d8ea010ab9b794190a66
diff --combined debian/changelog
index ee8c3955e,40045d17a..3327be340
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,22 @@@
+ ikiwiki (3.20160728) unstable; urgency=medium
+ 
+   * Explicitly remove current working directory from Perl's library
+     search path, mitigating CVE-2016-1238 (see #588017)
+   * wrappers: allocate new environment dynamically, so we won't overrun
+     the array if third-party plugins add multiple environment variables.
+   * Standards-Version: 3.9.8 (no changes required)
+ 
+  -- Simon McVittie <smcv@debian.org>  Thu, 28 Jul 2016 10:41:56 +0100
+ 
 +ikiwiki (3.20160509~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports
 +    - debian/tests/control: set INSTALLED_TESTS=1 here,
 +      pkg-perl-autopkgtest in jessie didn't support
 +      debian/tests/pkg-perl/smoke-env
 +
 + -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 22:19:05 +0100
 +
  ikiwiki (3.20160509) unstable; urgency=high
  
    [ Amitai Schlair ]
@@@ -27,14 -28,6 +37,14 @@@
  
   -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 21:57:09 +0100
  
 +ikiwiki (3.20160506~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports
 +  * debian/tests/control: set INSTALLED_TESTS=1 here, pkg-perl-autopkgtest
 +    in jessie didn't support debian/tests/pkg-perl/smoke-env
 +
 + -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 08:58:18 +0100
 +
  ikiwiki (3.20160506) unstable; urgency=medium
  
    [ Simon McVittie ]
@@@ -70,12 -63,6 +80,12 @@@
  
   -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 07:54:26 +0100
  
 +ikiwiki (3.20160121~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 10:18:07 +0000
 +
  ikiwiki (3.20160121) unstable; urgency=medium
  
    [ Amitai Schlair ]
@@@ -127,12 -114,6 +137,12 @@@
  
   -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 09:53:07 +0000
  
 +ikiwiki (3.20150614~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports, no source changes (Closes: #807452)
 +
 + -- Simon McVittie <smcv@debian.org>  Mon, 18 Jan 2016 07:03:11 +0000
 +
  ikiwiki (3.20150614) unstable; urgency=medium
  
    * inline: change default sort order from age to "age title" for