summaryrefslogtreecommitdiffstats
path: root/debian/check-orig-suspicious.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:41:42 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:41:42 +0000
commit56f5bfd26c333c7f9439bb439861e59e255d3d37 (patch)
tree1873cff2936f7b3b4abf2ea3c46f78404009af50 /debian/check-orig-suspicious.sh
parentMerging upstream version 1.70.0+dfsg2. (diff)
downloadrustc-56f5bfd26c333c7f9439bb439861e59e255d3d37.tar.xz
rustc-56f5bfd26c333c7f9439bb439861e59e255d3d37.zip
Merging debian version 1.70.0+dfsg2-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/check-orig-suspicious.sh')
-rwxr-xr-xdebian/check-orig-suspicious.sh20
1 files changed, 11 insertions, 9 deletions
diff --git a/debian/check-orig-suspicious.sh b/debian/check-orig-suspicious.sh
index b27dbf767..a168b7866 100755
--- a/debian/check-orig-suspicious.sh
+++ b/debian/check-orig-suspicious.sh
@@ -3,18 +3,20 @@ set -e
ver="$1"
test -n "$ver" || exit 2
+dfsg="$2"
+if test -z "$dfsg"; then
+ dfsg=1
+fi
-SUS_WHITELIST=$(find "${PWD}/debian" -name upstream-tarball-unsuspicious.txt -type f)
+SUS_WHITELIST="$(find "${PWD}/debian" -name upstream-tarball-unsuspicious.txt -type f)"
-rm -rf rustc-${ver/*~*/beta}-src/
-tar xf ../rustc_$ver+dfsg1.orig.tar.xz && cd rustc-${ver/*~*/beta}-src/
+rm -rf "rustc-${ver/*~*/beta}-src/"
+tar xf "../rustc_$ver+dfsg$dfsg.orig.tar.xz" && cd "rustc-${ver/*~*/beta}-src/"
+if test -f "../../rustc_$ver+dfsg$dfsg.orig-extra.tar.xz" ; then
+ tar xf "../../rustc_$ver+dfsg$dfsg.orig-extra.tar.xz"
+fi
-# TODO: remove this code snippet after it gets into our cargo
-# Strip comments & blank lines before testing rust source code -
-# some authors like to write really long comments
-find . -name '*.rs' -execdir sed -i -e '\,^\s*//,d' -e '/^\s*$/d' '{}' \;
-
-/usr/share/cargo/scripts/audit-vendor-source \
+../debian/scripts/audit-vendor-source \
"$SUS_WHITELIST" \
"Files-Excluded: in debian/copyright and run a repack." \
-m text/x-script.python \