From ed9ea08dfb2b41a32ebf03b73a8626b78df369f7 Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@debian.org>
Date: Sat, 25 Nov 2017 15:19:13 +0100
Subject: [PATCH] Update blacklist and whitelist for import

---
 debian/check-orig-suspicious.sh          |  3 ++-
 debian/copyright                         |  4 ++++
 debian/upstream-tarball-unsuspicious.txt | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/check-orig-suspicious.sh b/debian/check-orig-suspicious.sh
index b4f2cc2c8e..6c1a015ed2 100755
--- a/debian/check-orig-suspicious.sh
+++ b/debian/check-orig-suspicious.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 ver="$1"
 test -n "$ver" || exit 2
@@ -14,6 +14,7 @@ tar xf ../rustc_$ver+dfsg1.orig.tar.xz && cd rustc-${ver/*~*/beta}-src/
 # Remove tiny files 4 bytes or less
 find . -size -4c -delete
 # Remove non-suspicious files, warning on patterns that match nothing
+echo "Excluding (i.e. removing) whitelisted files..."
 grep -v '^#' ${SUS_WHITELIST} | xargs  -I% sh -c 'rm -r ./% || true'
 echo "Checking for suspicious files..."
 
diff --git a/debian/copyright b/debian/copyright
index c62790ffc7..07f5ca8b72 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,11 +19,15 @@ Files-Excluded:
 # NB: don't exclude rust-installer, it's needed for "install" functionality
  src/tools/cargo
  src/tools/rls
+ src/tools/rustfmt
 # Embedded C libraries
  src/vendor/backtrace-sys*/src/libbacktrace
  src/vendor/lzma-sys*/xz-*
 # Embedded binary blobs
  src/vendor/dbghelp-sys*/*/*.a
+ src/vendor/mdbook/src/theme/jquery.js
+ src/vendor/mdbook/src/theme/store.js
+ src/vendor/mdbook/src/theme/playpen_editor
 # Non-free-format documents already available in other formats
  src/doc/book/second-edition/nostarch/odt
 # unused dependencies:
diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt
index c2c15bf0a0..62ff91e0d1 100644
--- a/debian/upstream-tarball-unsuspicious.txt
+++ b/debian/upstream-tarball-unsuspicious.txt
@@ -10,6 +10,7 @@ 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/rustc/*/Cargo.toml
 src/vendor/*/.travis.yml
 src/vendor/*/CHANGELOG.md
 src/vendor/*/CONTRIBUTORS.md
@@ -17,9 +18,13 @@ src/vendor/*/README.md
 src/vendor/*/LICENSE
 src/vendor/*/*/LICENSE
 src/vendor/*/*/*/LICENSE
+# author likes to omit line breaks in their comments
+src/vendor/conv/src/*.rs
 src/vendor/handlebars/src/lib.rs
 src/vendor/pulldown-cmark/tests/footnotes.rs
 src/vendor/pulldown-cmark/specs/footnotes.txt
+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
 
@@ -27,20 +32,30 @@ src/vendor/winapi/src/winnt.rs
 src/vendor/dtoa/performance.png
 src/vendor/itoa/performance.png
 src/doc/book/second-edition/tools/docx-to-md.xsl
+src/tools/clippy/.github/deploy_key.enc
 
 # False-positive, hand-editable small image
 src/etc/installer/gfx/
 src/doc/nomicon/src/img/safeandunsafe.svg
 src/doc/book/second-edition/src/img/*.png
 src/doc/book/second-edition/src/img/*.svg
+src/tools/miri/tex/final-presentation/rust-logo-512x512.png
 src/vendor/mdbook/src/theme/favicon.png
 src/vendor/pest/pest-logo.svg
 
+# Example code
+src/vendor/html5ever/examples/capi/tokenize.c
+
 # Test data
 src/rt/hoedown/test/MarkdownTest_1.0.3/Tests/Markdown*.html
 src/test/compile-fail/not-utf8.bin
 src/test/*/*.rs
+src/test/*/*/*.stderr
+src/tools/*/tests/*/*.stderr
+src/vendor/cssparser/src/css-parsing-tests/*.json
+src/vendor/cssparser/src/big-data-url.css
 src/vendor/flate2/tests/*.gz
+src/vendor/html5ever/data/bench/*.html
 src/vendor/regex/src/testdata/basic.dat
 src/vendor/regex/tests/fowler.rs
 src/vendor/tar/tests/archives/*.tar
-- 
2.39.5