HCoop / jackhill / guix / guix.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
gnu: openscad: Update to 2021.01 [maybe fixes TALOS-2020-1222, TALOS-2020-1223].
[jackhill/guix/guix.git] / gnu / packages / patches / p7zip-remove-unused-code.patch
CommitLineData
adbd7faf
KK		 1diff --git a/C/Sha1.c b/C/Sha1.c
2index 55c1c63..48b4c5d 100644
3--- a/C/Sha1.c
4+++ b/C/Sha1.c
5@@ -104,39 +104,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest)
6 destDigest[4] = p->state[4] + e;
7 }
8
9-void Sha1_UpdateBlock_Rar(CSha1 *p, UInt32 *data, int returnRes)
10-{
11- UInt32 a, b, c, d, e;
12- UInt32 W[kNumW];
13-
14- a = p->state[0];
15- b = p->state[1];
16- c = p->state[2];
17- d = p->state[3];
18- e = p->state[4];
19-
20- RX_15
21-
22- RX_1_4(R0, R1, 15);
23-
24- RX_20(R2, 20);
25- RX_20(R3, 40);
26- RX_20(R4, 60);
27-
28- p->state[0] += a;
29- p->state[1] += b;
30- p->state[2] += c;
31- p->state[3] += d;
32- p->state[4] += e;
33-
34- if (returnRes)
35- {
36- unsigned i;
37- for (i = 0 ; i < SHA1_NUM_BLOCK_WORDS; i++)
38- data[i] = W[kNumW - SHA1_NUM_BLOCK_WORDS + i];
39- }
40-}
41-
42 #define Sha1_UpdateBlock(p) Sha1_GetBlockDigest(p, p->buffer, p->state)
43
44 void Sha1_Update(CSha1 *p, const Byte *data, size_t size)
45@@ -212,46 +179,6 @@ void Sha1_Update(CSha1 *p, const Byte *data, size_t size)
46 }
47 }
48
49-void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size /* , int rar350Mode */)
50-{
51- int returnRes = False;
52-
53- unsigned pos = (unsigned)p->count & 0x3F;
54- p->count += size;
55-
56- while (size--)
57- {
58- unsigned pos2 = (pos & 3);
59- UInt32 v = ((UInt32)*data++) << (8 * (3 - pos2));
60- UInt32 *ref = &(p->buffer[pos >> 2]);
61- pos++;
62- if (pos2 == 0)
63- {
64- *ref = v;
65- continue;
66- }
67- *ref |= v;
68-
69- if (pos == SHA1_BLOCK_SIZE)
70- {
71- pos = 0;
72- Sha1_UpdateBlock_Rar(p, p->buffer, returnRes);
73- if (returnRes)
74- {
75- unsigned i;
76- for (i = 0; i < SHA1_NUM_BLOCK_WORDS; i++)
77- {
78- UInt32 d = p->buffer[i];
79- Byte *prev = data + i * 4 - SHA1_BLOCK_SIZE;
80- SetUi32(prev, d);
81- }
82- }
83- // returnRes = rar350Mode;
84- returnRes = True;
85- }
86- }
87-}
88-
89 void Sha1_Final(CSha1 *p, Byte *digest)
90 {
91 unsigned pos = (unsigned)p->count & 0x3F;
92diff --git a/C/Sha1.h b/C/Sha1.h
93index aa22ec3..9c45653 100644
94--- a/C/Sha1.h
95+++ b/C/Sha1.h
96@@ -27,8 +27,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest);
97 void Sha1_Update(CSha1 *p, const Byte *data, size_t size);
98 void Sha1_Final(CSha1 *p, Byte *digest);
99
100-void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size /* , int rar350Mode */);
101-
102 void Sha1_32_PrepareBlock(const CSha1 *p, UInt32 *block, unsigned size);
103 void Sha1_32_Update(CSha1 *p, const UInt32 *data, size_t size);
104 void Sha1_32_Final(CSha1 *p, UInt32 *digest);
105diff --git a/CPP/7zip/Archive/7z/7zUpdate.cpp b/CPP/7zip/Archive/7z/7zUpdate.cpp
106index a0571e7..43ad3e9 100644
107--- a/CPP/7zip/Archive/7z/7zUpdate.cpp
108+++ b/CPP/7zip/Archive/7z/7zUpdate.cpp
109@@ -562,7 +562,7 @@ static int CompareEmptyItems(const unsigned *p1, const unsigned *p2, void *param
110 }
111
112 static const char *g_Exts =
113- " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rar rpm sit zoo"
114+ " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rpm sit zoo"
115 " zip jar ear war msi"
116 " 3gp avi mov mpeg mpg mpe wmv"
117 " aac ape fla flac la mp3 m4a mp4 ofr ogg pac ra rm rka shn swa tta wv wma wav"
118diff --git a/CPP/7zip/Bundles/Format7zFree/makefile.list b/CPP/7zip/Bundles/Format7zFree/makefile.list
119index da2056b..1dcf1a5 100644
120--- a/CPP/7zip/Bundles/Format7zFree/makefile.list
121+++ b/CPP/7zip/Bundles/Format7zFree/makefile.list
122@@ -87,8 +87,6 @@ SRCS=\
123 ../../../../CPP/7zip/Archive/PeHandler.cpp \
124 ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
125 ../../../../CPP/7zip/Archive/QcowHandler.cpp \
126- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
127- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
128 ../../../../CPP/7zip/Archive/RpmHandler.cpp \
129 ../../../../CPP/7zip/Archive/SplitHandler.cpp \
130 ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
131@@ -191,9 +189,6 @@ SRCS=\
132 ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
133 ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
134 ../../../../CPP/7zip/Crypto/RandGen.cpp \
135- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
136- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
137- ../../../../CPP/7zip/Crypto/RarAes.cpp \
138 ../../../../CPP/7zip/Crypto/WzAes.cpp \
139 ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
140 ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
141@@ -485,10 +480,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Archive/PpmdHandler.cpp
142 $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp
143 QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp
144 $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp
145-RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
146- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
147-Rar5Handler.o : ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp
148- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp
149 RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp
150 $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp
151 SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp
152@@ -693,12 +684,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp
153 $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp
154 RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp
155 $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp
156-Rar20Crypto.o : ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp
157- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp
158-Rar5Aes.o : ../../../../CPP/7zip/Crypto/Rar5Aes.cpp
159- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar5Aes.cpp
160-RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp
161- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp
162 WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp
163 $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp
164 ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp
165@@ -869,8 +854,6 @@ OBJS=\
166 PeHandler.o \
167 PpmdHandler.o \
168 QcowHandler.o \
169- RarHandler.o \
170- Rar5Handler.o \
171 RpmHandler.o \
172 SplitHandler.o \
173 SquashfsHandler.o \
174@@ -973,9 +956,6 @@ OBJS=\
175 MyAesReg.o \
176 Pbkdf2HmacSha1.o \
177 RandGen.o \
178- Rar20Crypto.o \
179- Rar5Aes.o \
180- RarAes.o \
181 WzAes.o \
182 ZipCrypto.o \
183 ZipStrong.o \
184diff --git a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
185index 61f41f9..adc7117 100644
186--- a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
187+++ b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
188@@ -126,8 +126,6 @@ add_library(7z MODULE
189 "../../../../CPP/7zip/Archive/PeHandler.cpp"
190 "../../../../CPP/7zip/Archive/PpmdHandler.cpp"
191 "../../../../CPP/7zip/Archive/QcowHandler.cpp"
192- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp"
193- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp"
194 "../../../../CPP/7zip/Archive/RpmHandler.cpp"
195 "../../../../CPP/7zip/Archive/SplitHandler.cpp"
196 "../../../../CPP/7zip/Archive/SquashfsHandler.cpp"
197@@ -230,9 +228,6 @@ add_library(7z MODULE
198 "../../../../CPP/7zip/Crypto/MyAesReg.cpp"
199 "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp"
200 "../../../../CPP/7zip/Crypto/RandGen.cpp"
201- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp"
202- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp"
203- "../../../../CPP/7zip/Crypto/RarAes.cpp"
204 "../../../../CPP/7zip/Crypto/WzAes.cpp"
205 "../../../../CPP/7zip/Crypto/ZipCrypto.cpp"
206 "../../../../CPP/7zip/Crypto/ZipStrong.cpp"
207diff --git a/CPP/7zip/Crypto/Sha1Cls.h b/CPP/7zip/Crypto/Sha1Cls.h
208index 71acbde..cde4a57 100644
209--- a/CPP/7zip/Crypto/Sha1Cls.h
210+++ b/CPP/7zip/Crypto/Sha1Cls.h
211@@ -28,7 +28,6 @@ class CContext: public CContextBase
212 {
213 public:
214 void Update(const Byte *data, size_t size) throw() { Sha1_Update(&_s, data, size); }
215- void UpdateRar(Byte *data, size_t size /* , bool rar350Mode */) throw() { Sha1_Update_Rar(&_s, data, size /* , rar350Mode ? 1 : 0 */); }
216 void Final(Byte *digest) throw() { Sha1_Final(&_s, digest); }
217 };
218
219diff --git a/CPP/7zip/Guid.txt b/CPP/7zip/Guid.txt
220index 7edab6e..cc22992 100644
221--- a/CPP/7zip/Guid.txt
222+++ b/CPP/7zip/Guid.txt
223@@ -151,7 +151,6 @@ Handler GUIDs:
224
225 01 Zip
226 02 BZip2
227- 03 Rar
228 04 Arj
229 05 Z
230 06 Lzh
231@@ -168,7 +167,6 @@ Handler GUIDs:
232 C9 VDI
233 CA Qcow
234 CB GPT
235- CC Rar5
236 CD IHex
237 CE Hxs
238 CF TE
239diff --git a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro
240index afa36d4..93c45c7 100644
241--- a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro
242+++ b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro
243@@ -137,8 +137,6 @@ SOURCES += \
244 ../../../../CPP/7zip/Archive/PeHandler.cpp \
245 ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
246 ../../../../CPP/7zip/Archive/QcowHandler.cpp \
247- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
248- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
249 ../../../../CPP/7zip/Archive/RpmHandler.cpp \
250 ../../../../CPP/7zip/Archive/SplitHandler.cpp \
251 ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
252@@ -241,9 +239,6 @@ SOURCES += \
253 ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
254 ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
255 ../../../../CPP/7zip/Crypto/RandGen.cpp \
256- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
257- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
258- ../../../../CPP/7zip/Crypto/RarAes.cpp \
259 ../../../../CPP/7zip/Crypto/WzAes.cpp \
260 ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
261 ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
262diff --git a/CPP/7zip/QMAKE/all.pro b/CPP/7zip/QMAKE/all.pro
263index a565ba8..6668619 100644
264--- a/CPP/7zip/QMAKE/all.pro
265+++ b/CPP/7zip/QMAKE/all.pro
266@@ -4,7 +4,6 @@ SUBDIRS = 7za \
267 7zr \
268 7z_ \
269 Format7zFree \
270- Rar \
271 Lzham \
272 test_lib
273
274diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp b/CPP/7zip/UI/Client7z/Client7z.cpp
275index d0eca6d..7f4e6e2 100644
276--- a/CPP/7zip/UI/Client7z/Client7z.cpp
277+++ b/CPP/7zip/UI/Client7z/Client7z.cpp
278@@ -32,7 +32,7 @@ HINSTANCE g_hInstance = 0;
279 #endif
280
281 // Tou can find the list of all GUIDs in Guid.txt file.
282-// use another CLSIDs, if you want to support other formats (zip, rar, ...).
283+// use another CLSIDs, if you want to support other formats (zip, ...).
284 // {23170F69-40C1-278A-1000-000110070000}
285
286 DEFINE_GUID(CLSID_CFormat7z,
287diff --git a/CPP/7zip/UI/Common/LoadCodecs.h b/CPP/7zip/UI/Common/LoadCodecs.h
288index ac9eeac..076bd1c 100644
289--- a/CPP/7zip/UI/Common/LoadCodecs.h
290+++ b/CPP/7zip/UI/Common/LoadCodecs.h
291@@ -158,7 +158,6 @@ struct CArcInfoEx
292 void AddExts(const UString &ext, const UString &addExt);
293
294 bool IsSplit() const { return StringsAreEqualNoCase_Ascii(Name, "Split"); }
295- // bool IsRar() const { return StringsAreEqualNoCase_Ascii(Name, "Rar"); }
296
297 CArcInfoEx():
298 Flags(0),
299diff --git a/CPP/7zip/UI/Common/OpenArchive.cpp b/CPP/7zip/UI/Common/OpenArchive.cpp
300index 7d5b0c4..88ea5ab 100644
301--- a/CPP/7zip/UI/Common/OpenArchive.cpp
302+++ b/CPP/7zip/UI/Common/OpenArchive.cpp
303@@ -1063,7 +1063,6 @@ static const char * const k_Formats_with_simple_signuature[] =
304 {
305 "7z"
306 , "xz"
307- , "rar"
308 , "bzip2"
309 , "gzip"
310 , "cab"
311@@ -1720,29 +1719,6 @@ HRESULT CArc::OpenStream2(const COpenOptions &op)
312 {
313 // signature search was here
314 }
315- else if (extension.IsEqualTo("000") || extension.IsEqualTo("001"))
316- {
317- int i = FindFormatForArchiveType(op.codecs, orderIndices, "rar");
318- if (i >= 0)
319- {
320- const size_t kBufSize = (1 << 10);
321- byteBuffer.Alloc(kBufSize);
322- size_t processedSize = kBufSize;
323- RINOK(ReadStream(op.stream, byteBuffer, &processedSize));
324- if (processedSize >= 16)
325- {
326- const Byte *buf = byteBuffer;
327- const Byte kRarHeader[] = { 0x52 , 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00 };
328- if (TestSignature(buf, kRarHeader, 7) && buf[9] == 0x73 && (buf[10] & 1) != 0)
329- {
330- orderIndices2.Add(orderIndices[i]);
331- orderIndices[i] = -1;
332- if (i >= (int)numFinded)
333- numFinded++;
334- }
335- }
336- }
337- }
338 else
339 {
340 const size_t kBufSize = (1 << 10);
341diff --git a/CPP/7zip/UI/FileManager/FM_rc.cpp b/CPP/7zip/UI/FileManager/FM_rc.cpp
342index 83578ed..034feed 100644
343--- a/CPP/7zip/UI/FileManager/FM_rc.cpp
344+++ b/CPP/7zip/UI/FileManager/FM_rc.cpp
345@@ -821,8 +821,6 @@ REGISTER_STRINGTABLE(g_stringTable)
346
347 /////////////////////////////////////////////////////
348
349-#include "res/ParentFolder.h"
350-
351 SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) :
352 wxPanel(parent,id) , m_frame(frame), _wList(0)
353 {
354@@ -840,7 +838,7 @@ REGISTER_STRINGTABLE(g_stringTable)
355 int sizes[] = {150, 250, 350, -1};
356 wxArrayString pathArray;
357 wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL);
358- m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
359+ m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
360 m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT );
361 pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0);
362 pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5);
363diff --git a/CPP/ANDROID/Format7zFree/jni/Android.mk b/CPP/ANDROID/Format7zFree/jni/Android.mk
364index 7c74e73..48cb4fa 100644
365--- a/CPP/ANDROID/Format7zFree/jni/Android.mk
366+++ b/CPP/ANDROID/Format7zFree/jni/Android.mk
367@@ -91,8 +91,6 @@ LOCAL_SRC_FILES := \
368 ../../../../CPP/7zip/Archive/PeHandler.cpp \
369 ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
370 ../../../../CPP/7zip/Archive/QcowHandler.cpp \
371- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
372- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
373 ../../../../CPP/7zip/Archive/RpmHandler.cpp \
374 ../../../../CPP/7zip/Archive/SplitHandler.cpp \
375 ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
376@@ -195,9 +193,6 @@ LOCAL_SRC_FILES := \
377 ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
378 ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
379 ../../../../CPP/7zip/Crypto/RandGen.cpp \
380- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
381- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
382- ../../../../CPP/7zip/Crypto/RarAes.cpp \
383 ../../../../CPP/7zip/Crypto/WzAes.cpp \
384 ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
385 ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
386diff --git a/ChangeLog b/ChangeLog
387index daabd8e..f2a01d6 100644
388--- a/ChangeLog
389+++ b/ChangeLog
390@@ -28,7 +28,6 @@ Version 16.00 (never published)
391 - 7z update bcj bugs were fixed.
392 - split (aaa.001) fixed
393 - iso loop fix
394- - rar4 multivol -stdin kpidSize
395 - drag and drop 1<2.txt
396 - memory access violation fix
397
398@@ -80,11 +79,6 @@ Version 15.12 (never published)
399 - "There are no errors" string after "Test" operation inside archive.
400 - The bugs in LZMA SDK were fixed (but these bugs are not related directly to 7-Zip's code).
401
402-
403- - From Windows version of 7-Zip 15.11 :
404- - Some bugs were fixed.
405- - 7-Zip 15.10 showed incorrect error message about missing volume for multivolume RAR archives.
406-
407 - ..../LZHAM added
408
409
410@@ -104,9 +98,6 @@ Version 15.10 beta
411 version (-m switch).
412 - Some bugs were fixed.
413 - extracting from solid wim archives worked incorrectly in some cases,
414- - Also there are some minor changes.
415- - 7-Zip can show the name of missing volume for multivolume RAR and VMDK archives.
416- - Some internal changes with 7-Zip Benchmark.
417
418 Version 15.09 beta
419 ==================
420@@ -128,8 +119,6 @@ Version 15.08 beta
421 Version 15.07 beta
422 ==================
423
424- - "bin/Codecs/Rar29.so" renamed to "bin/Codecs/Rar.so"
425-
426 - support for cygwin 64 bits
427
428 - support for cygwin 64 bits with asm
429@@ -153,15 +142,12 @@ Version 15.07 beta
430
431 - From Windows version of 7-zip 15.06 beta:
432
433- - 7-Zip now can extract RAR5 archives.
434 - 7-Zip now doesn't sort files by type while adding to solid 7z archive.
435 new -mqs switch to sort files by type while adding to solid 7z archive.
436 - The BUG in 7-Zip File Manager was fixed:
437 The "Move" operation to open 7z archive didn't delete empty files.
438 - The BUG in 15.05 was fixed:
439 console version added some text to the end of stdout stream, is -so switch was used.
440- - The BUG in 9.30 - 15.05 was fixed:
441- 7-Zip could not open multivolume sfx RAR archive.
442 - Some bugs were fixed.
443
444 - From Windows version of 7-zip 15.05 beta:
445@@ -214,9 +200,6 @@ Version 9.38
446 - bug #139 "password from commanline is visible in processes list"
447 Now the characters of the password are replaced with *.
448
449- - From Windows version of 7-zip
450- - bug#138 If you extract the password with # program crashes
451- 7z now supports long password in RAR 3 and 4.
452
453
454
455@@ -247,12 +230,6 @@ Version 9.22
456 - #3283518 : Asm/x{32,64}/7zCrcT8U.asm introduces executable stack
457
458
459-Version 9.20.1
460-==============
461-
462- - #3211479 "p7zip 9.20 - "unsupported method" with RAR files - " fixed
463- "install.sh" installs again "bin/Codecs/Rar29.so"
464-
465 Version 9.20
466 ============
467
468@@ -325,8 +302,6 @@ Version 9.13
469 - Some bugs were fixed.
470
471
472- - #2863580 "Crash in Rar decoder on a corrupted file" fixed
473-
474 - #2860898 "Dereferencing a zero pointer in cab handler" fixed
475
476 - #2860679 "Division by zero in cab decoder" fixed
477@@ -455,7 +430,7 @@ Version 4.59 (never published)
478 - It's allowed to use -t switch for "list" and "extract" commands.
479 - Some bugs were fixed.
480
481- - Bug : wrong timestamp for files extracted from .zip or .rar archives
482+ - Bug : wrong timestamp for files extracted from .zip archives
483
484
485 Version 4.58
486@@ -468,8 +443,6 @@ Version 4.58
487 2) -mcu switch: 7-Zip uses UTF-8, if there are non-ASCII symbols.
488 3) -mcl switch: 7-Zip uses local code page.
489 - Now it's possible to store file creation time in 7z and ZIP archives (-mtc switch).
490- - 7-Zip now can unpack multivolume RAR archives created with
491- "old style volume names" scheme and names *.001, *.002, ...
492 - Now it's possible to use -mSW- and -mSW+ switches instead of -mSW=off and -mSW=on
493 - Some bugs were fixed.
494
495@@ -685,7 +658,7 @@ Version 4.44
496
497 - From Windows version of 7-zip 4.44 :
498 - 7za : Cab support
499- - Speed optimizations for LZMA, Deflate, BZip2 and unRAR.
500+ - Speed optimizations for LZMA, Deflate and BZip2.
501 - fix : now, updating a crypted header archive keeps the crypted header
502
503 - fixes in the help displayed by 7za/7z/7zr.
504@@ -805,8 +778,6 @@ Version 4.38
505
506 - patch #1465026 - Patch for install.sh for packagers
507
508- - DosDateTimeToFileTime fixed (rar format)
509-
510 - contrib/VirtualFileSystemForMidnightCommander/u7z updated
511 (thank sgh_punk)
512
513@@ -923,8 +894,6 @@ Version 4.25
514 - Some bugs were fixed
515 - DOCS/MANUAL/exit_codes.htm added
516
517- - new plugin for 7z : RAR format support (extracting only)
518-
519 - better dependencies in makefile
520
521 Version 4.23
522@@ -1112,9 +1081,6 @@ Version 4.10
523 - new port of 7za from the source of 7za 4.10Beta for Windows
524 => p7zip now work on big endian CPU.
525
526- - 7z for Unix is not maintain anymore (because as the source of unrar plugin for 7z
527- is not available, 7z is unless on Unix).
528-
529 Version 0.91
530 ============
531 - add support for FreeBSD 5.2.1
532diff --git a/DOC/License.txt b/DOC/License.txt
533index 0bcbe26..5b0dfaa 100644
534--- a/DOC/License.txt
535+++ b/DOC/License.txt
536@@ -5,15 +5,6 @@
537
538 7-Zip Copyright (C) 1999-2016 Igor Pavlov.
539
540- Licenses for files are:
541-
542- 1) CPP/7zip/Compress/Rar* files: GNU LGPL + unRAR restriction
543- 2) All other files: GNU LGPL
544-
545- The GNU LGPL + unRAR restriction means that you must follow both
546- GNU LGPL rules and unRAR restriction rules.
547-
548-
549 GNU LGPL information
550 --------------------
551
552@@ -33,21 +24,5 @@
553 USA
554
555
556- unRAR restriction
557- -----------------
558-
559- The decompression engine for RAR archives was developed using source
560- code of unRAR program.
561- All copyrights to original unRAR code are owned by Alexander Roshal.
562-
563- The license for original unRAR code has the following restriction:
564-
565- The unRAR sources cannot be used to re-create the RAR compression algorithm,
566- which is proprietary. Distribution of modified unRAR sources in separate form
567- or as a part of other software is permitted, provided that it is clearly
568- stated in the documentation and source comments that the code may
569- not be used to develop a RAR (WinRAR) compatible archiver.
570-
571-
572 --
573 Igor Pavlov
574diff --git a/DOC/MANUAL/cmdline/switches/update.htm b/DOC/MANUAL/cmdline/switches/update.htm
575index 27385b1..0190fc1 100644
576--- a/DOC/MANUAL/cmdline/switches/update.htm
577+++ b/DOC/MANUAL/cmdline/switches/update.htm
578@@ -139,7 +139,7 @@ someone in another time zone.</P>
579 <LI>UTC file systems: NTFS\r
580 <LI>UTC archive formats: .zip with -mtc switch, 7z, tar, gzip2, iso, wim\r
581 <LI>Local time file systems : FAT, FAT32\r
582-<LI>Local time archive formats : rar, zip, cab\r
583+<LI>Local time archive formats : zip, cab\r
584 </UL>\r
585 \r
586 <H4>Examples</H4>\r
587diff --git a/DOC/MANUAL/general/formats.htm b/DOC/MANUAL/general/formats.htm
588index 7996c5c..cd01bd6 100644
589--- a/DOC/MANUAL/general/formats.htm
590+++ b/DOC/MANUAL/general/formats.htm
591@@ -47,7 +47,6 @@
592 <TR> <TD align="center">NSIS</TD> <TD></TD> <TD>nsis</TD> </TR>\r
593 <TR> <TD align="center">NTFS</TD> <TD></TD> <TD>ntfs img</TD> </TR>\r
594 <TR> <TD align="center">MBR</TD> <TD></TD> <TD>mbr</TD> </TR>\r
595- <TR> <TD align="center">RAR</TD> <TD></TD> <TD>rar r00</TD> </TR>\r
596 <TR> <TD align="center">RPM</TD> <TD></TD> <TD>rpm</TD></TR>\r
597 <TR> <TD align="center">PPMD</TD> <TD></TD> <TD>ppmd</TD> </TR>\r
598 <TR> <TD align="center">QCOW2</TD> <TD></TD> <TD>qcow qcow2 qcow2c</TD> </TR>\r
599diff --git a/DOC/Methods.txt b/DOC/Methods.txt
600index 1a1c54c..daa94e2 100644
601--- a/DOC/Methods.txt
602+++ b/DOC/Methods.txt
603@@ -97,12 +97,6 @@ List of defined IDs
604 02 -
605 02 - BZip2
606
607- 03 - [Rar]
608- 01 - Rar1
609- 02 - Rar2
610- 03 - Rar3
611- 05 - Rar5
612-
613 04 - [Arj]
614 01 - Arj(1,2,3)
615 02 - Arj4
616@@ -146,10 +140,6 @@ List of defined IDs
617 01 - [Zip]
618 01 - ZipCrypto (Main Zip crypto algo)
619
620- 03 - [RAR]
621- 02 -
622- 03 - Rar29AES (AES-128 + modified SHA-1)
623-
624 07 - [7z]
625 01 - 7zAES (AES-256 + SHA-256)
626
627diff --git a/DOC/readme.txt b/DOC/readme.txt
628index 4a6998c..00591d4 100644
629--- a/DOC/readme.txt
630+++ b/DOC/readme.txt
631@@ -9,30 +9,9 @@
632 License Info
633 ------------
634
635-7-Zip is free software distributed under the GNU LGPL
636-(except for unRar code).
637+7-Zip is free software distributed under the GNU LGPL.
638 read License.txt for more infomation about license.
639
640-Notes about unRAR license:
641-
642-Please check main restriction from unRar license:
643-
644- 2. The unRAR sources may be used in any software to handle RAR
645- archives without limitations free of charge, but cannot be used
646- to re-create the RAR compression algorithm, which is proprietary.
647- Distribution of modified unRAR sources in separate form or as a
648- part of other software is permitted, provided that it is clearly
649- stated in the documentation and source comments that the code may
650- not be used to develop a RAR (WinRAR) compatible archiver.
651-
652-In brief it means:
653-1) You can compile and use compiled files under GNU LGPL rules, since
654- unRAR license almost has no restrictions for compiled files.
655- You can link these compiled files to LGPL programs.
656-2) You can fix bugs in source code and use compiled fixed version.
657-3) You can not use unRAR sources to re-create the RAR compression algorithm.
658-
659-
660 LZMA SDK
661 --------
662
663@@ -96,7 +75,6 @@ DOC Documentation
664 ---
665 7zFormat.txt - 7z format description
666 copying.txt - GNU LGPL license
667- unRarLicense.txt - License for unRAR part of source code
668 src-history.txt - Sources history
669 Methods.txt - Compression method IDs
670 readme.txt - Readme file
671diff --git a/DOC/src-history.txt b/DOC/src-history.txt
672index 6b48c80..dda8057 100644
673--- a/DOC/src-history.txt
674+++ b/DOC/src-history.txt
675@@ -188,8 +188,6 @@ HISTORY of the 7-Zip source code
676 - 7-Zip now has 128 MB dictionary limit for 32-bit version:
677 It's for speed optimization: kNumLogBits = 9 + sizeof(size_t) / 2;
678 - TAR: 'D' link flag support.
679-- 7-Zip now can unpack multivolume RAR archives created with
680- "old style volume names" scheme (-vn switch) and names *.001, *.002, ...
681 - Fixed bugs:
682 - 7-Zip FM could not copy / move files to root network folders like \\COMPNAME\FOLDERNAME\
683 In case of move it removed original files.
684@@ -200,8 +198,6 @@ HISTORY of the 7-Zip source code
685 7-zip tries to delete all extra fileds (except for WzAES).
686 And that code could hang.
687 - 7-Zip GUI didn't suggest BZip2 dictionary size used in previous run.
688- - If creation time stamp was included in .RAR archive, 7-zip used creation time stamp
689- as modification time stamp.
690
691 4.58 alpha 2 2007-12-31
692 -------------------------
693@@ -251,7 +247,6 @@ HISTORY of the 7-Zip source code
694 stratup code, or you must add CPP/Common/CRC.cpp to your project.
695 - Method ID in .7z now is 63-bit integer (UInt64).
696 - Open error messages
697-- unRar 1.5 fixed
698 - unShrink fixed
699 - BUG of 4.43 beta and 4.44 beta was fixed.
700 7-Zip compressing to .zip in multi-threading mode didn't work in some cases.
701@@ -433,11 +428,6 @@ HISTORY of the 7-Zip source code
702 contains common resurces
703
704
705-2.30 Beta 19 2002-04-11
706--------------------------
707-- SDK/Archive/Rar/Handler.cpp
708- supporting RAR29
709-
710 2.30 Beta 18 2002-03-25
711 -------------------------
712 - SDK/Archive/Cab/MSZipDecoder.cpp
713diff --git a/GUI/Contents/Info.plist b/GUI/Contents/Info.plist
714index 71650e1..d60b262 100644
715--- a/GUI/Contents/Info.plist
716+++ b/GUI/Contents/Info.plist
717@@ -311,24 +311,6 @@
718 <dict>
719 <key>CFBundleTypeExtensions</key>
720 <array>
721- <string>rar</string>
722- <string>RAR</string>
723- <string>.r00</string>
724- </array>
725- <key>CFBundleTypeIconFile</key>
726- <string>p7zip</string>
727- <key>CFBundleTypeName</key>
728- <string>Rar</string>
729- <key>CFBundleTypeRole</key>
730- <string>Viewer</string>
731- <key>LSTypeIsPackage</key>
732- <false/>
733- <key>NSPersistentStoreTypeKey</key>
734- <string>XML</string>
735- </dict>
736- <dict>
737- <key>CFBundleTypeExtensions</key>
738- <array>
739 <string>ace</string>
740 <string>ACE</string>
741 <string>.c00</string>
742diff --git a/README b/README
743index b76407f..c03917b 100644
744--- a/README
745+++ b/README
746@@ -8,7 +8,7 @@ p7zip is a port of the Windows programs 7z.exe and 7za.exe provided by 7-zip.
747 7-zip is a file archiver with the highest compression ratio.
748 Homepage : www.7-zip.org
749
750- 7z uses plugins (7z.so and Codecs/Rar.so) to handle archives.
751+ 7z uses plugins (7z.so) to handle archives.
752 7za is a stand-alone executable (7za handles less archive formats than 7z).
753 7zr is a light stand-alone executable that supports only 7z/LZMA/BCJ/BCJ2.
754
755@@ -63,7 +63,6 @@ BUILD :
756 make sfx : to build bin/7zCon.sfx (7za can now create SFX archive)
757 make 7z : to build bin/7z and its plugins :
758 - "bin/7z.so" (GNU LGPL + AES code license)
759- - "bin/Codecs/Rar.so" (GNU LGPL + unRAR restriction)
760 make 7zr : to build bin/7zr
761 make all : to build bin/7za and bin/7zCon.sfx
762 make all2 : to build bin/7za, bin/7z (with its plugins) and bin/7zCon.sfx
763@@ -74,7 +73,6 @@ BUILD :
764
765 make 7zG : to build bin/7zG and its plugins :
766 - "bin/7z.so" (GNU LGPL + AES code license)
767- - "bin/Codecs/Rar.so" (GNU LGPL + unRAR restriction)
768 make test_7zG : to test bin/7zG (extracting, archiving, ...)
769
770
771diff --git a/Utils/bin_to_sources.py b/Utils/bin_to_sources.py
772index 1be72ec..7da359a 100644
773--- a/Utils/bin_to_sources.py
774+++ b/Utils/bin_to_sources.py
775@@ -13,9 +13,6 @@ file0='Utils/file_7zCon_sfx.py'
776 dir0='CPP/7zip/UI/Console'
777 file0='Utils/file_7z.py'
778
779-dir0='CPP/7zip/Compress/Rar'
780-file0='Utils/file_Codecs_Rar_so.py'
781-
782 dir0='CPP/7zip/Bundles/Format7zFree'
783 file0='Utils/file_7z_so.py'
784
785diff --git a/Utils/file_7z_so.py b/Utils/file_7z_so.py
786index 7ca9fff..43edb87 100644
787--- a/Utils/file_7z_so.py
788+++ b/Utils/file_7z_so.py
789@@ -111,8 +111,6 @@ files_cpp=[
790 'CPP/7zip/Archive/PeHandler.cpp',
791 'CPP/7zip/Archive/PpmdHandler.cpp',
792 'CPP/7zip/Archive/QcowHandler.cpp',
793- 'CPP/7zip/Archive/Rar/RarHandler.cpp',
794- 'CPP/7zip/Archive/Rar/Rar5Handler.cpp',
795 'CPP/7zip/Archive/RpmHandler.cpp',
796 'CPP/7zip/Archive/SplitHandler.cpp',
797 'CPP/7zip/Archive/SquashfsHandler.cpp',
798@@ -215,9 +213,6 @@ files_cpp=[
799 'CPP/7zip/Crypto/MyAesReg.cpp',
800 'CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp',
801 'CPP/7zip/Crypto/RandGen.cpp',
802- 'CPP/7zip/Crypto/Rar20Crypto.cpp',
803- 'CPP/7zip/Crypto/Rar5Aes.cpp',
804- 'CPP/7zip/Crypto/RarAes.cpp',
805 'CPP/7zip/Crypto/WzAes.cpp',
806 'CPP/7zip/Crypto/ZipCrypto.cpp',
807 'CPP/7zip/Crypto/ZipStrong.cpp',
808diff --git a/Utils/generate.py b/Utils/generate.py
809index 132024a..62c0456 100755
810--- a/Utils/generate.py
811+++ b/Utils/generate.py
812@@ -281,7 +281,6 @@ import file_7zr
813 import file_7zG
814 import file_7zFM
815 import file_7z_so
816-import file_Codecs_Rar_so
817 import file_Codecs_Lzham_so
818 import file_LzmaCon
819 import file_Client7z
820@@ -440,43 +439,6 @@ LOCAL_CFLAGS := -DANDROID_NDK -fexceptions \
821 -I../../../include_windows
822 ''')
823
824-project_Codecs_Rar=Structure(name="Rar",name2="Rar",
825- type=TYPE_DLL,
826- need_AES=False,
827- includedirs=includedirs_7za,
828- defines=[ "EXTERNAL_CODECS", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_REENTRANT", "ENV_UNIX", "BREAK_HANDLER", "UNICODE", "_UNICODE", "UNIX_USE_WIN_FILE" ],
829- files_c=file_Codecs_Rar_so.files_c,
830- files_cpp=file_Codecs_Rar_so.files_cpp,
831- cmake_end='''
832-
833-find_library(DL_LIB dl)
834-
835-link_directories(${DL_LIB_PATH})
836-
837-IF(APPLE)
838- TARGET_LINK_LIBRARIES(Rar ${COREFOUNDATION_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
839-ELSE(APPLE)
840- IF(HAVE_PTHREADS)
841- TARGET_LINK_LIBRARIES(Rar ${CMAKE_THREAD_LIBS_INIT} dl)
842- ENDIF(HAVE_PTHREADS)
843-ENDIF(APPLE)
844-
845-''',
846-android_header=r'''
847-LOCAL_CFLAGS := -DANDROID_NDK -fexceptions \
848- -DNDEBUG -D_REENTRANT -DENV_UNIX \
849- -DEXTERNAL_CODECS \
850- -DBREAK_HANDLER \
851- -DUNICODE -D_UNICODE -DUNIX_USE_WIN_FILE \
852- -I../../../Windows \
853- -I../../../Common \
854- -I../../../../C \
855--I../../../myWindows \
856--I../../../ \
857--I../../../include_windows
858-''')
859-
860-
861
862 project_Codecs_Lzham=Structure(name="Lzham",name2="Lzham",
863 type=TYPE_DLL,
864@@ -762,7 +724,6 @@ generate_makefile_list('../CPP/7zip/Bundles/Alone/makefile.list',project_7za)
865 generate_makefile_list('../CPP/7zip/Bundles/Alone7z/makefile.list',project_7zr)
866 generate_makefile_list('../CPP/7zip/UI/Console/makefile.list',project_7z)
867 generate_makefile_list('../CPP/7zip/Bundles/Format7zFree/makefile.list',project_Format7zFree)
868-generate_makefile_list('../CPP/7zip/Compress/Rar/makefile.list',project_Codecs_Rar,'../../../../bin/Codecs')
869 generate_makefile_list('../CPP/7zip/Compress/Lzham/makefile.list',project_Codecs_Lzham,'../../../../bin/Codecs')
870 generate_makefile_list('../CPP/7zip/Bundles/SFXCon/makefile.list',project_7zCon_sfx)
871 generate_makefile_list('../CPP/7zip/UI/GUI/makefile.list',project_7zG)
872@@ -776,7 +737,6 @@ generate_pro('../CPP/7zip/QMAKE/7za/7za.pro',project_7za)
873 generate_pro('../CPP/7zip/QMAKE/7zr/7zr.pro',project_7zr)
874 generate_pro('../CPP/7zip/QMAKE/7z_/7z_.pro',project_7z)
875 generate_pro('../CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro',project_Format7zFree)
876-generate_pro('../CPP/7zip/QMAKE/Rar/Rar.pro',project_Codecs_Rar)
877 generate_pro('../CPP/7zip/QMAKE/Lzham/Lzham.pro',project_Codecs_Lzham)
878
879 generate_premake4('../CPP/7zip/PREMAKE/premake4.lua',project_7za)
880diff --git a/contrib/qnx630sp3/qnx630sp3-shared b/contrib/qnx630sp3/qnx630sp3-shared
881index 6f5481f..ea07114 100644
882--- a/contrib/qnx630sp3/qnx630sp3-shared
883+++ b/contrib/qnx630sp3/qnx630sp3-shared
884@@ -8,7 +8,7 @@ mv ./bin/7z ../${BIN} && mv ./bin/7za ../${BIN} && mv ./bin/7zr ../${BIN} && mv
885 make clean && \
886 cp makefile.qnx_shared.so makefile.machine && \
887 make 7z && \
888-mv ./bin/7z.so ../${BIN} && mv ./bin/Codecs/Rar.so ../${BIN}/Codecs && \
889+mv ./bin/7z.so ../${BIN} && \
890 make clean && \
891 mv makefile.machine.bak makefile.machine
892 echo "All done - look for binaries in ../${BIN}"
893diff --git a/makefile b/makefile
894index 745c8ed..f8e8e33 100644
895--- a/makefile
896+++ b/makefile
897@@ -31,7 +31,6 @@ depend:
898 $(MAKE) -C CPP/7zip/UI/Client7z depend
899 $(MAKE) -C CPP/7zip/UI/Console depend
900 $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend
901- $(MAKE) -C CPP/7zip/Compress/Rar depend
902 $(MAKE) -C CPP/7zip/UI/GUI depend
903 $(MAKE) -C CPP/7zip/UI/FileManager depend
904
905@@ -42,7 +41,6 @@ sfx: common
906 common7z:common
907 $(MKDIR) bin/Codecs
908 $(MAKE) -C CPP/7zip/Bundles/Format7zFree all
909- $(MAKE) -C CPP/7zip/Compress/Rar all
910
911 lzham:common
912 $(MKDIR) bin/Codecs
913@@ -67,7 +65,6 @@ clean_C:
914 $(MAKE) -C CPP/7zip/UI/FileManager clean
915 $(MAKE) -C CPP/7zip/UI/GUI clean
916 $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean
917- $(MAKE) -C CPP/7zip/Compress/Rar clean
918 $(MAKE) -C CPP/7zip/Compress/Lzham clean
919 $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2
920 $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean
921diff --git a/makefile.oldmake b/makefile.oldmake
922index afc681c..690af08 100644
923--- a/makefile.oldmake
924+++ b/makefile.oldmake
925@@ -31,7 +31,6 @@ depend:
926 cd CPP/7zip/UI/Client7z ; $(MAKE) depend
927 cd CPP/7zip/UI/Console ; $(MAKE) depend
928 cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
929- cd CPP/7zip/Compress/Rar ; $(MAKE) depend
930 cd CPP/7zip/UI/GUI ; $(MAKE) depend
931 cd CPP/7zip/UI/FileManager ; $(MAKE) depend
932
933@@ -42,7 +41,6 @@ sfx: common
934 common7z:common
935 $(MKDIR) bin/Codecs
936 cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
937- cd CPP/7zip/Compress/Rar ; $(MAKE) all
938
939 lzham:common
940 $(MKDIR) bin/Codecs
941@@ -67,7 +65,6 @@ clean_C:
942 cd CPP/7zip/UI/FileManager ; $(MAKE) clean
943 cd CPP/7zip/UI/GUI ; $(MAKE) clean
944 cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
945- cd CPP/7zip/Compress/Rar ; $(MAKE) clean
946 cd CPP/7zip/Compress/Lzham ; $(MAKE) clean
947 cd CPP/7zip/Bundles/LzmaCon ; $(MAKE) clean2
948 cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean
949diff --git a/makefile.qnx_shared.so b/makefile.qnx_shared.so
950index abd1caf..cff5485 100644
951--- a/makefile.qnx_shared.so
952+++ b/makefile.qnx_shared.so
953@@ -1,5 +1,5 @@
954 ###################################################
955-# makefile.machine for "7z.so , Codecs/Rar.so" :
956+# makefile.machine for "7z.so" :
957 # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target
958
959 OPTFLAGS=-O -s
jackhill's copy of GNU Guix: https://guix.gnu.org/