[wesnoth] 01/02: Merge remote-tracking branch 'origin/wheezy' into squeeze-backports

[Vincent Cheng]

This is an automated email from the git hooks/post-receive script.

vcheng pushed a commit to branch squeeze-backports
in repository wesnoth.

commit 031d647581c52f7c6117f58554f38dc53bb78921
Merge: 50662c8 b91f309
Author: Vincent Cheng <vcheng at debian.org>
Date:   Tue Jul 7 02:48:19 2015 -0700

    Merge remote-tracking branch 'origin/wheezy' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                                 |  7 +++++++
 debian/patches/CVE-2015-5069-CVE-2015-5070.patch | 23 +++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 31 insertions(+)

diff --cc debian/changelog
index ee80aff,22ad87a..92d5141
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
+ wesnoth-1.10 (1:1.10.3-3+deb7u2) wheezy; urgency=medium
+ 
+   * Security fix: Disallowed inclusion of .pbl files from WML, independent of
+     extension case (CVE-2015-5069, CVE-2015-5070).
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Wed, 01 Jul 2015 13:30:12 -0700
+ 
 +wesnoth-1.10 (1:1.10.3-3+deb7u1~bpo60+1) squeeze-backports; urgency=medium
 +
 +  * Rebuild for squeeze-backports.
 +  * Revert 9f59ef52d8 because squeeze does call the file
 +    DroidSansFallback.ttf.
 +
 + -- Rhonda D'Vine <rhonda at debian.org>  Fri, 10 Apr 2015 10:54:36 +0200
 +
  wesnoth-1.10 (1:1.10.3-3+deb7u1) wheezy-security; urgency=high
  
    * Pull af61f9fd from upstream to fix "Private file disclosure through

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wesnoth.git