From 39231297e3098e0abaeeff49c18686f6a6e5dc0f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 12 May 2016 15:00:55 -0300 Subject: p7zip-15.14.1-1.parabola1: updating version --- libre/p7zip/libre.patch | 1022 +++++++++++++++++++++++++---------------------- 1 file changed, 535 insertions(+), 487 deletions(-) (limited to 'libre/p7zip/libre.patch') diff --git a/libre/p7zip/libre.patch b/libre/p7zip/libre.patch index c63f661af..8b8a4964a 100644 --- a/libre/p7zip/libre.patch +++ b/libre/p7zip/libre.patch @@ -1,351 +1,225 @@ -diff -Nur p7zip_9.38.orig/CPP/7zip/Archive/7z/7zUpdate.cpp p7zip_9.38/CPP/7zip/Archive/7z/7zUpdate.cpp ---- p7zip_9.38.orig/CPP/7zip/Archive/7z/7zUpdate.cpp 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/Archive/7z/7zUpdate.cpp 2015-02-11 01:04:25.880212590 -0200 -@@ -186,7 +186,7 @@ +diff --git a/C/Sha1.c b/C/Sha1.c +index 785c706..0fd10fc 100644 +--- a/C/Sha1.c ++++ b/C/Sha1.c +@@ -104,39 +104,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest) + destDigest[4] = p->state[4] + e; + } + +-void Sha1_UpdateBlock_Rar(CSha1 *p, UInt32 *data, int returnRes) +-{ +- UInt32 a, b, c, d, e; +- UInt32 W[kNumW]; +- +- a = p->state[0]; +- b = p->state[1]; +- c = p->state[2]; +- d = p->state[3]; +- e = p->state[4]; +- +- RX_15 +- +- RX_1_4(R0, R1, 15); +- +- RX_20(R2, 20); +- RX_20(R3, 40); +- RX_20(R4, 60); +- +- p->state[0] += a; +- p->state[1] += b; +- p->state[2] += c; +- p->state[3] += d; +- p->state[4] += e; +- +- if (returnRes) +- { +- unsigned i; +- for (i = 0 ; i < SHA1_NUM_BLOCK_WORDS; i++) +- data[i] = W[kNumW - SHA1_NUM_BLOCK_WORDS + i]; +- } +-} +- + #define Sha1_UpdateBlock(p) Sha1_GetBlockDigest(p, p->buffer, p->state) + + void Sha1_Update(CSha1 *p, const Byte *data, size_t size) +@@ -207,45 +174,6 @@ void Sha1_Update(CSha1 *p, const Byte *data, size_t size) + } + } + +-void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size, int rar350Mode) +-{ +- int returnRes = False; +- +- unsigned pos = (unsigned)p->count & 0x3F; +- p->count += size; +- +- while (size--) +- { +- unsigned pos2 = (pos & 3); +- UInt32 v = ((UInt32)*data++) << (8 * (3 - pos2)); +- UInt32 *ref = &(p->buffer[pos >> 2]); +- pos++; +- if (pos2 == 0) +- { +- *ref = v; +- continue; +- } +- *ref |= v; +- +- if (pos == SHA1_BLOCK_SIZE) +- { +- pos = 0; +- Sha1_UpdateBlock_Rar(p, p->buffer, returnRes); +- if (returnRes) +- { +- unsigned i; +- for (i = 0; i < SHA1_NUM_BLOCK_WORDS; i++) +- { +- UInt32 d = p->buffer[i]; +- Byte *prev = data + i * 4 - SHA1_BLOCK_SIZE; +- SetUi32(prev, d); +- } +- } +- returnRes = rar350Mode; +- } +- } +-} +- + void Sha1_Final(CSha1 *p, Byte *digest) + { + unsigned pos = (unsigned)p->count & 0x3F; +diff --git a/C/Sha1.h b/C/Sha1.h +index e578a82..c0dbca3 100644 +--- a/C/Sha1.h ++++ b/C/Sha1.h +@@ -27,8 +27,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest); + void Sha1_Update(CSha1 *p, const Byte *data, size_t size); + void Sha1_Final(CSha1 *p, Byte *digest); + +-void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size, int rar350Mode); +- + void Sha1_32_PrepareBlock(const CSha1 *p, UInt32 *block, unsigned size); + void Sha1_32_Update(CSha1 *p, const UInt32 *data, size_t size); + void Sha1_32_Final(CSha1 *p, UInt32 *digest); +diff --git a/CPP/7zip/Archive/7z/7zUpdate.cpp b/CPP/7zip/Archive/7z/7zUpdate.cpp +index 6333cdc..ec7c118 100644 +--- a/CPP/7zip/Archive/7z/7zUpdate.cpp ++++ b/CPP/7zip/Archive/7z/7zUpdate.cpp +@@ -558,7 +558,7 @@ static int CompareEmptyItems(const unsigned *p1, const unsigned *p2, void *param } static const char *g_Exts = -- " lzma 7z ace arc arj bz bz2 deb lzo lzx gz pak rpm sit tgz tbz tbz2 tgz cab ha lha lzh rar zoo" -+ " lzma 7z ace arc arj bz bz2 deb lzo lzx gz pak rpm sit tgz tbz tbz2 tgz cab ha lha lzh zoo" +- " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rar rpm sit zoo" ++ " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rpm sit zoo" " zip jar ear war msi" " 3gp avi mov mpeg mpg mpe wmv" " aac ape fla flac la mp3 m4a mp4 ofr ogg pac ra rm rka shn swa tta wv wma wav" -diff -Nur p7zip_9.38.orig/CPP/7zip/Bundles/Format7zFree/makefile.depend p7zip_9.38/CPP/7zip/Bundles/Format7zFree/makefile.depend ---- p7zip_9.38.orig/CPP/7zip/Bundles/Format7zFree/makefile.depend 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/Bundles/Format7zFree/makefile.depend 2015-02-11 01:27:26.540889138 -0200 -@@ -2926,136 +2926,6 @@ - ../../../../CPP/7zip/Archive/../Common/../Archive/../../Common/MyTypes.h \ - ../../../../CPP/7zip/Archive/../Common/StreamUtils.h \ - ../../../../CPP/7zip/Archive/../Common/../IStream.h --RarHandler.o: ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \ -- ../../../myWindows/StdAfx.h ../../../myWindows/config.h \ -- ../../../Common/Common.h ../../../Common/../../C/Compiler.h \ -- ../../../Common/MyWindows.h ../../../Common/MyGuidDef.h \ -- ../../../Common/MyTypes.h ../../../Common/../../C/7zTypes.h \ -- ../../../Common/NewHandler.h ../../../Common/MyWindows.h \ -- ../../../Common/MyTypes.h ../../../include_windows/windows.h \ -- ../../../include_windows/basetyps.h ../../../include_windows/tchar.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../../C/CpuArch.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../../C/7zTypes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/ComTry.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyWindows.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/IntToString.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/UTFConvert.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyString.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyVector.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Windows/PropVariantUtils.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Windows/../Common/MyString.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Windows/PropVariant.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Windows/../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Windows/../Common/MyWindows.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Windows/TimeUtils.h \ -- ../../../../CPP/7zip/Archive/Rar/../../IPassword.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyUnknown.h \ -- ../../../../CPP/7zip/Archive/Rar/../../IDecl.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/CreateCoder.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyCom.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyWindows.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/NewHandler.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyString.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../ICoder.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../IStream.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyUnknown.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../IDecl.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/MethodId.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/FilterCoder.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../IPassword.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/LimitedStreams.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyBuffer.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/Defs.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyVector.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../IStream.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/MethodId.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/ProgressUtils.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../IProgress.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/RegisterArc.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/IArchive.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/../IProgress.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/../IStream.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/../PropID.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Common/StreamUtils.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Compress/CopyCoder.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Compress/../../Common/MyCom.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Compress/../ICoder.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Crypto/Rar20Crypto.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../../Common/MyCom.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../ICoder.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../IPassword.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Crypto/RarAes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../../../C/Aes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../../../C/7zTypes.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../../Common/MyBuffer.h \ -- ../../../../CPP/7zip/Archive/Rar/../../Crypto/MyAes.h \ -- ../../../../CPP/7zip/Archive/Rar/../Common/FindSignature.h \ -- ../../../../CPP/7zip/Archive/Rar/../Common/../../IStream.h \ -- ../../../../CPP/7zip/Archive/Rar/../Common/ItemNameUtils.h \ -- ../../../../CPP/7zip/Archive/Rar/../Common/../../../Common/MyString.h \ -- ../../../../CPP/7zip/Archive/Rar/../Common/OutStreamWithCRC.h \ -- ../../../../CPP/7zip/Archive/Rar/../Common/../../../../C/7zCrc.h \ -- ../../../../CPP/7zip/Archive/Rar/../Common/../../../../C/7zTypes.h \ -- ../../../../CPP/7zip/Archive/Rar/../Common/../../../Common/MyCom.h \ -- ../../../../CPP/7zip/Archive/Rar/RarHandler.h \ -- ../../../../CPP/7zip/Archive/Rar/../IArchive.h \ -- ../../../../CPP/7zip/Archive/Rar/RarItem.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/StringConvert.h \ -- ../../../../CPP/7zip/Archive/Rar/RarHeader.h \ -- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyTypes.h --RpmHandler.o: ../../../../CPP/7zip/Archive/RpmHandler.cpp \ -- ../../../myWindows/StdAfx.h ../../../myWindows/config.h \ -- ../../../Common/Common.h ../../../Common/../../C/Compiler.h \ -- ../../../Common/MyWindows.h ../../../Common/MyGuidDef.h \ -- ../../../Common/MyTypes.h ../../../Common/../../C/7zTypes.h \ -- ../../../Common/NewHandler.h ../../../Common/MyWindows.h \ -- ../../../Common/MyTypes.h ../../../include_windows/windows.h \ -- ../../../include_windows/basetyps.h ../../../include_windows/tchar.h \ -- ../../../../CPP/7zip/Archive/../../../C/CpuArch.h \ -- ../../../../CPP/7zip/Archive/../../../C/7zTypes.h \ -- ../../../../CPP/7zip/Archive/../../Common/ComTry.h \ -- ../../../../CPP/7zip/Archive/../../Common/MyWindows.h \ -- ../../../../CPP/7zip/Archive/../../Common/IntToString.h \ -- ../../../../CPP/7zip/Archive/../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/../../Common/MyString.h \ -- ../../../../CPP/7zip/Archive/../../Common/MyVector.h \ -- ../../../../CPP/7zip/Archive/../../Common/StringConvert.h \ -- ../../../../CPP/7zip/Archive/../../Common/MyString.h \ -- ../../../../CPP/7zip/Archive/../../Common/UTFConvert.h \ -- ../../../../CPP/7zip/Archive/../../Windows/PropVariant.h \ -- ../../../../CPP/7zip/Archive/../../Windows/../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/../../Windows/../Common/MyWindows.h \ -- ../../../../CPP/7zip/Archive/../../Windows/TimeUtils.h \ -- ../../../../CPP/7zip/Archive/../Common/LimitedStreams.h \ -- ../../../../CPP/7zip/Archive/../Common/../../Common/MyBuffer.h \ -- ../../../../CPP/7zip/Archive/../Common/../../Common/Defs.h \ -- ../../../../CPP/7zip/Archive/../Common/../../Common/MyCom.h \ -- ../../../../CPP/7zip/Archive/../Common/../../Common/MyWindows.h \ -- ../../../../CPP/7zip/Archive/../Common/../../Common/NewHandler.h \ -- ../../../../CPP/7zip/Archive/../Common/../../Common/MyVector.h \ -- ../../../../CPP/7zip/Archive/../Common/../IStream.h \ -- ../../../../CPP/7zip/Archive/../Common/../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/../Common/../../Common/MyUnknown.h \ -- ../../../../CPP/7zip/Archive/../Common/../IDecl.h \ -- ../../../../CPP/7zip/Archive/../Common/ProgressUtils.h \ -- ../../../../CPP/7zip/Archive/../Common/../ICoder.h \ -- ../../../../CPP/7zip/Archive/../Common/../IStream.h \ -- ../../../../CPP/7zip/Archive/../Common/../IProgress.h \ -- ../../../../CPP/7zip/Archive/../Common/RegisterArc.h \ -- ../../../../CPP/7zip/Archive/../Common/../Archive/IArchive.h \ -- ../../../../CPP/7zip/Archive/../Common/../Archive/../IProgress.h \ -- ../../../../CPP/7zip/Archive/../Common/../Archive/../IStream.h \ -- ../../../../CPP/7zip/Archive/../Common/../Archive/../PropID.h \ -- ../../../../CPP/7zip/Archive/../Common/../Archive/../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Archive/../Common/StreamUtils.h \ -- ../../../../CPP/7zip/Archive/../Compress/CopyCoder.h \ -- ../../../../CPP/7zip/Archive/../Compress/../../Common/MyCom.h \ -- ../../../../CPP/7zip/Archive/../Compress/../ICoder.h - SplitHandler.o: ../../../../CPP/7zip/Archive/SplitHandler.cpp \ - ../../../myWindows/StdAfx.h ../../../myWindows/config.h \ - ../../../Common/Common.h ../../../Common/../../C/Compiler.h \ -@@ -6345,53 +6215,6 @@ - ../../../../CPP/7zip/Crypto/RandGen.h \ - ../../../../CPP/7zip/Crypto/../../../C/Sha256.h \ - ../../../../CPP/7zip/Crypto/../../../C/7zTypes.h --Rar20Crypto.o: ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \ -- ../../../myWindows/StdAfx.h ../../../myWindows/config.h \ -- ../../../Common/Common.h ../../../Common/../../C/Compiler.h \ -- ../../../Common/MyWindows.h ../../../Common/MyGuidDef.h \ -- ../../../Common/MyTypes.h ../../../Common/../../C/7zTypes.h \ -- ../../../Common/NewHandler.h ../../../Common/MyWindows.h \ -- ../../../Common/MyTypes.h ../../../include_windows/windows.h \ -- ../../../include_windows/basetyps.h ../../../include_windows/tchar.h \ -- ../../../../CPP/7zip/Crypto/../../../C/7zCrc.h \ -- ../../../../CPP/7zip/Crypto/../../../C/7zTypes.h \ -- ../../../../CPP/7zip/Crypto/../../../C/CpuArch.h \ -- ../../../../CPP/7zip/Crypto/../../../C/RotateDefs.h \ -- ../../../../CPP/7zip/Crypto/Rar20Crypto.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyCom.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyWindows.h \ -- ../../../../CPP/7zip/Crypto/../../Common/NewHandler.h \ -- ../../../../CPP/7zip/Crypto/../ICoder.h \ -- ../../../../CPP/7zip/Crypto/../IStream.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyUnknown.h \ -- ../../../../CPP/7zip/Crypto/../IDecl.h \ -- ../../../../CPP/7zip/Crypto/../IPassword.h --RarAes.o: ../../../../CPP/7zip/Crypto/RarAes.cpp \ -- ../../../myWindows/StdAfx.h ../../../myWindows/config.h \ -- ../../../Common/Common.h ../../../Common/../../C/Compiler.h \ -- ../../../Common/MyWindows.h ../../../Common/MyGuidDef.h \ -- ../../../Common/MyTypes.h ../../../Common/../../C/7zTypes.h \ -- ../../../Common/NewHandler.h ../../../Common/MyWindows.h \ -- ../../../Common/MyTypes.h ../../../include_windows/windows.h \ -- ../../../include_windows/basetyps.h ../../../include_windows/tchar.h \ -- ../../../../CPP/7zip/Crypto/RarAes.h \ -- ../../../../CPP/7zip/Crypto/../../../C/Aes.h \ -- ../../../../CPP/7zip/Crypto/../../../C/7zTypes.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyBuffer.h \ -- ../../../../CPP/7zip/Crypto/../../Common/Defs.h \ -- ../../../../CPP/7zip/Crypto/../IPassword.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyTypes.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyUnknown.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyWindows.h \ -- ../../../../CPP/7zip/Crypto/../IDecl.h \ -- ../../../../CPP/7zip/Crypto/MyAes.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyCom.h \ -- ../../../../CPP/7zip/Crypto/../../Common/NewHandler.h \ -- ../../../../CPP/7zip/Crypto/../ICoder.h \ -- ../../../../CPP/7zip/Crypto/../IStream.h \ -- ../../../../CPP/7zip/Crypto/Sha1.h \ -- ../../../../CPP/7zip/Crypto/../../Common/MyTypes.h - Sha1.o: ../../../../CPP/7zip/Crypto/Sha1.cpp ../../../myWindows/StdAfx.h \ - ../../../myWindows/config.h ../../../Common/Common.h \ - ../../../Common/../../C/Compiler.h ../../../Common/MyWindows.h \ -diff -Nur p7zip_9.38.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.38/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_9.38.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/Bundles/Format7zFree/makefile.list 2015-02-11 00:30:12.429937156 -0200 -@@ -71,7 +71,6 @@ - ../../../../CPP/7zip/Archive/NtfsHandler.cpp \ +diff --git a/CPP/7zip/Bundles/Format7zFree/makefile.list b/CPP/7zip/Bundles/Format7zFree/makefile.list +index da2056b..1dcf1a5 100644 +--- a/CPP/7zip/Bundles/Format7zFree/makefile.list ++++ b/CPP/7zip/Bundles/Format7zFree/makefile.list +@@ -87,8 +87,6 @@ SRCS=\ ../../../../CPP/7zip/Archive/PeHandler.cpp \ ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ + ../../../../CPP/7zip/Archive/QcowHandler.cpp \ - ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \ +- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \ ../../../../CPP/7zip/Archive/RpmHandler.cpp \ ../../../../CPP/7zip/Archive/SplitHandler.cpp \ ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ -@@ -174,8 +173,6 @@ +@@ -191,9 +189,6 @@ SRCS=\ ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ ../../../../CPP/7zip/Crypto/RandGen.cpp \ - ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \ +- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \ - ../../../../CPP/7zip/Crypto/RarAes.cpp \ - ../../../../CPP/7zip/Crypto/Sha1.cpp \ - ../../../../CPP/7zip/Crypto/Sha1Reg.cpp \ ../../../../CPP/7zip/Crypto/WzAes.cpp \ -@@ -453,8 +450,6 @@ - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PeHandler.cpp - PpmdHandler.o : ../../../../CPP/7zip/Archive/PpmdHandler.cpp + ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ + ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ +@@ -485,10 +480,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Archive/PpmdHandler.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp + QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp -RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp +-Rar5Handler.o : ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp -@@ -659,10 +654,6 @@ +@@ -693,12 +684,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp -Rar20Crypto.o : ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp +-Rar5Aes.o : ../../../../CPP/7zip/Crypto/Rar5Aes.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar5Aes.cpp -RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp - Sha1.o : ../../../../CPP/7zip/Crypto/Sha1.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Sha1.cpp - Sha1Reg.o : ../../../../CPP/7zip/Crypto/Sha1Reg.cpp -@@ -828,7 +819,6 @@ - NtfsHandler.o \ + WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp + ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp +@@ -869,8 +854,6 @@ OBJS=\ PeHandler.o \ PpmdHandler.o \ + QcowHandler.o \ - RarHandler.o \ +- Rar5Handler.o \ RpmHandler.o \ SplitHandler.o \ SquashfsHandler.o \ -@@ -931,8 +921,6 @@ +@@ -973,9 +956,6 @@ OBJS=\ MyAesReg.o \ Pbkdf2HmacSha1.o \ RandGen.o \ - Rar20Crypto.o \ +- Rar5Aes.o \ - RarAes.o \ - Sha1.o \ - Sha1Reg.o \ WzAes.o \ -diff -Nur p7zip_9.38.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_9.38/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt ---- p7zip_9.38.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2015-02-11 00:46:31.224729754 -0200 -@@ -120,7 +120,6 @@ - "../../../../CPP/7zip/Archive/NtfsHandler.cpp" + ZipCrypto.o \ + ZipStrong.o \ +diff --git a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt +index 61f41f9..adc7117 100644 +--- a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt ++++ b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt +@@ -126,8 +126,6 @@ add_library(7z MODULE "../../../../CPP/7zip/Archive/PeHandler.cpp" "../../../../CPP/7zip/Archive/PpmdHandler.cpp" + "../../../../CPP/7zip/Archive/QcowHandler.cpp" - "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp" +- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp" "../../../../CPP/7zip/Archive/RpmHandler.cpp" "../../../../CPP/7zip/Archive/SplitHandler.cpp" "../../../../CPP/7zip/Archive/SquashfsHandler.cpp" -@@ -223,8 +222,6 @@ +@@ -230,9 +228,6 @@ add_library(7z MODULE "../../../../CPP/7zip/Crypto/MyAesReg.cpp" "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp" "../../../../CPP/7zip/Crypto/RandGen.cpp" - "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp" +- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp" - "../../../../CPP/7zip/Crypto/RarAes.cpp" - "../../../../CPP/7zip/Crypto/Sha1.cpp" - "../../../../CPP/7zip/Crypto/Sha1Reg.cpp" "../../../../CPP/7zip/Crypto/WzAes.cpp" -diff -Nur p7zip_9.38.orig/CPP/7zip/Crypto/Sha1.cpp p7zip_9.38/CPP/7zip/Crypto/Sha1.cpp ---- p7zip_9.38.orig/CPP/7zip/Crypto/Sha1.cpp 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/Crypto/Sha1.cpp 2015-02-11 00:45:40.547653068 -0200 -@@ -130,35 +130,6 @@ - _count2 = curBufferPos; - } - --void CContext::UpdateRar(Byte *data, size_t size, bool rar350Mode) --{ -- bool returnRes = false; -- unsigned curBufferPos = _count2; -- while (size--) -- { -- unsigned pos = (curBufferPos & 3); -- if (pos == 0) -- _buffer[curBufferPos >> 2] = 0; -- _buffer[curBufferPos >> 2] |= ((UInt32)*data++) << (8 * (3 - pos)); -- if (++curBufferPos == kBlockSize) -- { -- curBufferPos = 0; -- CContextBase::UpdateBlock(_buffer, returnRes); -- if (returnRes) -- for (unsigned i = 0; i < kBlockSizeInWords; i++) -- { -- UInt32 d = _buffer[i]; -- data[(int)i * 4 + 0 - (int)kBlockSize] = (Byte)(d); -- data[(int)i * 4 + 1 - (int)kBlockSize] = (Byte)(d >> 8); -- data[(int)i * 4 + 2 - (int)kBlockSize] = (Byte)(d >> 16); -- data[(int)i * 4 + 3 - (int)kBlockSize] = (Byte)(d >> 24); -- } -- returnRes = rar350Mode; -- } -- } -- _count2 = curBufferPos; --} -- - void CContext::Final(Byte *digest) - { - const UInt64 lenInBits = (_count << 9) + ((UInt64)_count2 << 3); -diff -Nur p7zip_9.38.orig/CPP/7zip/Crypto/Sha1.h p7zip_9.38/CPP/7zip/Crypto/Sha1.h ---- p7zip_9.38.orig/CPP/7zip/Crypto/Sha1.h 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/Crypto/Sha1.h 2015-02-11 01:03:20.456339087 -0200 -@@ -9,10 +9,6 @@ - - #include "../../Common/MyTypes.h" - --// Sha1 implementation in RAR before version 3.60 has bug: --// it changes data bytes in some cases. --// So this class supports both versions: normal_SHA and rar3Mode -- - namespace NCrypto { - namespace NSha1 { - -@@ -53,7 +49,6 @@ + "../../../../CPP/7zip/Crypto/ZipCrypto.cpp" + "../../../../CPP/7zip/Crypto/ZipStrong.cpp" +diff --git a/CPP/7zip/Crypto/Sha1Cls.h b/CPP/7zip/Crypto/Sha1Cls.h +index 18c761f..cde4a57 100644 +--- a/CPP/7zip/Crypto/Sha1Cls.h ++++ b/CPP/7zip/Crypto/Sha1Cls.h +@@ -28,7 +28,6 @@ class CContext: public CContextBase { public: - void Update(const Byte *data, size_t size); -- void UpdateRar(Byte *data, size_t size, bool rar350Mode); - void Final(Byte *digest); + void Update(const Byte *data, size_t size) throw() { Sha1_Update(&_s, data, size); } +- void UpdateRar(Byte *data, size_t size, bool rar350Mode) throw() { Sha1_Update_Rar(&_s, data, size, rar350Mode ? 1 : 0); } + void Final(Byte *digest) throw() { Sha1_Final(&_s, digest); } }; -diff -Nur p7zip_9.38.orig/CPP/7zip/Guid.txt p7zip_9.38/CPP/7zip/Guid.txt ---- p7zip_9.38.orig/CPP/7zip/Guid.txt 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/Guid.txt 2015-02-11 00:44:03.300174458 -0200 -@@ -132,7 +132,6 @@ +diff --git a/CPP/7zip/Guid.txt b/CPP/7zip/Guid.txt +index 7edab6e..cc22992 100644 +--- a/CPP/7zip/Guid.txt ++++ b/CPP/7zip/Guid.txt +@@ -151,7 +151,6 @@ Handler GUIDs: 01 Zip 02 BZip2 @@ -353,22 +227,67 @@ diff -Nur p7zip_9.38.orig/CPP/7zip/Guid.txt p7zip_9.38/CPP/7zip/Guid.txt 04 Arj 05 Z 06 Lzh -diff -Nur p7zip_9.38.orig/CPP/7zip/UI/Client7z/Client7z.cpp p7zip_9.38/CPP/7zip/UI/Client7z/Client7z.cpp ---- p7zip_9.38.orig/CPP/7zip/UI/Client7z/Client7z.cpp 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/UI/Client7z/Client7z.cpp 2015-02-11 01:06:18.167807974 -0200 -@@ -30,7 +30,7 @@ +@@ -168,7 +167,6 @@ Handler GUIDs: + C9 VDI + CA Qcow + CB GPT +- CC Rar5 + CD IHex + CE Hxs + CF TE +diff --git a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro +index afa36d4..93c45c7 100644 +--- a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro ++++ b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro +@@ -137,8 +137,6 @@ SOURCES += \ + ../../../../CPP/7zip/Archive/PeHandler.cpp \ + ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ + ../../../../CPP/7zip/Archive/QcowHandler.cpp \ +- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \ +- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \ + ../../../../CPP/7zip/Archive/RpmHandler.cpp \ + ../../../../CPP/7zip/Archive/SplitHandler.cpp \ + ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ +@@ -241,9 +239,6 @@ SOURCES += \ + ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ + ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ + ../../../../CPP/7zip/Crypto/RandGen.cpp \ +- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \ +- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \ +- ../../../../CPP/7zip/Crypto/RarAes.cpp \ + ../../../../CPP/7zip/Crypto/WzAes.cpp \ + ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ + ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ +diff --git a/CPP/7zip/QMAKE/all.pro b/CPP/7zip/QMAKE/all.pro +index a565ba8..6668619 100644 +--- a/CPP/7zip/QMAKE/all.pro ++++ b/CPP/7zip/QMAKE/all.pro +@@ -4,7 +4,6 @@ SUBDIRS = 7za \ + 7zr \ + 7z_ \ + Format7zFree \ +- Rar \ + Lzham \ + test_lib + +diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp b/CPP/7zip/UI/Client7z/Client7z.cpp +index d0eca6d..7f4e6e2 100644 +--- a/CPP/7zip/UI/Client7z/Client7z.cpp ++++ b/CPP/7zip/UI/Client7z/Client7z.cpp +@@ -32,7 +32,7 @@ HINSTANCE g_hInstance = 0; #endif // Tou can find the list of all GUIDs in Guid.txt file. -// use another CLSIDs, if you want to support other formats (zip, rar, ...). +// use another CLSIDs, if you want to support other formats (zip, ...). // {23170F69-40C1-278A-1000-000110070000} + DEFINE_GUID(CLSID_CFormat7z, - 0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00); -diff -Nur p7zip_9.38.orig/CPP/7zip/UI/Common/LoadCodecs.h p7zip_9.38/CPP/7zip/UI/Common/LoadCodecs.h ---- p7zip_9.38.orig/CPP/7zip/UI/Common/LoadCodecs.h 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/UI/Common/LoadCodecs.h 2015-02-11 00:43:34.319931310 -0200 -@@ -110,7 +110,6 @@ +diff --git a/CPP/7zip/UI/Common/LoadCodecs.h b/CPP/7zip/UI/Common/LoadCodecs.h +index ac9eeac..076bd1c 100644 +--- a/CPP/7zip/UI/Common/LoadCodecs.h ++++ b/CPP/7zip/UI/Common/LoadCodecs.h +@@ -158,7 +158,6 @@ struct CArcInfoEx void AddExts(const UString &ext, const UString &addExt); bool IsSplit() const { return StringsAreEqualNoCase_Ascii(Name, "Split"); } @@ -376,10 +295,11 @@ diff -Nur p7zip_9.38.orig/CPP/7zip/UI/Common/LoadCodecs.h p7zip_9.38/CPP/7zip/UI CArcInfoEx(): Flags(0), -diff -Nur p7zip_9.38.orig/CPP/7zip/UI/Common/OpenArchive.cpp p7zip_9.38/CPP/7zip/UI/Common/OpenArchive.cpp ---- p7zip_9.38.orig/CPP/7zip/UI/Common/OpenArchive.cpp 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/UI/Common/OpenArchive.cpp 2015-02-11 00:36:30.699723469 -0200 -@@ -856,7 +856,6 @@ +diff --git a/CPP/7zip/UI/Common/OpenArchive.cpp b/CPP/7zip/UI/Common/OpenArchive.cpp +index 3626cca..98f20ea 100644 +--- a/CPP/7zip/UI/Common/OpenArchive.cpp ++++ b/CPP/7zip/UI/Common/OpenArchive.cpp +@@ -1063,7 +1063,6 @@ static const char * const k_Formats_with_simple_signuature[] = { "7z" , "xz" @@ -387,11 +307,11 @@ diff -Nur p7zip_9.38.orig/CPP/7zip/UI/Common/OpenArchive.cpp p7zip_9.38/CPP/7zip , "bzip2" , "gzip" , "cab" -@@ -1443,29 +1442,6 @@ +@@ -1685,29 +1684,6 @@ HRESULT CArc::OpenStream2(const COpenOptions &op) { // signature search was here } -- else if (extension == L"000" || extension == L"001") +- else if (extension.IsEqualTo("000") || extension.IsEqualTo("001")) - { - int i = FindFormatForArchiveType(op.codecs, orderIndices, "rar"); - if (i >= 0) @@ -417,10 +337,11 @@ diff -Nur p7zip_9.38.orig/CPP/7zip/UI/Common/OpenArchive.cpp p7zip_9.38/CPP/7zip else { const size_t kBufSize = (1 << 10); -diff -Nur p7zip_9.38.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.38/CPP/7zip/UI/FileManager/FM_rc.cpp ---- p7zip_9.38.orig/CPP/7zip/UI/FileManager/FM_rc.cpp 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/UI/FileManager/FM_rc.cpp 2015-02-11 00:19:25.381597838 -0200 -@@ -815,8 +815,6 @@ +diff --git a/CPP/7zip/UI/FileManager/FM_rc.cpp b/CPP/7zip/UI/FileManager/FM_rc.cpp +index 83578ed..034feed 100644 +--- a/CPP/7zip/UI/FileManager/FM_rc.cpp ++++ b/CPP/7zip/UI/FileManager/FM_rc.cpp +@@ -821,8 +821,6 @@ REGISTER_STRINGTABLE(g_stringTable) ///////////////////////////////////////////////////// @@ -429,7 +350,7 @@ diff -Nur p7zip_9.38.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.38/CPP/7zip/ SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) : wxPanel(parent,id) , m_frame(frame), _wList(0) { -@@ -834,7 +832,7 @@ +@@ -840,7 +838,7 @@ REGISTER_STRINGTABLE(g_stringTable) int sizes[] = {150, 250, 350, -1}; wxArrayString pathArray; wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL); @@ -438,73 +359,113 @@ diff -Nur p7zip_9.38.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.38/CPP/7zip/ m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT ); pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0); pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5); -diff -Nur p7zip_9.38.orig/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.38/CPP/7zip/UI/FileManager/makefile.depend ---- p7zip_9.38.orig/CPP/7zip/UI/FileManager/makefile.depend 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/7zip/UI/FileManager/makefile.depend 2015-02-11 00:23:18.466708442 -0200 -@@ -2643,8 +2643,7 @@ - ../../../../CPP/7zip/UI/FileManager/res/Info2PNG.h \ - /usr/include/wx-3.0/wx/mstream.h /usr/include/wx-3.0/wx/listctrl.h \ - /usr/include/wx-3.0/wx/listbase.h \ -- /usr/include/wx-3.0/wx/generic/listctrl.h \ -- ../../../../CPP/7zip/UI/FileManager/res/ParentFolder.h -+ /usr/include/wx-3.0/wx/generic/listctrl.h - FSDrives.o: ../../../../CPP/7zip/UI/FileManager/FSDrives.cpp \ - ../../../myWindows/StdAfx.h ../../../myWindows/config.h \ - ../../../Common/Common.h ../../../Common/../../C/Compiler.h \ -diff -Nur p7zip_9.38.orig/CPP/ANDROID/Format7zFree/jni/Android.mk p7zip_9.38/CPP/ANDROID/Format7zFree/jni/Android.mk ---- p7zip_9.38.orig/CPP/ANDROID/Format7zFree/jni/Android.mk 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/CPP/ANDROID/Format7zFree/jni/Android.mk 2015-02-11 00:54:16.375224803 -0200 -@@ -88,7 +88,6 @@ - ../../../../CPP/7zip/Archive/NtfsHandler.cpp \ +diff --git a/CPP/ANDROID/Format7zFree/jni/Android.mk b/CPP/ANDROID/Format7zFree/jni/Android.mk +index 7c74e73..48cb4fa 100644 +--- a/CPP/ANDROID/Format7zFree/jni/Android.mk ++++ b/CPP/ANDROID/Format7zFree/jni/Android.mk +@@ -91,8 +91,6 @@ LOCAL_SRC_FILES := \ ../../../../CPP/7zip/Archive/PeHandler.cpp \ ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ + ../../../../CPP/7zip/Archive/QcowHandler.cpp \ - ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \ +- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \ ../../../../CPP/7zip/Archive/RpmHandler.cpp \ ../../../../CPP/7zip/Archive/SplitHandler.cpp \ ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ -@@ -191,8 +190,6 @@ +@@ -195,9 +193,6 @@ LOCAL_SRC_FILES := \ ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ ../../../../CPP/7zip/Crypto/RandGen.cpp \ - ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \ +- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \ - ../../../../CPP/7zip/Crypto/RarAes.cpp \ - ../../../../CPP/7zip/Crypto/Sha1.cpp \ - ../../../../CPP/7zip/Crypto/Sha1Reg.cpp \ ../../../../CPP/7zip/Crypto/WzAes.cpp \ -diff -Nur p7zip_9.38.orig/ChangeLog p7zip_9.38/ChangeLog ---- p7zip_9.38.orig/ChangeLog 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/ChangeLog 2015-02-11 01:08:43.782348145 -0200 -@@ -9,7 +9,6 @@ + ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ + ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ +diff --git a/ChangeLog b/ChangeLog +index 66449ab..3f90bb9 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -45,11 +45,6 @@ Version 15.12 (never published) + - "There are no errors" string after "Test" operation inside archive. + - The bugs in LZMA SDK were fixed (but these bugs are not related directly to 7-Zip's code). + +- +- - From Windows version of 7-Zip 15.11 : +- - Some bugs were fixed. +- - 7-Zip 15.10 showed incorrect error message about missing volume for multivolume RAR archives. +- + - ..../LZHAM added + - - From Windows version of 7-zip - - bug#138 If you extract the password with # program crashes +@@ -69,9 +64,6 @@ Version 15.10 beta + version (-m switch). + - Some bugs were fixed. + - extracting from solid wim archives worked incorrectly in some cases, +- - Also there are some minor changes. +- - 7-Zip can show the name of missing volume for multivolume RAR and VMDK archives. +- - Some internal changes with 7-Zip Benchmark. + + Version 15.09 beta + ================== +@@ -93,8 +85,6 @@ Version 15.08 beta + Version 15.07 beta + ================== + +- - "bin/Codecs/Rar29.so" renamed to "bin/Codecs/Rar.so" +- + - support of cygwin 64 bits + + - support of cygwin 64 bits with asm +@@ -118,15 +108,12 @@ Version 15.07 beta + + - From Windows version of 7-zip 15.06 beta: + +- - 7-Zip now can extract RAR5 archives. + - 7-Zip now doesn't sort files by type while adding to solid 7z archive. + new -mqs switch to sort files by type while adding to solid 7z archive. + - The BUG in 7-Zip File Manager was fixed: + The "Move" operation to open 7z archive didn't delete empty files. + - The BUG in 15.05 was fixed: + console version added some text to the end of stdout stream, is -so switch was used. +- - The BUG in 9.30 - 15.05 was fixed: +- 7-Zip could not open multivolume sfx RAR archive. + - Some bugs were fixed. + + - From Windows version of 7-zip 15.05 beta: +@@ -179,9 +166,6 @@ Version 9.38 + - bug #139 "password from commanline is visible in processes list" + Now the characters of the password are replaced with *. + +- - From Windows version of 7-zip +- - bug#138 If you extract the password with # program crashes - 7z now supports long password in RAR 3 and 4. - -@@ -40,12 +39,6 @@ + +@@ -212,12 +196,6 @@ Version 9.22 - #3283518 : Asm/x{32,64}/7zCrcT8U.asm introduces executable stack - + -Version 9.20.1 -============== - - - #3211479 "p7zip 9.20 - "unsupported method" with RAR files - " fixed -- "install.sh" installs again "bin/Codecs/Rar29.so" +- "install.sh" installs again "bin/Codecs/Rar29.so" - Version 9.20 ============ -@@ -118,8 +111,6 @@ +@@ -290,8 +268,6 @@ Version 9.13 - Some bugs were fixed. - + - - #2863580 "Crash in Rar decoder on a corrupted file" fixed - - #2860898 "Dereferencing a zero pointer in cab handler" fixed - #2860679 "Division by zero in cab decoder" fixed -@@ -248,7 +239,7 @@ +@@ -420,7 +396,7 @@ Version 4.59 (never published) - It's allowed to use -t switch for "list" and "extract" commands. - Some bugs were fixed. @@ -513,16 +474,25 @@ diff -Nur p7zip_9.38.orig/ChangeLog p7zip_9.38/ChangeLog Version 4.58 -@@ -261,8 +252,6 @@ +@@ -433,8 +409,6 @@ Version 4.58 2) -mcu switch: 7-Zip uses UTF-8, if there are non-ASCII symbols. 3) -mcl switch: 7-Zip uses local code page. - Now it's possible to store file creation time in 7z and ZIP archives (-mtc switch). -- - 7-Zip now can unpack multivolume RAR archives created with +- - 7-Zip now can unpack multivolume RAR archives created with - "old style volume names" scheme and names *.001, *.002, ... - - Now it's possible to use -mSW- and -mSW+ switches instead of -mSW=off and -mSW=on - - Some bugs were fixed. + - Now it's possible to use -mSW- and -mSW+ switches instead of -mSW=off and -mSW=on + - Some bugs were fixed. + +@@ -650,7 +624,7 @@ Version 4.44 + + - From Windows version of 7-zip 4.44 : + - 7za : Cab support +- - Speed optimizations for LZMA, Deflate, BZip2 and unRAR. ++ - Speed optimizations for LZMA, Deflate and BZip2. + - fix : now, updating a crypted header archive keeps the crypted header -@@ -598,8 +587,6 @@ + - fixes in the help displayed by 7za/7z/7zr. +@@ -770,8 +744,6 @@ Version 4.38 - patch #1465026 - Patch for install.sh for packagers @@ -531,7 +501,7 @@ diff -Nur p7zip_9.38.orig/ChangeLog p7zip_9.38/ChangeLog - contrib/VirtualFileSystemForMidnightCommander/u7z updated (thank sgh_punk) -@@ -716,8 +703,6 @@ +@@ -888,8 +860,6 @@ Version 4.25 - Some bugs were fixed - DOCS/MANUAL/exit_codes.htm added @@ -540,7 +510,7 @@ diff -Nur p7zip_9.38.orig/ChangeLog p7zip_9.38/ChangeLog - better dependencies in makefile Version 4.23 -@@ -905,9 +890,6 @@ +@@ -1077,9 +1047,6 @@ Version 4.10 - new port of 7za from the source of 7za 4.10Beta for Windows => p7zip now work on big endian CPU. @@ -550,10 +520,11 @@ diff -Nur p7zip_9.38.orig/ChangeLog p7zip_9.38/ChangeLog Version 0.91 ============ - add support for FreeBSD 5.2.1 -diff -Nur p7zip_9.38.orig/DOC/License.txt p7zip_9.38/DOC/License.txt ---- p7zip_9.38.orig/DOC/License.txt 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/DOC/License.txt 2015-02-11 00:56:11.542823857 -0200 -@@ -5,14 +5,7 @@ +diff --git a/DOC/License.txt b/DOC/License.txt +index f50c52e..8ac1986 100644 +--- a/DOC/License.txt ++++ b/DOC/License.txt +@@ -5,15 +5,6 @@ 7-Zip Copyright (C) 1999-2015 Igor Pavlov. @@ -565,12 +536,12 @@ diff -Nur p7zip_9.38.orig/DOC/License.txt p7zip_9.38/DOC/License.txt - The GNU LGPL + unRAR restriction means that you must follow both - GNU LGPL rules and unRAR restriction rules. - -+ Licenses for files are GNU LGPL. - +- GNU LGPL information -------------------- -@@ -32,21 +25,5 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +@@ -33,21 +24,5 @@ + USA - unRAR restriction @@ -591,45 +562,38 @@ diff -Nur p7zip_9.38.orig/DOC/License.txt p7zip_9.38/DOC/License.txt - -- Igor Pavlov -diff -Nur p7zip_9.38.orig/DOC/MANUAL/switches/update.htm p7zip_9.38/DOC/MANUAL/switches/update.htm ---- p7zip_9.38.orig/DOC/MANUAL/switches/update.htm 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/DOC/MANUAL/switches/update.htm 2015-02-11 01:06:42.614677076 -0200 -@@ -139,7 +139,7 @@ -
  • UTC file systems: NTFS -
  • UTC archive formats: .zip with -mtc switch, 7z, tar, gzip2, iso, wim -
  • Local time file systems : FAT, FAT32 --
  • Local time archive formats : rar, zip, cab -+
  • Local time archive formats : zip, cab - - -

    Examples

    -diff -Nur p7zip_9.38.orig/DOC/Methods.txt p7zip_9.38/DOC/Methods.txt ---- p7zip_9.38.orig/DOC/Methods.txt 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/DOC/Methods.txt 2015-02-11 00:56:40.029722102 -0200 -@@ -86,10 +86,6 @@ - 63 - wzAES - 02 - BZip +diff --git a/DOC/Methods.txt b/DOC/Methods.txt +index 1a1c54c..daa94e2 100644 +--- a/DOC/Methods.txt ++++ b/DOC/Methods.txt +@@ -97,12 +97,6 @@ List of defined IDs + 02 - 02 - BZip2 -- 03 - Rar -- 01 - Rar15 -- 02 - Rar20 -- 03 - Rar29 - 04 - Arj - 01 - Arj (1,2,3) - 02 - Arj 4 -@@ -121,9 +117,6 @@ - F1 - Combine Ciphers - 01 - Zip - 01 - Main Zip crypto algo -- 03 - RAR + +- 03 - [Rar] +- 01 - Rar1 +- 02 - Rar2 +- 03 - Rar3 +- 05 - Rar5 +- + 04 - [Arj] + 01 - Arj(1,2,3) + 02 - Arj4 +@@ -146,10 +140,6 @@ List of defined IDs + 01 - [Zip] + 01 - ZipCrypto (Main Zip crypto algo) + +- 03 - [RAR] - 02 - -- 03 - Rar29 AES-128 + (modified SHA-1) - 07 - 7z - 01 - AES-256 + SHA-256 +- 03 - Rar29AES (AES-128 + modified SHA-1) +- + 07 - [7z] + 01 - 7zAES (AES-256 + SHA-256) -diff -Nur p7zip_9.38.orig/DOC/readme.txt p7zip_9.38/DOC/readme.txt ---- p7zip_9.38.orig/DOC/readme.txt 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/DOC/readme.txt 2015-02-11 00:55:02.545597806 -0200 +diff --git a/DOC/readme.txt b/DOC/readme.txt +index db7b229..9c310ab 100644 +--- a/DOC/readme.txt ++++ b/DOC/readme.txt @@ -9,30 +9,9 @@ License Info ------------ @@ -662,7 +626,7 @@ diff -Nur p7zip_9.38.orig/DOC/readme.txt p7zip_9.38/DOC/readme.txt LZMA SDK -------- -@@ -96,7 +75,6 @@ +@@ -96,7 +75,6 @@ DOC Documentation --- 7zFormat.txt - 7z format description copying.txt - GNU LGPL license @@ -670,10 +634,11 @@ diff -Nur p7zip_9.38.orig/DOC/readme.txt p7zip_9.38/DOC/readme.txt src-history.txt - Sources history Methods.txt - Compression method IDs readme.txt - Readme file -diff -Nur p7zip_9.38.orig/DOC/src-history.txt p7zip_9.38/DOC/src-history.txt ---- p7zip_9.38.orig/DOC/src-history.txt 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/DOC/src-history.txt 2015-02-11 01:03:34.796457419 -0200 -@@ -140,8 +140,6 @@ +diff --git a/DOC/src-history.txt b/DOC/src-history.txt +index d33ec60..d19469f 100644 +--- a/DOC/src-history.txt ++++ b/DOC/src-history.txt +@@ -169,8 +169,6 @@ HISTORY of the 7-Zip source code - 7-Zip now has 128 MB dictionary limit for 32-bit version: It's for speed optimization: kNumLogBits = 9 + sizeof(size_t) / 2; - TAR: 'D' link flag support. @@ -682,7 +647,16 @@ diff -Nur p7zip_9.38.orig/DOC/src-history.txt p7zip_9.38/DOC/src-history.txt - Fixed bugs: - 7-Zip FM could not copy / move files to root network folders like \\COMPNAME\FOLDERNAME\ In case of move it removed original files. -@@ -203,7 +201,6 @@ +@@ -181,8 +179,6 @@ HISTORY of the 7-Zip source code + 7-zip tries to delete all extra fileds (except for WzAES). + And that code could hang. + - 7-Zip GUI didn't suggest BZip2 dictionary size used in previous run. +- - If creation time stamp was included in .RAR archive, 7-zip used creation time stamp +- as modification time stamp. + + 4.58 alpha 2 2007-12-31 + ------------------------- +@@ -232,7 +228,6 @@ HISTORY of the 7-Zip source code stratup code, or you must add CPP/Common/CRC.cpp to your project. - Method ID in .7z now is 63-bit integer (UInt64). - Open error messages @@ -690,7 +664,7 @@ diff -Nur p7zip_9.38.orig/DOC/src-history.txt p7zip_9.38/DOC/src-history.txt - unShrink fixed - BUG of 4.43 beta and 4.44 beta was fixed. 7-Zip compressing to .zip in multi-threading mode didn't work in some cases. -@@ -385,11 +382,6 @@ +@@ -414,11 +409,6 @@ HISTORY of the 7-Zip source code contains common resurces @@ -702,9 +676,10 @@ diff -Nur p7zip_9.38.orig/DOC/src-history.txt p7zip_9.38/DOC/src-history.txt 2.30 Beta 18 2002-03-25 ------------------------- - SDK/Archive/Cab/MSZipDecoder.cpp -diff -Nur p7zip_9.38.orig/GUI/Contents/Info.plist p7zip_9.38/GUI/Contents/Info.plist ---- p7zip_9.38.orig/GUI/Contents/Info.plist 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/GUI/Contents/Info.plist 2015-02-11 00:58:09.453784497 -0200 +diff --git a/GUI/Contents/Info.plist b/GUI/Contents/Info.plist +index 71650e1..d60b262 100644 +--- a/GUI/Contents/Info.plist ++++ b/GUI/Contents/Info.plist @@ -311,24 +311,6 @@ CFBundleTypeExtensions @@ -730,10 +705,11 @@ diff -Nur p7zip_9.38.orig/GUI/Contents/Info.plist p7zip_9.38/GUI/Contents/Info.p ace ACE .c00 -diff -Nur p7zip_9.38.orig/GUI/help/cmdline/switches/update.htm p7zip_9.38/GUI/help/cmdline/switches/update.htm ---- p7zip_9.38.orig/GUI/help/cmdline/switches/update.htm 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/GUI/help/cmdline/switches/update.htm 2015-02-11 01:07:01.078163350 -0200 -@@ -139,7 +139,7 @@ +diff --git a/GUI/help/cmdline/switches/update.htm b/GUI/help/cmdline/switches/update.htm +index f51dd7f..0533382 100644 +--- a/GUI/help/cmdline/switches/update.htm ++++ b/GUI/help/cmdline/switches/update.htm +@@ -139,7 +139,7 @@ someone in another time zone.

  • UTC file systems: NTFS
  • UTC archive formats: .zip with -mtc switch, 7z, tar, gzip2, iso, wim
  • Local time file systems : FAT, FAT32 @@ -742,9 +718,10 @@ diff -Nur p7zip_9.38.orig/GUI/help/cmdline/switches/update.htm p7zip_9.38/GUI/he

    Examples

    -diff -Nur p7zip_9.38.orig/GUI/help/general/formats.htm p7zip_9.38/GUI/help/general/formats.htm ---- p7zip_9.38.orig/GUI/help/general/formats.htm 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/GUI/help/general/formats.htm 2015-02-11 01:08:24.372187139 -0200 +diff --git a/GUI/help/general/formats.htm b/GUI/help/general/formats.htm +index 1febf16..1804ea1 100644 +--- a/GUI/help/general/formats.htm ++++ b/GUI/help/general/formats.htm @@ -46,7 +46,6 @@ NSIS nsis NTFS ntfs img @@ -753,150 +730,221 @@ diff -Nur p7zip_9.38.orig/GUI/help/general/formats.htm p7zip_9.38/GUI/help/gener RPM rpm PPMD ppmd SPLIT 001 002 ... -diff -Nur p7zip_9.38.orig/README p7zip_9.38/README ---- p7zip_9.38.orig/README 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/README 2015-02-11 00:58:49.177442615 -0200 -@@ -8,7 +8,7 @@ +diff --git a/README b/README +index 576d3f7..22e94fc 100644 +--- a/README ++++ b/README +@@ -8,7 +8,7 @@ p7zip is a port of the Windows programs 7z.exe and 7za.exe provided by 7-zip. 7-zip is a file archiver with the highest compression ratio. Homepage : www.7-zip.org -- 7z uses plugins (7z.so and Codecs/Rar29.so) to handle archives. -+ 7z uses plugin 7z.so to handle archives. - 7za is a stand-alone executable. - 7za handles less archive formats than 7z.exe. +- 7z uses plugins (7z.so and Codecs/Rar.so) to handle archives. ++ 7z uses plugins (7z.so) to handle archives. + 7za is a stand-alone executable (7za handles less archive formats than 7z). 7zr is a light stand-alone executable that supports only 7z/LZMA/BCJ/BCJ2. -@@ -66,7 +66,6 @@ - make sfx : to build bin/7zCon.sfx (7za can now create SFX archive) - make 7z : to build bin/7z and its plugins : + +@@ -63,7 +63,6 @@ BUILD : + make sfx : to build bin/7zCon.sfx (7za can now create SFX archive) + make 7z : to build bin/7z and its plugins : - "bin/7z.so" (GNU LGPL + AES code license) -- - "bin/Codecs/Rar29.so" (GNU LGPL + unRAR restriction) - make 7zr : to build bin/7zr - make all : to build bin/7za and bin/7zCon.sfx - make all2 : to build bin/7za, bin/7z (with its plugins) and bin/7zCon.sfx -@@ -77,7 +76,6 @@ +- - "bin/Codecs/Rar.so" (GNU LGPL + unRAR restriction) + make 7zr : to build bin/7zr + make all : to build bin/7za and bin/7zCon.sfx + make all2 : to build bin/7za, bin/7z (with its plugins) and bin/7zCon.sfx +@@ -74,7 +73,6 @@ BUILD : - make 7zG : to build bin/7zG and its plugins : + make 7zG : to build bin/7zG and its plugins : - "bin/7z.so" (GNU LGPL + AES code license) -- - "bin/Codecs/Rar29.so" (GNU LGPL + unRAR restriction) - make test_7zG : to test bin/7zG (extracting, archiving, ...) +- - "bin/Codecs/Rar.so" (GNU LGPL + unRAR restriction) + make test_7zG : to test bin/7zG (extracting, archiving, ...) -diff -Nur p7zip_9.38.orig/Utils/bin_to_sources.py p7zip_9.38/Utils/bin_to_sources.py ---- p7zip_9.38.orig/Utils/bin_to_sources.py 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/Utils/bin_to_sources.py 2015-02-11 00:59:19.557691352 -0200 -@@ -13,9 +13,6 @@ +diff --git a/Utils/bin_to_sources.py b/Utils/bin_to_sources.py +index 1be72ec..7da359a 100644 +--- a/Utils/bin_to_sources.py ++++ b/Utils/bin_to_sources.py +@@ -13,9 +13,6 @@ file0='Utils/file_7zCon_sfx.py' dir0='CPP/7zip/UI/Console' file0='Utils/file_7z.py' -dir0='CPP/7zip/Compress/Rar' --file0='Utils/file_Codecs_Rar29_so.py' +-file0='Utils/file_Codecs_Rar_so.py' - dir0='CPP/7zip/Bundles/Format7zFree' file0='Utils/file_7z_so.py' -diff -Nur p7zip_9.38.orig/Utils/file_7z_so.py p7zip_9.38/Utils/file_7z_so.py ---- p7zip_9.38.orig/Utils/file_7z_so.py 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/Utils/file_7z_so.py 2015-02-11 00:59:29.737774764 -0200 -@@ -106,7 +106,6 @@ - 'CPP/7zip/Archive/NtfsHandler.cpp', +diff --git a/Utils/file_7z_so.py b/Utils/file_7z_so.py +index 7ca9fff..43edb87 100644 +--- a/Utils/file_7z_so.py ++++ b/Utils/file_7z_so.py +@@ -111,8 +111,6 @@ files_cpp=[ 'CPP/7zip/Archive/PeHandler.cpp', 'CPP/7zip/Archive/PpmdHandler.cpp', + 'CPP/7zip/Archive/QcowHandler.cpp', - 'CPP/7zip/Archive/Rar/RarHandler.cpp', +- 'CPP/7zip/Archive/Rar/Rar5Handler.cpp', 'CPP/7zip/Archive/RpmHandler.cpp', 'CPP/7zip/Archive/SplitHandler.cpp', 'CPP/7zip/Archive/SquashfsHandler.cpp', -@@ -209,8 +208,6 @@ +@@ -215,9 +213,6 @@ files_cpp=[ 'CPP/7zip/Crypto/MyAesReg.cpp', 'CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp', 'CPP/7zip/Crypto/RandGen.cpp', - 'CPP/7zip/Crypto/Rar20Crypto.cpp', +- 'CPP/7zip/Crypto/Rar5Aes.cpp', - 'CPP/7zip/Crypto/RarAes.cpp', - 'CPP/7zip/Crypto/Sha1.cpp', - 'CPP/7zip/Crypto/Sha1Reg.cpp', 'CPP/7zip/Crypto/WzAes.cpp', -diff -Nur p7zip_9.38.orig/Utils/generate.py p7zip_9.38/Utils/generate.py ---- p7zip_9.38.orig/Utils/generate.py 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/Utils/generate.py 2015-02-11 00:59:35.954492385 -0200 -@@ -247,7 +247,6 @@ + 'CPP/7zip/Crypto/ZipCrypto.cpp', + 'CPP/7zip/Crypto/ZipStrong.cpp', +diff --git a/Utils/generate.py b/Utils/generate.py +index 132024a..62c0456 100755 +--- a/Utils/generate.py ++++ b/Utils/generate.py +@@ -281,7 +281,6 @@ import file_7zr import file_7zG import file_7zFM import file_7z_so --import file_Codecs_Rar29_so +-import file_Codecs_Rar_so + import file_Codecs_Lzham_so import file_LzmaCon import file_Client7z - import file_P7ZIP -diff -Nur p7zip_9.38.orig/contrib/qnx630sp3/qnx630sp3-shared p7zip_9.38/contrib/qnx630sp3/qnx630sp3-shared ---- p7zip_9.38.orig/contrib/qnx630sp3/qnx630sp3-shared 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/contrib/qnx630sp3/qnx630sp3-shared 2015-02-11 01:00:19.664850955 -0200 -@@ -8,7 +8,7 @@ +@@ -440,43 +439,6 @@ LOCAL_CFLAGS := -DANDROID_NDK -fexceptions \ + -I../../../include_windows + ''') + +-project_Codecs_Rar=Structure(name="Rar",name2="Rar", +- type=TYPE_DLL, +- need_AES=False, +- includedirs=includedirs_7za, +- defines=[ "EXTERNAL_CODECS", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_REENTRANT", "ENV_UNIX", "BREAK_HANDLER", "UNICODE", "_UNICODE", "UNIX_USE_WIN_FILE" ], +- files_c=file_Codecs_Rar_so.files_c, +- files_cpp=file_Codecs_Rar_so.files_cpp, +- cmake_end=''' +- +-find_library(DL_LIB dl) +- +-link_directories(${DL_LIB_PATH}) +- +-IF(APPLE) +- TARGET_LINK_LIBRARIES(Rar ${COREFOUNDATION_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) +-ELSE(APPLE) +- IF(HAVE_PTHREADS) +- TARGET_LINK_LIBRARIES(Rar ${CMAKE_THREAD_LIBS_INIT} dl) +- ENDIF(HAVE_PTHREADS) +-ENDIF(APPLE) +- +-''', +-android_header=r''' +-LOCAL_CFLAGS := -DANDROID_NDK -fexceptions \ +- -DNDEBUG -D_REENTRANT -DENV_UNIX \ +- -DEXTERNAL_CODECS \ +- -DBREAK_HANDLER \ +- -DUNICODE -D_UNICODE -DUNIX_USE_WIN_FILE \ +- -I../../../Windows \ +- -I../../../Common \ +- -I../../../../C \ +--I../../../myWindows \ +--I../../../ \ +--I../../../include_windows +-''') +- +- + + project_Codecs_Lzham=Structure(name="Lzham",name2="Lzham", + type=TYPE_DLL, +@@ -762,7 +724,6 @@ generate_makefile_list('../CPP/7zip/Bundles/Alone/makefile.list',project_7za) + generate_makefile_list('../CPP/7zip/Bundles/Alone7z/makefile.list',project_7zr) + generate_makefile_list('../CPP/7zip/UI/Console/makefile.list',project_7z) + generate_makefile_list('../CPP/7zip/Bundles/Format7zFree/makefile.list',project_Format7zFree) +-generate_makefile_list('../CPP/7zip/Compress/Rar/makefile.list',project_Codecs_Rar,'../../../../bin/Codecs') + generate_makefile_list('../CPP/7zip/Compress/Lzham/makefile.list',project_Codecs_Lzham,'../../../../bin/Codecs') + generate_makefile_list('../CPP/7zip/Bundles/SFXCon/makefile.list',project_7zCon_sfx) + generate_makefile_list('../CPP/7zip/UI/GUI/makefile.list',project_7zG) +@@ -776,7 +737,6 @@ generate_pro('../CPP/7zip/QMAKE/7za/7za.pro',project_7za) + generate_pro('../CPP/7zip/QMAKE/7zr/7zr.pro',project_7zr) + generate_pro('../CPP/7zip/QMAKE/7z_/7z_.pro',project_7z) + generate_pro('../CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro',project_Format7zFree) +-generate_pro('../CPP/7zip/QMAKE/Rar/Rar.pro',project_Codecs_Rar) + generate_pro('../CPP/7zip/QMAKE/Lzham/Lzham.pro',project_Codecs_Lzham) + + generate_premake4('../CPP/7zip/PREMAKE/premake4.lua',project_7za) +diff --git a/contrib/qnx630sp3/qnx630sp3-shared b/contrib/qnx630sp3/qnx630sp3-shared +index 6f5481f..ea07114 100644 +--- a/contrib/qnx630sp3/qnx630sp3-shared ++++ b/contrib/qnx630sp3/qnx630sp3-shared +@@ -8,7 +8,7 @@ mv ./bin/7z ../${BIN} && mv ./bin/7za ../${BIN} && mv ./bin/7zr ../${BIN} && mv make clean && \ cp makefile.qnx_shared.so makefile.machine && \ make 7z && \ --mv ./bin/7z.so ../${BIN} && mv ./bin/Codecs/Rar29.so ../${BIN}/Codecs && \ +-mv ./bin/7z.so ../${BIN} && mv ./bin/Codecs/Rar.so ../${BIN}/Codecs && \ +mv ./bin/7z.so ../${BIN} && \ make clean && \ mv makefile.machine.bak makefile.machine echo "All done - look for binaries in ../${BIN}" -diff -Nur p7zip_9.38.orig/makefile p7zip_9.38/makefile ---- p7zip_9.38.orig/makefile 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/makefile 2015-02-11 00:27:17.821858982 -0200 -@@ -56,7 +56,6 @@ +diff --git a/makefile b/makefile +index 745c8ed..f8e8e33 100644 +--- a/makefile ++++ b/makefile +@@ -31,7 +31,6 @@ depend: $(MAKE) -C CPP/7zip/UI/Client7z depend $(MAKE) -C CPP/7zip/UI/Console depend $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend - $(MAKE) -C CPP/7zip/Compress/Rar depend - $(MAKE) -C check/my_86_filter depend $(MAKE) -C CPP/7zip/UI/GUI depend $(MAKE) -C CPP/7zip/UI/FileManager depend -@@ -68,7 +67,6 @@ + +@@ -42,7 +41,6 @@ sfx: common common7z:common $(MKDIR) bin/Codecs $(MAKE) -C CPP/7zip/Bundles/Format7zFree all - $(MAKE) -C CPP/7zip/Compress/Rar all - 7z: common7z - $(MAKE) -C CPP/7zip/UI/Console all -@@ -93,7 +91,6 @@ + lzham:common + $(MKDIR) bin/Codecs +@@ -67,7 +65,6 @@ clean_C: $(MAKE) -C CPP/7zip/UI/FileManager clean $(MAKE) -C CPP/7zip/UI/GUI clean $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean - $(MAKE) -C CPP/7zip/Compress/Rar clean + $(MAKE) -C CPP/7zip/Compress/Lzham clean $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2 $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean - $(MAKE) -C CPP/7zip/TEST/TestUI clean -diff -Nur p7zip_9.38.orig/makefile.oldmake p7zip_9.38/makefile.oldmake ---- p7zip_9.38.orig/makefile.oldmake 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/makefile.oldmake 2015-02-11 00:26:43.094917671 -0200 -@@ -56,7 +56,6 @@ - cd CPP/7zip/UI/Client7z ; $(MAKE) depend - cd CPP/7zip/UI/Console ; $(MAKE) depend - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend -- cd CPP/7zip/Compress/Rar ; $(MAKE) depend - cd check/my_86_filter ; $(MAKE) depend - cd CPP/7zip/UI/GUI ; $(MAKE) depend - cd CPP/7zip/UI/FileManager ; $(MAKE) depend -@@ -68,7 +67,6 @@ +diff --git a/makefile.oldmake b/makefile.oldmake +index afc681c..690af08 100644 +--- a/makefile.oldmake ++++ b/makefile.oldmake +@@ -31,7 +31,6 @@ depend: + cd CPP/7zip/UI/Client7z ; $(MAKE) depend + cd CPP/7zip/UI/Console ; $(MAKE) depend + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend +- cd CPP/7zip/Compress/Rar ; $(MAKE) depend + cd CPP/7zip/UI/GUI ; $(MAKE) depend + cd CPP/7zip/UI/FileManager ; $(MAKE) depend + +@@ -42,7 +41,6 @@ sfx: common common7z:common $(MKDIR) bin/Codecs cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all - cd CPP/7zip/Compress/Rar ; $(MAKE) all - 7z: common7z - cd CPP/7zip/UI/Console ; $(MAKE) all -@@ -93,7 +91,6 @@ + lzham:common + $(MKDIR) bin/Codecs +@@ -67,7 +65,6 @@ clean_C: cd CPP/7zip/UI/FileManager ; $(MAKE) clean cd CPP/7zip/UI/GUI ; $(MAKE) clean cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean - cd CPP/7zip/Compress/Rar ; $(MAKE) clean - cd CPP/7zip/Bundles/LzmaCon ; $(MAKE) clean + cd CPP/7zip/Compress/Lzham ; $(MAKE) clean + cd CPP/7zip/Bundles/LzmaCon ; $(MAKE) clean2 cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean - cd CPP/7zip/TEST/TestUI ; $(MAKE) clean -diff -Nur p7zip_9.38.orig/makefile.qnx_shared.so p7zip_9.38/makefile.qnx_shared.so ---- p7zip_9.38.orig/makefile.qnx_shared.so 1989-12-31 22:00:00.000000000 -0200 -+++ p7zip_9.38/makefile.qnx_shared.so 2015-02-11 00:19:25.384931200 -0200 -@@ -1,5 +1,4 @@ +diff --git a/makefile.qnx_shared.so b/makefile.qnx_shared.so +index abd1caf..cff5485 100644 +--- a/makefile.qnx_shared.so ++++ b/makefile.qnx_shared.so +@@ -1,5 +1,5 @@ ################################################### --# makefile.machine for "7z.so , Codecs/Rar29.so" : +-# makefile.machine for "7z.so , Codecs/Rar.so" : ++# makefile.machine for "7z.so" : # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target - OPTFLAGS=-O + OPTFLAGS=-O -s -- cgit v1.2.3