wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-01 18:32:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

p7zip: update to 16.02.

Browse source
This commit is contained in:
Juan RP 2016-07-16 08:13:11 +02:00
parent 6a238f0c1a
commit 2319028841
3 changed files with 3 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
srcpkgs/p7zip/patches/CVE-2016-2334.patch
View file

@ -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)

17
srcpkgs/p7zip/patches/CVE-2016-2335.patch
View file

@ -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;

6
srcpkgs/p7zip/template
View file

@ -1,7 +1,7 @@
# Template file for 'p7zip' # Template file for 'p7zip'
pkgname=p7zip pkgname=p7zip
version=15.14.1 version=16.02
revision=2 revision=1
wrksrc="${pkgname}_${version}" wrksrc="${pkgname}_${version}"
hostmakedepends="yasm nasm" hostmakedepends="yasm nasm"
short_desc="Command-line version of the 7zip compressed file archive" short_desc="Command-line version of the 7zip compressed file archive"
@ -9,7 +9,7 @@ homepage="http://p7zip.sourceforge.net/"
license="LGPL-2.1" license="LGPL-2.1"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2"
checksum=699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4 checksum=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f
do_configure() { do_configure() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in