diff --git a/debian/check-orig-suspicious.sh b/debian/check-orig-suspicious.sh index 6c1a015ed2..146acac0cb 100755 --- a/debian/check-orig-suspicious.sh +++ b/debian/check-orig-suspicious.sh @@ -19,7 +19,7 @@ grep -v '^#' ${SUS_WHITELIST} | xargs -I% sh -c 'rm -r ./% || true' echo "Checking for suspicious files..." # TODO: merge the -m stuff into suspicious-source(1). -suspicious-source -v -m text/x-objective-c +suspicious-source -v -m text/x-objective-c -m text/x-awk # The following shell snippet is a bit more strict than suspicious-source(1) find . -type f -and -not -name '.cargo-checksum.json' -exec file '{}' \; | \ sed -e 's/\btext\b\(.*\), with very long lines/verylongtext\1/g' | \ diff --git a/debian/copyright b/debian/copyright index 0afec57447..aca8045d32 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,6 +25,20 @@ Files-Excluded: src/tools/rustfmt src/tools/miri src/tools/lld +# Extraneous stuff from compiler-rt that's not needed by Rust + src/libcompiler_builtins/compiler-rt/cmake + src/libcompiler_builtins/compiler-rt/docs + src/libcompiler_builtins/compiler-rt/include + src/libcompiler_builtins/compiler-rt/lib/*san + src/libcompiler_builtins/compiler-rt/lib/fuzzer + src/libcompiler_builtins/compiler-rt/lib/interception + src/libcompiler_builtins/compiler-rt/lib/profile + src/libcompiler_builtins/compiler-rt/lib/sanitizer_common + src/libcompiler_builtins/compiler-rt/lib/scudo + src/libcompiler_builtins/compiler-rt/lib/xray + src/libcompiler_builtins/compiler-rt/test + src/libcompiler_builtins/compiler-rt/unittests + src/libcompiler_builtins/compiler-rt/www # Embedded C libraries src/vendor/backtrace-sys*/src/libbacktrace src/vendor/lzma-sys*/xz-* diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt index 214c448dbe..948e97253c 100644 --- a/debian/upstream-tarball-unsuspicious.txt +++ b/debian/upstream-tarball-unsuspicious.txt @@ -8,7 +8,6 @@ src/doc/book/*/tools/docx-to-md.xsl src/doc/rustc/src/lints/groups.md src/doc/rust-by-example/CODE_OF_CONDUCT.md src/etc/third-party/README.txt -src/libcompiler_builtins/compiler-rt/lib/tsan/go/build.bat src/libcompiler_builtins/compiler-rt/lib/BlocksRuntime/runtime.c src/libbacktrace/configure src/libbacktrace/config/libtool.m4 @@ -28,7 +27,9 @@ src/vendor/*/*/LICENSE src/vendor/*/*/*/LICENSE src/vendor/ammonia/src/lib.rs src/vendor/clap/.github/CONTRIBUTING.md -# author likes to omit line breaks in their comments +# ^ author likes to omit line breaks in their comments +src/vendor/failure/book/src/bail-and-ensure.md +# ^ same with this one src/vendor/handlebars/src/lib.rs src/vendor/maplit/README.rst src/vendor/lazy_static/src/lib.rs @@ -38,6 +39,7 @@ src/vendor/pulldown-cmark-*/tests/footnotes.rs src/vendor/pulldown-cmark-*/specs/footnotes.txt src/vendor/stable_deref_trait/src/lib.rs src/vendor/winapi-*/src/winnt.rs +src/vendor/winapi/src/lib.rs # Embedded libraries, justified in README.source # None atm @@ -72,6 +74,7 @@ src/stdsimd/crates/stdsimd-verify/x86-intel.xml src/stdsimd/stdsimd/arch/detect/test_data src/test/compile-fail/not-utf8.bin src/test/*/*.rs +src/test/*/*.stderr src/test/*/*/*.stderr src/test/*/*/*/*.stderr src/tools/*/tests/*/*.stderr