commit bb0324400fa95f2ad13e16243d6b899ec8c038eb Author: John McQuah <jmcquah@disroot.org> Date: Fri Mar 3 20:55:50 2023 -0500 p7zip: switch to a more actively-maintained fork (16.02 -> 17.05) diff --git a/p7zip/.footprint b/p7zip/.footprint index c3ffa0fdb..b9ff2b667 100644 --- a/p7zip/.footprint +++ b/p7zip/.footprint @@ -5,11 +5,8 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/7zr drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/p7zip/ --rwxr-xr-x root/root usr/lib/p7zip/7z -rwxr-xr-x root/root usr/lib/p7zip/7z.so -rwxr-xr-x root/root usr/lib/p7zip/7zCon.sfx --rwxr-xr-x root/root usr/lib/p7zip/7za --rwxr-xr-x root/root usr/lib/p7zip/7zr drwxr-xr-x root/root usr/lib/p7zip/Codecs/ -rwxr-xr-x root/root usr/lib/p7zip/Codecs/Rar.so drwxr-xr-x root/root usr/share/ diff --git a/p7zip/.signature b/p7zip/.signature index 354caa6b7..c2bfe0862 100644 --- a/p7zip/.signature +++ b/p7zip/.signature @@ -1,9 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/8PrkfBzhlyS6BMTlwRvWDdOWqheGnW5vGAk4ol+5qtB88bhjxHeHZKX/tQE43QJzaUq2LG0xUg6k2mLP0CSAY= -SHA256 (Pkgfile) = 39b8e4161d9b5da5e64568c9749e5b40eae83bd6a436b0394542bfd2ba027b05 -SHA256 (.footprint) = 262106f802932fda3d849240c2989aa139523c2da42d343535491abcc22b26e5 -SHA256 (p7zip_16.02_src_all.tar.bz2) = 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f -SHA256 (CVE-2016-9296.patch) = f9bcbf21d4aa8938861a6cba992df13dec19538286e9ed747ccec6d9a4e8f983 -SHA256 (CVE-2017-17969.patch) = 0027f47eb8633244ac0177c1bb4ed50afa64ab757b34379a4b64ac923b9385b0 -SHA256 (CVE-2018-5996.patch) = 9c92b9060fb0ecc3e754e6440d7773d04bc324d0f998ebcebc263264e5a520df -SHA256 (CPP_Windows_ErrorMsg.patch) = 672584c08006b794a5cc0e8e01e6d67714eacec5f591efb02358ec99afbdcc16 +RWSagIOpLGJF3x6WExw1rZcqha43qKKTJMbNClQ7A5f5XhI+797lKd1+CgT0rDnrqD8NBT6QALGd3iKDkz+KwnXMUf0WFFwUbwk= +SHA256 (Pkgfile) = 992c7a4ced9ce0bf1e21f49f1aeb8ecbf2ff548cdb6f894058ac7778455a7d96 +SHA256 (.footprint) = 4a56314f6083dbde4598f165c96af0252953817f3068abc544f62e1771cb7ac0 +SHA256 (p7zip-17.05.tar.gz) = d2788f892571058c08d27095c22154579dfefb807ebe357d145ab2ddddefb1a6 diff --git a/p7zip/CPP_Windows_ErrorMsg.patch b/p7zip/CPP_Windows_ErrorMsg.patch deleted file mode 100644 index 71de3e9f5..000000000 --- a/p7zip/CPP_Windows_ErrorMsg.patch +++ /dev/null @@ -1,33 +0,0 @@ -This fixes the build with Clang 6.0: - - ../../../../CPP/Windows/ErrorMsg.cpp:24:10: error: case value evaluates to -2147024809, which cannot be narrowed to type 'DWORD' (aka 'unsigned int') [-Wc++11-narrowing] - case E_INVALIDARG : txt = "E_INVALIDARG"; break ; - ^ - ../../../../CPP/Common/MyWindows.h:89:22: note: expanded from macro 'E_INVALIDARG' - #define E_INVALIDARG ((HRESULT)0x80070057L) - ^ - -The HRESULT cast in the macro causes the value to be read as signed int. ---- CPP/Windows/ErrorMsg.cpp.orig 2015-01-18 18:20:28 UTC -+++ CPP/Windows/ErrorMsg.cpp -@@ -15,13 +15,13 @@ UString MyFormatMessage(DWORD errorCode) - - switch(errorCode) { - case ERROR_NO_MORE_FILES : txt = "No more files"; break ; -- case E_NOTIMPL : txt = "E_NOTIMPL"; break ; -- case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; -- case E_ABORT : txt = "E_ABORT"; break ; -- case E_FAIL : txt = "E_FAIL"; break ; -- case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; -- case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; -- case E_INVALIDARG : txt = "E_INVALIDARG"; break ; -+ case (DWORD)(E_NOTIMPL) : txt = "E_NOTIMPL"; break ; -+ case (DWORD)(E_NOINTERFACE) : txt = "E_NOINTERFACE"; break ; -+ case (DWORD)(E_ABORT) : txt = "E_ABORT"; break ; -+ case (DWORD)(E_FAIL) : txt = "E_FAIL"; break ; -+ case (DWORD)(STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; break ; -+ case (DWORD)(E_OUTOFMEMORY) : txt = "E_OUTOFMEMORY"; break ; -+ case (DWORD)(E_INVALIDARG) : txt = "E_INVALIDARG"; break ; - case ERROR_DIRECTORY : txt = "Error Directory"; break ; - default: - txt = strerror(errorCode); diff --git a/p7zip/CVE-2016-9296.patch b/p7zip/CVE-2016-9296.patch deleted file mode 100644 index 773f92a46..000000000 --- a/p7zip/CVE-2016-9296.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./CPP/7zip/Archive/7z/7zIn.cpp.orig 2016-11-21 01:42:29.460901230 +0000 -+++ ./CPP/7zip/Archive/7z/7zIn.cpp 2016-11-21 01:42:57.481197725 +0000 -@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS - if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) - ThrowIncorrect(); - } -- HeadersSize += folders.PackPositions[folders.NumPackStreams]; -+ if (folders.PackPositions) -+ HeadersSize += folders.PackPositions[folders.NumPackStreams]; - return S_OK; - } - diff --git a/p7zip/CVE-2017-17969.patch b/p7zip/CVE-2017-17969.patch deleted file mode 100644 index 9a820af73..000000000 --- a/p7zip/CVE-2017-17969.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: =?utf-8?q?Antoine_Beaupr=C3=A9?= <anarcat@debian.org> -Date: Sun, 28 Jan 2018 21:19:50 +0100 -Subject: backport of the CVE-2017-17969 fix from 7zip 18.00-beta - ---- - CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp -index 80b7e67..4acdce5 100644 ---- a/CPP/7zip/Compress/ShrinkDecoder.cpp -+++ b/CPP/7zip/Compress/ShrinkDecoder.cpp -@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * - { - _stack[i++] = _suffixes[cur]; - cur = _parents[cur]; -- } -+ if (i >= kNumItems) -+ break; -+ } -+ -+ if (i >= kNumItems) -+ break; - - _stack[i++] = (Byte)cur; - lastChar2 = (Byte)cur; diff --git a/p7zip/CVE-2018-5996.patch b/p7zip/CVE-2018-5996.patch deleted file mode 100644 index 6733bff91..000000000 --- a/p7zip/CVE-2018-5996.patch +++ /dev/null @@ -1,221 +0,0 @@ -From: Robert Luberda <robert@debian.org> -Date: Sun, 28 Jan 2018 23:47:40 +0100 -Subject: CVE-2018-5996 - -Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by -applying a few changes from 7Zip 18.00-beta. - -Bug-Debian: https://bugs.debian.org/#888314 ---- - CPP/7zip/Compress/Rar1Decoder.cpp | 13 +++++++++---- - CPP/7zip/Compress/Rar1Decoder.h | 1 + - CPP/7zip/Compress/Rar2Decoder.cpp | 10 +++++++++- - CPP/7zip/Compress/Rar2Decoder.h | 1 + - CPP/7zip/Compress/Rar3Decoder.cpp | 23 ++++++++++++++++++++--- - CPP/7zip/Compress/Rar3Decoder.h | 2 ++ - 6 files changed, 42 insertions(+), 8 deletions(-) - -diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp -index 1aaedcc..68030c7 100644 ---- a/CPP/7zip/Compress/Rar1Decoder.cpp -+++ b/CPP/7zip/Compress/Rar1Decoder.cpp -@@ -29,7 +29,7 @@ public: - }; - */ - --CDecoder::CDecoder(): m_IsSolid(false) { } -+CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { } - - void CDecoder::InitStructures() - { -@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * - InitData(); - if (!m_IsSolid) - { -+ _errorMode = false; - InitStructures(); - InitHuff(); - } -+ -+ if (_errorMode) -+ return S_FALSE; -+ - if (m_UnpackSize > 0) - { - GetFlagsBuf(); -@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream - const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) - { - try { return CodeReal(inStream, outStream, inSize, outSize, progress); } -- catch(const CInBufferException &e) { return e.ErrorCode; } -- catch(const CLzOutWindowException &e) { return e.ErrorCode; } -- catch(...) { return S_FALSE; } -+ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } -+ catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; } -+ catch(...) { _errorMode = true; return S_FALSE; } - } - - STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) -diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h -index 630f089..01b606b 100644 ---- a/CPP/7zip/Compress/Rar1Decoder.h -+++ b/CPP/7zip/Compress/Rar1Decoder.h -@@ -39,6 +39,7 @@ public: - - Int64 m_UnpackSize; - bool m_IsSolid; -+ bool _errorMode; - - UInt32 ReadBits(int numBits); - HRESULT CopyBlock(UInt32 distance, UInt32 len); -diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp -index b3f2b4b..0580c8d 100644 ---- a/CPP/7zip/Compress/Rar2Decoder.cpp -+++ b/CPP/7zip/Compress/Rar2Decoder.cpp -@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20; - static const UInt32 kWindowReservSize = (1 << 22) + 256; - - CDecoder::CDecoder(): -- m_IsSolid(false) -+ m_IsSolid(false), -+ m_TablesOK(false) - { - } - -@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB - - bool CDecoder::ReadTables(void) - { -+ m_TablesOK = false; -+ - Byte levelLevels[kLevelTableSize]; - Byte newLevels[kMaxTableSize]; - m_AudioMode = (ReadBits(1) == 1); -@@ -170,6 +173,8 @@ bool CDecoder::ReadTables(void) - } - - memcpy(m_LastLevels, newLevels, kMaxTableSize); -+ m_TablesOK = true; -+ - return true; - } - -@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * - return S_FALSE; - } - -+ if (!m_TablesOK) -+ return S_FALSE; -+ - UInt64 startPos = m_OutWindowStream.GetProcessedSize(); - while (pos < unPackSize) - { -diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h -index 3a0535c..0e9005f 100644 ---- a/CPP/7zip/Compress/Rar2Decoder.h -+++ b/CPP/7zip/Compress/Rar2Decoder.h -@@ -139,6 +139,7 @@ class CDecoder : - - UInt64 m_PackSize; - bool m_IsSolid; -+ bool m_TablesOK; - - void InitStructures(); - UInt32 ReadBits(unsigned numBits); -diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp -index 3bf2513..6cb8a6a 100644 ---- a/CPP/7zip/Compress/Rar3Decoder.cpp -+++ b/CPP/7zip/Compress/Rar3Decoder.cpp -@@ -92,7 +92,8 @@ CDecoder::CDecoder(): - _writtenFileSize(0), - _vmData(0), - _vmCode(0), -- m_IsSolid(false) -+ m_IsSolid(false), -+ _errorMode(false) - { - Ppmd7_Construct(&_ppmd); - } -@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) - return InitPPM(); - } - -+ TablesRead = false; -+ TablesOK = false; -+ - _lzMode = true; - PrevAlignBits = 0; - PrevAlignCount = 0; -@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) - } - } - } -+ if (InputEofError()) -+ return S_FALSE; -+ - TablesRead = true; - - // original code has check here: -@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) - RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize])); - - memcpy(m_LastLevels, newLevels, kTablesSizesSum); -+ -+ TablesOK = true; -+ - return S_OK; - } - -@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) - PpmEscChar = 2; - PpmError = true; - InitFilters(); -+ _errorMode = false; - } -+ -+ if (_errorMode) -+ return S_FALSE; -+ - if (!m_IsSolid || !TablesRead) - { - bool keepDecompressing; -@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) - bool keepDecompressing; - if (_lzMode) - { -+ if (!TablesOK) -+ return S_FALSE; - RINOK(DecodeLZ(keepDecompressing)) - } - else -@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream - _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1; - return CodeReal(progress); - } -- catch(const CInBufferException &e) { return e.ErrorCode; } -- catch(...) { return S_FALSE; } -+ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } -+ catch(...) { _errorMode = true; return S_FALSE; } - // CNewException is possible here. But probably CNewException is caused - // by error in data stream. - } -diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h -index c130cec..2f72d7d 100644 ---- a/CPP/7zip/Compress/Rar3Decoder.h -+++ b/CPP/7zip/Compress/Rar3Decoder.h -@@ -192,6 +192,7 @@ class CDecoder: - UInt32 _lastFilter; - - bool m_IsSolid; -+ bool _errorMode; - - bool _lzMode; - bool _unsupportedFilter; -@@ -200,6 +201,7 @@ class CDecoder: - UInt32 PrevAlignCount; - - bool TablesRead; -+ bool TablesOK; - - CPpmd7 _ppmd; - int PpmEscChar; diff --git a/p7zip/Pkgfile b/p7zip/Pkgfile index 0b1810ddd..5bddbe3a4 100644 --- a/p7zip/Pkgfile +++ b/p7zip/Pkgfile @@ -1,41 +1,24 @@ -# Description: A port of 7-zip for POSIX systems. -# URL: http://p7zip.sourceforge.net/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: yasm +# Description: 7-zip compression utilities +# URL: https://github.com/p7zip-project/ +# Maintainer: John McQuah, jmcquah at disroot dot org +# Depends on: +# Optional: yasm name=p7zip -version=16.02 -release=3 -source=(https://downloads.sourceforge.net/project/$name/$name/$version/${name}_${version}_src_all.tar.bz2 - CVE-2016-9296.patch - CVE-2017-17969.patch - CVE-2018-5996.patch - CPP_Windows_ErrorMsg.patch) +version=17.05 +release=1 +source=(https://github.com/$name-project/$name/archive/v$version/$name-$version.tar....) build() { - cd ${name}_$version + cd $name-$version + prt-get isinst yasm && cp makefile.linux_amd64_asm makefile.linux \ + || cp makefile.linux_amd64 makefile.linux - # https://nvd.nist.gov/vuln/detail/CVE-2016-9296 - patch -p1 -i $SRC/CVE-2016-9296.patch + make -j ${JOBS:-1} all3 - # https://nvd.nist.gov/vuln/detail/CVE-2017-17969 - patch -p1 -i $SRC/CVE-2017-17969.patch - - # https://nvd.nist.gov/vuln/detail/CVE-2018-5996 - patch -p1 -i $SRC/CVE-2018-5996.patch - - # fix build against gcc 10 - patch -p0 -i $SRC/CPP_Windows_ErrorMsg.patch - - sed -i 's/ -pipe / /g' makefile.* - cp makefile.linux_amd64_asm makefile.machine - - make all3 OPTFLAGS="$CFLAGS" - - make install \ - DEST_DIR="$PKG" \ - DEST_HOME=/usr \ - DEST_MAN=/usr/share/man - - rm -r $PKG/usr/share/doc + mkdir -p $PKG/usr/bin $PKG/usr/share/man $PKG/usr/lib/$name + install -m 0755 bin/{7z,7za,7zr} $PKG/usr/bin + install -m 0755 bin/{7z.so,7zCon.sfx} $PKG/usr/lib/$name + cp -r bin/Codecs $PKG/usr/lib/$name + cp -r man1 $PKG/usr/share/man }