Merge branch 'master' into focal

ci/test.sh

@@ -92,7 +92,7 @@ test x`./build-$1/test_crasher` = x
 test -z "`ls /tmp/core* 2>/dev/null`"
 
 # make sure there are no compression-related strings
-test -z "`strings -a ./build-$1/test_putser | grep -i -e lz -e xz -e deflate -e miniz -e zlib -e zstandard -e zstd -e huff -e rle -e copy -e license -e papaw`"
+test -z "`strings -a ./build-$1/test_putser | grep -i -e $1 -e miniz -e zlib -e zstandard -e zstd -e huff -e rle -e copy -e license -e papaw`"
 
 # the payload should be extracted to dir_prefix
 here=`pwd`

meson.build

@@ -82,10 +82,10 @@ elif compression == 'zstd'
     compression_sources += [
         custom_target('zstddeclib_obfuscated',
                       input: custom_target('zstddeclib',
-                                           input: 'zstd/contrib/single_file_decoder/zstddeclib-in.c',
+                                           input: 'zstd/contrib/single_file_libs/zstddeclib-in.c',
                                            output: 'zstddeclib.h',
                                            command: [
-                                               join_paths(meson.current_source_dir(), 'zstd/contrib/single_file_decoder/combine.sh'),
+                                               join_paths(meson.current_source_dir(), 'zstd/contrib/single_file_libs/combine.sh'),
                                                '-r',
                                                join_paths(meson.current_source_dir(), 'zstd/lib'),
                                                '-r',