Change 7zip binaries to 7zip-zstd 19.00 v1.4.2 RRR

7zip-zstd is a fork of 7zip that includes support for lz4, zstd, and
several more compression formats. This version also includes the fix
for CVE-2018-10115.

Fix archive creation defaulting to zstd

Turns out that 7zip-zstd defaults to zstd instead of LZMA2 like regular
7zip. Since we want to remain compatible with regular 7zip, we need to
make sure to explicitly specify LZMA2 mode (-m0=lzma2) in all 7zip
archive creation commands we use.

Under # 338. Closes # 452. <--- RRR

Author: Infernio

Mopy/bash/archives.py

@@ -150,8 +150,11 @@ def compressionSettings(archive_path, blockSize, isSolid):
 
 def compressCommand(destArchive, destDir, srcFolder, solid=u'-ms=on',
                     archiveType=u'7z'): # WIP - note solid on by default (7z)
+    # 7zip-zstd defaults to zstd compression, but we want to be compatible with
+    # regular 7zip, so specify LZMA2 explicitly
+    compression_method = [u'-m0=lzma2'] if archiveType == u'7z' else []
     return [exe7z, u'a', destDir.join(destArchive).temp.s,
-            u'-t%s' % archiveType] + solid.split() + [
+            u'-t%s' % archiveType] + solid.split() + compression_method + [
             u'-y', u'-r', # quiet, recursive
             u'-o"%s"' % destDir.s,
             u'-scsUTF-8', u'-sccUTF-8', # encode output in unicode

Mopy/bash/bosh/bain.py

@@ -1505,6 +1505,10 @@ def packToArchive(self,project,archive,isSolid,blockSize,progress=None,release=F
             #--Compress
             command = u'"%s" a "%s" -t"%s" %s -y -r -o"%s" -i!"%s\\*" -x@%s -scsUTF-8 -sccUTF-8' % (
                 archives.exe7z, outFile.temp.s, archiveType, solid, outDir.s, projectDir.s, self.tempList.s)
+            if archiveType == u'7z':
+                # 7zip-zstd defaults to zstd compression, but we want to be
+                # compatible with regular 7zip, so specify LZMA2 explicitly
+                command += u' -m0=lzma2'
             try:
                 compress7z(command, outDir, outFile.tail, projectDir, progress)
             finally:

Mopy/bash/compiled/7z.dll

@@ -272,7 +272,7 @@ def pack_7z(file_list, archive, list_path):
         for node in sorted(file_list, key=unicode.lower):
             out.write(node)
             out.write("\n")
-    cmd_7z = [EXE_7z, "a", "-mx9", archive, "@%s" % list_path]
+    cmd_7z = [EXE_7z, "a", "-m0=lzma2", "-mx9", archive, "@%s" % list_path]
     try:
         utils.run_subprocess(cmd_7z, LOGGER, cwd=ROOT_PATH)
     finally: