Release to wheezy-security

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 4d6b03dc9b0f20ce1233b21a986da003775b4b7b..1f4471a4ddf221a92fa6582594c38cc76a79ef2b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-ikiwiki (3.20120629.2+deb7u2) UNRELEASED; urgency=medium
+ikiwiki (3.20120629.2+deb7u2) wheezy-security; urgency=medium
 
+  [ Simon McVittie ]
   * Security: force CGI::FormBuilder->field to scalar context where
     necessary, avoiding unintended function argument injection
     analogous to CVE-2014-1572.
@@ -47,8 +48,17 @@ ikiwiki (3.20120629.2+deb7u2) UNRELEASED; urgency=medium
   * Split CFLAGS into words when building wrapper, fixing build-time test
     failure. Closes: #682237 (patch from Joey Hess, backported from
     3.20120630)
+  * In the CGI wrapper, incorporate $config{ENV} into the environment
+    before executing Perl code, so that PERL5LIB can point to a
+    non-system-wide installation of IkiWiki. Some build-time tests rely
+    on this, in particular t/git-cgi.t.
+    (patch from Lafayette Chamber Singers Webmaster, backported from
+    3.20140916)
+
+  [ Emilio Pozuelo Monfort ]
+  * Upload to wheezy-security.
 
- -- Simon McVittie <smcv@debian.org>  Wed, 11 Jan 2017 15:22:38 +0000
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 31 Jan 2017 19:00:50 +0100
 
 ikiwiki (3.20120629.2+deb7u1) wheezy-security; urgency=medium