From 231902884170c763ac17dd4b98a6719359e30915 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 16 Jul 2016 08:13:11 +0200
Subject: [PATCH] p7zip: update to 16.02.

---
 srcpkgs/p7zip/patches/CVE-2016-2334.patch | 24 -----------------------
 srcpkgs/p7zip/patches/CVE-2016-2335.patch | 17 ----------------
 srcpkgs/p7zip/template                    |  6 +++---
 3 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/p7zip/patches/CVE-2016-2334.patch
 delete mode 100644 srcpkgs/p7zip/patches/CVE-2016-2335.patch

diff --git a/srcpkgs/p7zip/patches/CVE-2016-2334.patch b/srcpkgs/p7zip/patches/CVE-2016-2334.patch
deleted file mode 100644
index 0da72ef9a83..00000000000
--- a/srcpkgs/p7zip/patches/CVE-2016-2334.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: CPP/7zip/Archive/HfsHandler.cpp
-===================================================================
---- CPP/7zip/Archive/HfsHandler.cpp.orig
-+++ CPP/7zip/Archive/HfsHandler.cpp
-@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFo
-       item.GroupID = Get32(r + 0x24);
-       item.AdminFlags = r[0x28];
-       item.OwnerFlags = r[0x29];
-+      */
-       item.FileMode = Get16(r + 0x2A);
-+      /*
-       item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount
-       item.FileType = Get32(r + 0x30);
-       item.FileCreator = Get32(r + 0x34);
-@@ -1572,6 +1574,9 @@ HRESULT CHandler::ExtractZlibFile(
- 
-     UInt32 size = GetUi32(tableBuf + i * 8 + 4);
- 
-+    if (size > buf.Size() || size > kCompressionBlockSize + 1)
-+        return S_FALSE;
-+
-     RINOK(ReadStream_FALSE(inStream, buf, size));
- 
-     if ((buf[0] & 0xF) == 0xF)
diff --git a/srcpkgs/p7zip/patches/CVE-2016-2335.patch b/srcpkgs/p7zip/patches/CVE-2016-2335.patch
deleted file mode 100644
index be0c33234f2..00000000000
--- a/srcpkgs/p7zip/patches/CVE-2016-2335.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: CPP/7zip/Archive/Udf/UdfIn.cpp
-===================================================================
---- CPP/7zip/Archive/Udf/UdfIn.cpp.orig
-+++ CPP/7zip/Archive/Udf/UdfIn.cpp
-@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int vol
-     return S_FALSE;
-   CFile &file = Files.Back();
-   const CLogVol &vol = LogVols[volIndex];
--  CPartition &partition = Partitions[vol.PartitionMaps[lad.Location.PartitionRef].PartitionIndex];
-+  unsigned partitionRef = lad.Location.PartitionRef;
-+
-+  if (partitionRef >= vol.PartitionMaps.Size())
-+  	return S_FALSE;
-+  CPartition &partition = Partitions[vol.PartitionMaps[partitionRef].PartitionIndex];
- 
-   UInt32 key = lad.Location.Pos;
-   UInt32 value;
diff --git a/srcpkgs/p7zip/template b/srcpkgs/p7zip/template
index f9b6fa43624..e8be01de5e9 100644
--- a/srcpkgs/p7zip/template
+++ b/srcpkgs/p7zip/template
@@ -1,7 +1,7 @@
 # Template file for 'p7zip'
 pkgname=p7zip
-version=15.14.1
-revision=2
+version=16.02
+revision=1
 wrksrc="${pkgname}_${version}"
 hostmakedepends="yasm nasm"
 short_desc="Command-line version of the 7zip compressed file archive"
@@ -9,7 +9,7 @@ homepage="http://p7zip.sourceforge.net/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2"
-checksum=699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4
+checksum=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f
 
 do_configure() {
 	case "$XBPS_TARGET_MACHINE" in