cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 16.02.

Browse Source 
Remove patches for CVE-2016-2334 and CVE-2016-2335 that were integrated
upstream.
This commit is contained in:
Raphael Kubo da Costa 2016-11-30 12:44:03 +00:00
parent 374f7ed42c
commit ea69a2179c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=427423
4 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archivers/p7zip/Makefile
View File

@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= p7zip
PORTVERSION= 15.14
PORTREVISION?= 2
PORTVERSION= 16.02
PORTREVISION?= 0
CATEGORIES= archivers
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all

5
archivers/p7zip/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (p7zip_15.14_src_all.tar.bz2) = b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8
SIZE (p7zip_15.14_src_all.tar.bz2) = 4147609
TIMESTAMP = 1480508712
SHA256 (p7zip_16.02_src_all.tar.bz2) = 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f
SIZE (p7zip_16.02_src_all.tar.bz2) = 4239909

25
archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp
View File

@ -1,25 +0,0 @@
Patch for CVE-2016-2334.
Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/
--- CPP/7zip/Archive/HfsHandler.cpp.orig 2015-06-19 10:52:08 UTC
+++ 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)

18
archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp
View File

@ -1,18 +0,0 @@
Patch for CVE-2016-2335.
Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/
--- CPP/7zip/Archive/Udf/UdfIn.cpp.orig 2015-11-20 20:40:08 UTC
+++ 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;