summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2017-07-27 15:51:32 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2017-07-27 15:51:32 -0500
commit52a964b3feba12afc6f4288ea9869e74faada7b1 (patch)
tree55d67d232fa7cdc4f6499c69b78516495d48cb6e
parent0f48cdc2b554f874c980f7a958affa5edaab9dd2 (diff)
downloadabslibre-52a964b3feba12afc6f4288ea9869e74faada7b1.tar.gz
abslibre-52a964b3feba12afc6f4288ea9869e74faada7b1.tar.bz2
abslibre-52a964b3feba12afc6f4288ea9869e74faada7b1.zip
p7zip-16.02-3.parabola2: rebuild
-rw-r--r--libre/p7zip/CVE-2016-2334.patch24
-rw-r--r--libre/p7zip/CVE-2016-2335.patch17
-rw-r--r--libre/p7zip/PKGBUILD5
3 files changed, 3 insertions, 43 deletions
diff --git a/libre/p7zip/CVE-2016-2334.patch b/libre/p7zip/CVE-2016-2334.patch
deleted file mode 100644
index 1eb5163cb..000000000
--- a/libre/p7zip/CVE-2016-2334.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp
-===================================================================
---- p7zip_15.14.1.orig/CPP/7zip/Archive/HfsHandler.cpp
-+++ p7zip_15.14.1/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/libre/p7zip/CVE-2016-2335.patch b/libre/p7zip/CVE-2016-2335.patch
deleted file mode 100644
index a00d6a386..000000000
--- a/libre/p7zip/CVE-2016-2335.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp
-===================================================================
---- p7zip_15.14.1.orig/CPP/7zip/Archive/Udf/UdfIn.cpp
-+++ p7zip_15.14.1/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/libre/p7zip/PKGBUILD b/libre/p7zip/PKGBUILD
index 254611af3..f7fbae290 100644
--- a/libre/p7zip/PKGBUILD
+++ b/libre/p7zip/PKGBUILD
@@ -5,12 +5,13 @@
# Contributor (Arch): Hugo Doria <hugo@archlinux.org>
# Contributor (Arch): TuxSpirit<tuxspirit@archlinux.fr> 2007/11/17 21:22:36 UTC
# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
_pkgname=p7zip-libre
pkgname=p7zip
pkgver=16.02
-pkgrel=3.parabola1
+pkgrel=3.parabola2
pkgdesc="Command-line file archiver with high compression ratio"
arch=('i686' 'x86_64' 'armv7h')
url="http://p7zip.sourceforge.net/"