From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 23/62] 7zip: Fix build against GCC 10 Date: Sun, 16 Aug 2020 10:29:14 +0000 Message-ID: <20200816102953.3881-23-michael.tremer@ipfire.org> In-Reply-To: <20200816102953.3881-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6817530625522803081==" List-Id: --===============6817530625522803081== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- lfs/7zip | 4 +- .../p7zip-16.02-consolidated_fixes-1.patch | 466 ++++++++++++++++++ src/patches/p7zip_change_install_folder.patch | 10 - 3 files changed, 469 insertions(+), 11 deletions(-) create mode 100644 src/patches/p7zip-16.02-consolidated_fixes-1.patch delete mode 100644 src/patches/p7zip_change_install_folder.patch diff --git a/lfs/7zip b/lfs/7zip index d2f819256..443119b6e 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -36,6 +36,8 @@ PAK_VER =3D 7 =20 DEPS =3D =20 +CFLAGS +=3D -fcommon + ############################################################################= ### # Top-level Rules ############################################################################= ### @@ -77,7 +79,7 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip= _change_install_folder.patch + cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip= -16.02-consolidated_fixes-1.patch cd $(DIR_APP) && make 7z $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/p7zip-16.02-consolidated_fixes-1.patch b/src/patches= /p7zip-16.02-consolidated_fixes-1.patch new file mode 100644 index 000000000..3f6da9cde --- /dev/null +++ b/src/patches/p7zip-16.02-consolidated_fixes-1.patch @@ -0,0 +1,466 @@ +Submitted By: Bruce Dubbs +Date: 2020-05-12 +Initial Package Version: 16.02 +Upstream Status: Unknown. +Origin: Arch and Fedora +Description: Updates for CVE-2016-9296, CVE-2017-17969, CVE-2018= -5996, + CVE-2018-10115 and GCC10. + +diff -Naur p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp p7zip_16.02/CPP/7zi= p/Archive/7z/7zIn.cpp +--- p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp 2016-05-20 03:20:03.000000= 000 -0500 ++++ p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp 2020-05-12 15:34:34.513287566 -= 0500 +@@ -1097,7 +1097,8 @@ + if (CrcCalc(data, unpackSize) !=3D folders.FolderCRCs.Vals[i]) + ThrowIncorrect(); + } +- HeadersSize +=3D folders.PackPositions[folders.NumPackStreams]; ++ if (folders.PackPositions) ++ HeadersSize +=3D folders.PackPositions[folders.NumPackStreams]; + return S_OK; + } +=20 +diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp p7zip_16.02/CP= P/7zip/Compress/Rar1Decoder.cpp +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp 2015-09-01 13:04:52.0= 00000000 -0500 ++++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp 2020-05-12 15:35:00.897548= 643 -0500 +@@ -29,7 +29,7 @@ + }; + */ +=20 +-CDecoder::CDecoder(): m_IsSolid(false) { } ++CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), _errorMode(fal= se) { } +=20 + void CDecoder::InitStructures() + { +@@ -345,7 +345,7 @@ +=20 + void CDecoder::InitData() + { +- if (!m_IsSolid) ++ if (!_isSolid) + { + AvrPlcB =3D AvrLn1 =3D AvrLn2 =3D AvrLn3 =3D NumHuf =3D Buf60 =3D 0; + AvrPlc =3D 0x3500; +@@ -391,6 +391,11 @@ + if (inSize =3D=3D NULL || outSize =3D=3D NULL) + return E_INVALIDARG; +=20 ++ if (_isSolid && !_solidAllowed) ++ return S_FALSE; ++ ++ _solidAllowed =3D false; ++ + if (!m_OutWindowStream.Create(kHistorySize)) + return E_OUTOFMEMORY; + if (!m_InBitStream.Create(1 << 20)) +@@ -398,17 +403,22 @@ +=20 + m_UnpackSize =3D (Int64)*outSize; + m_OutWindowStream.SetStream(outStream); +- m_OutWindowStream.Init(m_IsSolid); ++ m_OutWindowStream.Init(_isSolid); + m_InBitStream.SetStream(inStream); + m_InBitStream.Init(); +=20 + // CCoderReleaser coderReleaser(this); + InitData(); +- if (!m_IsSolid) ++ if (!_isSolid) + { ++ _errorMode =3D false; + InitStructures(); + InitHuff(); + } ++ ++ if (_errorMode) ++ return S_FALSE; ++ + if (m_UnpackSize > 0) + { + GetFlagsBuf(); +@@ -470,6 +480,7 @@ + } + if (m_UnpackSize < 0) + return S_FALSE; ++ _solidAllowed =3D true; + return m_OutWindowStream.Flush(); + } +=20 +@@ -477,16 +488,16 @@ + const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *pro= gress) + { + 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 =3D true; return e.ErrorC= ode; } ++ catch(const CLzOutWindowException &e) { _errorMode =3D true; return e.Err= orCode; } ++ catch(...) { _errorMode =3D true; return S_FALSE; } + } +=20 + STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) + { + if (size < 1) + return E_INVALIDARG; +- m_IsSolid =3D ((data[0] & 1) !=3D 0); ++ _isSolid =3D ((data[0] & 1) !=3D 0); + return S_OK; + } +=20 +diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h p7zip_16.02/CPP/= 7zip/Compress/Rar1Decoder.h +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h 2014-12-21 06:44:00.000= 000000 -0600 ++++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h 2020-05-12 15:35:00.89754864= 3 -0500 +@@ -38,7 +38,9 @@ + UInt32 LastLength; +=20 + Int64 m_UnpackSize; +- bool m_IsSolid; ++ bool _isSolid; ++ bool _solidAllowed; ++ bool _errorMode; +=20 + UInt32 ReadBits(int numBits); + HRESULT CopyBlock(UInt32 distance, UInt32 len); +diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp p7zip_16.02/CP= P/7zip/Compress/Rar2Decoder.cpp +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp 2015-10-03 03:49:14.0= 00000000 -0500 ++++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp 2020-05-12 15:35:00.897548= 643 -0500 +@@ -80,7 +80,9 @@ + static const UInt32 kWindowReservSize =3D (1 << 22) + 256; +=20 + CDecoder::CDecoder(): +- m_IsSolid(false) ++ _isSolid(false), ++ _solidAllowed(false), ++ m_TablesOK(false) + { + } +=20 +@@ -100,6 +102,8 @@ +=20 + bool CDecoder::ReadTables(void) + { ++ m_TablesOK =3D false; ++ + Byte levelLevels[kLevelTableSize]; + Byte newLevels[kMaxTableSize]; + m_AudioMode =3D (ReadBits(1) =3D=3D 1); +@@ -170,6 +174,8 @@ + } + =20 + memcpy(m_LastLevels, newLevels, kMaxTableSize); ++ m_TablesOK =3D true; ++ + return true; + } +=20 +@@ -315,6 +321,10 @@ + if (inSize =3D=3D NULL || outSize =3D=3D NULL) + return E_INVALIDARG; +=20 ++ if (_isSolid && !_solidAllowed) ++ return S_FALSE; ++ _solidAllowed =3D false; ++ + if (!m_OutWindowStream.Create(kHistorySize)) + return E_OUTOFMEMORY; + if (!m_InBitStream.Create(1 << 20)) +@@ -325,12 +335,12 @@ + UInt64 pos =3D 0, unPackSize =3D *outSize; + =20 + m_OutWindowStream.SetStream(outStream); +- m_OutWindowStream.Init(m_IsSolid); ++ m_OutWindowStream.Init(_isSolid); + m_InBitStream.SetStream(inStream); + m_InBitStream.Init(); +=20 + // CCoderReleaser coderReleaser(this); +- if (!m_IsSolid) ++ if (!_isSolid) + { + InitStructures(); + if (unPackSize =3D=3D 0) +@@ -338,12 +348,16 @@ + if (m_InBitStream.GetProcessedSize() + 2 <=3D m_PackSize) // test it:= probably incorrect; + if (!ReadTables()) + return S_FALSE; ++ _solidAllowed =3D true; + return S_OK; + } + if (!ReadTables()) + return S_FALSE; + } +=20 ++ if (!m_TablesOK) ++ return S_FALSE; ++ + UInt64 startPos =3D m_OutWindowStream.GetProcessedSize(); + while (pos < unPackSize) + { +@@ -378,6 +392,9 @@ +=20 + if (!ReadLastTables()) + return S_FALSE; ++ ++ _solidAllowed =3D true; ++ + return m_OutWindowStream.Flush(); + } +=20 +@@ -394,7 +411,7 @@ + { + if (size < 1) + return E_INVALIDARG; +- m_IsSolid =3D ((data[0] & 1) !=3D 0); ++ _isSolid =3D ((data[0] & 1) !=3D 0); + return S_OK; + } +=20 +diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h p7zip_16.02/CPP/= 7zip/Compress/Rar2Decoder.h +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h 2015-06-19 05:52:06.000= 000000 -0500 ++++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h 2020-05-12 15:35:00.89854865= 3 -0500 +@@ -138,7 +138,9 @@ + Byte m_LastLevels[kMaxTableSize]; +=20 + UInt64 m_PackSize; +- bool m_IsSolid; ++ bool _isSolid; ++ bool _solidAllowed; ++ bool m_TablesOK; +=20 + void InitStructures(); + UInt32 ReadBits(unsigned numBits); +diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp p7zip_16.02/CP= P/7zip/Compress/Rar3Decoder.cpp +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp 2016-05-20 03:20:03.0= 00000000 -0500 ++++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp 2020-05-12 15:35:00.898548= 653 -0500 +@@ -92,7 +92,9 @@ + _writtenFileSize(0), + _vmData(0), + _vmCode(0), +- m_IsSolid(false) ++ _isSolid(false), ++ _solidAllowed(false), ++ _errorMode(false) + { + Ppmd7_Construct(&_ppmd); + } +@@ -545,6 +547,9 @@ + return InitPPM(); + } +=20 ++ TablesRead =3D false; ++ TablesOK =3D false; ++ + _lzMode =3D true; + PrevAlignBits =3D 0; + PrevAlignCount =3D 0; +@@ -606,6 +611,9 @@ + } + } + } ++ if (InputEofError()) ++ return S_FALSE; ++ + TablesRead =3D true; +=20 + // original code has check here: +@@ -623,6 +631,9 @@ + RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlig= nTableSize])); +=20 + memcpy(m_LastLevels, newLevels, kTablesSizesSum); ++ ++ TablesOK =3D true; ++ + return S_OK; + } +=20 +@@ -811,7 +822,7 @@ + { + _writtenFileSize =3D 0; + _unsupportedFilter =3D false; +- if (!m_IsSolid) ++ if (!_isSolid) + { + _lzSize =3D 0; + _winPos =3D 0; +@@ -824,13 +835,21 @@ + PpmEscChar =3D 2; + PpmError =3D true; + InitFilters(); ++ _errorMode =3D false; + } +- if (!m_IsSolid || !TablesRead) ++ ++ if (_errorMode) ++ return S_FALSE; ++ ++ if (!_isSolid || !TablesRead) + { + bool keepDecompressing; + RINOK(ReadTables(keepDecompressing)); + if (!keepDecompressing) ++ { ++ _solidAllowed =3D true; + return S_OK; ++ } + } +=20 + for (;;) +@@ -838,6 +857,8 @@ + bool keepDecompressing; + if (_lzMode) + { ++ if (!TablesOK) ++ return S_FALSE; + RINOK(DecodeLZ(keepDecompressing)) + } + else +@@ -853,6 +874,9 @@ + if (!keepDecompressing) + break; + } ++ ++ _solidAllowed =3D true; ++ + RINOK(WriteBuf()); + UInt64 packSize =3D m_InBitStream.BitDecoder.GetProcessedSize(); + RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize)); +@@ -873,6 +897,10 @@ + if (!inSize) + return E_INVALIDARG; +=20 ++ if (_isSolid && !_solidAllowed) ++ return S_FALSE; ++ _solidAllowed =3D false; ++ + if (!_vmData) + { + _vmData =3D (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax); +@@ -901,8 +929,8 @@ + _unpackSize =3D outSize ? *outSize : (UInt64)(Int64)-1; + return CodeReal(progress); + } +- catch(const CInBufferException &e) { return e.ErrorCode; } +- catch(...) { return S_FALSE; } ++ catch(const CInBufferException &e) { _errorMode =3D true; return e.Error= Code; } ++ catch(...) { _errorMode =3D true; return S_FALSE; } + // CNewException is possible here. But probably CNewException is caused + // by error in data stream. + } +@@ -911,7 +939,7 @@ + { + if (size < 1) + return E_INVALIDARG; +- m_IsSolid =3D ((data[0] & 1) !=3D 0); ++ _isSolid =3D ((data[0] & 1) !=3D 0); + return S_OK; + } +=20 +diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.h p7zip_16.02/CPP/= 7zip/Compress/Rar3Decoder.h +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.h 2015-10-03 03:49:12.000= 000000 -0500 ++++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.h 2020-05-12 15:35:00.89854865= 3 -0500 +@@ -191,7 +191,9 @@ + CRecordVector _tempFilters; + UInt32 _lastFilter; +=20 +- bool m_IsSolid; ++ bool _isSolid; ++ bool _solidAllowed; ++ bool _errorMode; +=20 + bool _lzMode; + bool _unsupportedFilter; +@@ -200,6 +202,7 @@ + UInt32 PrevAlignCount; +=20 + bool TablesRead; ++ bool TablesOK; +=20 + CPpmd7 _ppmd; + int PpmEscChar; +diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.cpp p7zip_16.02/CP= P/7zip/Compress/Rar5Decoder.cpp +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.cpp 2016-05-20 03:20:04.0= 00000000 -0500 ++++ p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.cpp 2020-05-12 15:35:00.899548= 663 -0500 +@@ -72,6 +72,7 @@ + _writtenFileSize(0), + _dictSizeLog(0), + _isSolid(false), ++ _solidAllowed(false), + _wasInit(false), + _inputBuf(NULL) + { +@@ -801,7 +802,10 @@ + */ +=20 + if (res =3D=3D S_OK) ++ { ++ _solidAllowed =3D true; + res =3D res2; ++ } + =20 + if (res =3D=3D S_OK && _unpackSize_Defined && _writtenFileSize !=3D _unpa= ckSize) + return S_FALSE; +@@ -821,6 +825,10 @@ + { + try + { ++ if (_isSolid && !_solidAllowed) ++ return S_FALSE; ++ _solidAllowed =3D false; ++ + if (_dictSizeLog >=3D sizeof(size_t) * 8) + return E_NOTIMPL; +=20 +diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.h p7zip_16.02/CPP/= 7zip/Compress/Rar5Decoder.h +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.h 2015-09-01 13:04:50.000= 000000 -0500 ++++ p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.h 2020-05-12 15:35:00.89954866= 3 -0500 +@@ -271,6 +271,7 @@ + Byte _dictSizeLog; + bool _tableWasFilled; + bool _isSolid; ++ bool _solidAllowed; + bool _wasInit; +=20 + UInt32 _reps[kNumReps]; +diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/ShrinkDecoder.cpp p7zip_16.02/= CPP/7zip/Compress/ShrinkDecoder.cpp +--- p7zip_16.02.orig/CPP/7zip/Compress/ShrinkDecoder.cpp 2016-05-18 12:31:02= .000000000 -0500 ++++ p7zip_16.02/CPP/7zip/Compress/ShrinkDecoder.cpp 2020-05-12 15:34:45.1203= 92530 -0500 +@@ -121,7 +121,12 @@ + { + _stack[i++] =3D _suffixes[cur]; + cur =3D _parents[cur]; ++ if (cur >=3D kNumItems || i >=3D kNumItems) ++ break; + } ++=09 ++ if (cur >=3D kNumItems || i >=3D kNumItems) ++ break; + =20 + _stack[i++] =3D (Byte)cur; + lastChar2 =3D (Byte)cur; +diff -Naur p7zip_16.02.orig/CPP/Windows/ErrorMsg.cpp p7zip_16.02/CPP/Windows= /ErrorMsg.cpp +--- p7zip_16.02.orig/CPP/Windows/ErrorMsg.cpp 2015-01-18 12:20:28.000000000 = -0600 ++++ p7zip_16.02/CPP/Windows/ErrorMsg.cpp 2020-05-12 15:37:52.688247586 -0500 +@@ -14,15 +14,15 @@ + AString msg; +=20 + switch(errorCode) { +- case ERROR_NO_MORE_FILES : txt =3D "No more files"; break ; +- case E_NOTIMPL : txt =3D "E_NOTIMPL"; break ; +- case E_NOINTERFACE : txt =3D "E_NOINTERFACE"; break ; +- case E_ABORT : txt =3D "E_ABORT"; break ; +- case E_FAIL : txt =3D "E_FAIL"; break ; +- case STG_E_INVALIDFUNCTION : txt =3D "STG_E_INVALIDFUNCTION"; break ; +- case E_OUTOFMEMORY : txt =3D "E_OUTOFMEMORY"; break ; +- case E_INVALIDARG : txt =3D "E_INVALIDARG"; break ; +- case ERROR_DIRECTORY : txt =3D "Error Directory"; break ; ++ case unsigned (ERROR_NO_MORE_FILES) : txt =3D "No more files"; break ; ++ case unsigned (E_NOTIMPL) : txt =3D "E_NOTIMPL"; break ; ++ case unsigned (E_NOINTERFACE) : txt =3D "E_NOINTERFACE"; break ; ++ case unsigned (E_ABORT) : txt =3D "E_ABORT"; break ; ++ case unsigned (E_FAIL) : txt =3D "E_FAIL"; break ; ++ case unsigned (STG_E_INVALIDFUNCTION) : txt =3D "STG_E_INVALIDFUNCTION"= ; break ; ++ case unsigned (E_OUTOFMEMORY) : txt =3D "E_OUTOFMEMORY"; break ; ++ case unsigned (E_INVALIDARG) : txt =3D "E_INVALIDARG"; break ; ++ case ERROR_DIRECTORY : txt =3D "Error Directory"; brea= k ; + default: + txt =3D strerror(errorCode); + } diff --git a/src/patches/p7zip_change_install_folder.patch b/src/patches/p7zi= p_change_install_folder.patch deleted file mode 100644 index 4a8334329..000000000 --- a/src/patches/p7zip_change_install_folder.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- p7zip_15.14.1/makefile.common -+++ p7zip_15.14.1/makefile.common -@@ -1,6 +1,6 @@ - MKDIR =3D mkdir -p -=20 --DEST_HOME=3D/usr/local -+DEST_HOME=3D/usr - DEST_BIN=3D$(DEST_HOME)/bin - DEST_SHARE=3D$(DEST_HOME)/lib/p7zip - DEST_SHARE_DOC=3D$(DEST_HOME)/share/doc/p7zip --=20 2.20.1 --===============6817530625522803081==--