From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 8 Feb 2018 03:47:10 +0000 (+0000)
Subject: Merge version 9.20.1~dfsg.1-4+rpi2+deb7u2 and 9.20.1~dfsg.1-4+deb7u3 to produce 9... 
X-Git-Tag: archive/raspbian/9.20.1_dfsg.1-4+rpi2+deb7u3^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1236813b9a4165501d6a52a99f8d0ffd1399d3a5;p=p7zip.git

Merge version 9.20.1~dfsg.1-4+rpi2+deb7u2 and 9.20.1~dfsg.1-4+deb7u3 to produce 9.20.1~dfsg.1-4+rpi2+deb7u3
---

1236813b9a4165501d6a52a99f8d0ffd1399d3a5
diff --cc debian/changelog
index e3775d1,3ea801b..66a3521
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- p7zip (9.20.1~dfsg.1-4+rpi2+deb7u2) wheezy-staging; urgency=medium
++p7zip (9.20.1~dfsg.1-4+rpi2+deb7u3) wheezy-staging; urgency=medium
 +
 +  [changes brought forward from 9.20.1~dfsg.1-4+rpi1 by Mike Thompson <mpthompson@gmail.com> at Thu, 31 May 2012 23:53:29 -0700]
 +  * Non-maintainer upload.
 +  * Fixed a pointless 64 bit calculation that was giving the compiler grief.
 +
 +  [changes brought forward from 9.20.1~dfsg.1-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 02 Mar 2013 03:13:12 +0000]
 +  * Revert mpthompsons incorrect change (the 64-bit stuff is needed for
 +    correct sign extension.
 +  * Build with gcc/g++ 4.7 to avoid internal compiler error.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 17 Jun 2016 22:59:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Feb 2018 03:47:10 +0000
++
+ p7zip (9.20.1~dfsg.1-4+deb7u3) wheezy-security; urgency=medium
+ 
+   * Non-maintainer upload by the LTS Security Team.
+   * CVE-2017-17969: fix Heap Buffer Overflow in ZIP Shrink support
+     (Closes: #888297)
+ 
+  -- Antoine Beaupré <anarcat@debian.org>  Fri, 26 Jan 2018 16:00:33 -0500
  
  p7zip (9.20.1~dfsg.1-4+deb7u2) wheezy-security; urgency=high