diff options
Diffstat (limited to 'maint')
| -rwxr-xr-x | maint/check_licenses | 4 | ||||
| -rwxr-xr-x | maint/reproducible_build | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/maint/check_licenses b/maint/check_licenses index 012a53583..8fed65ae2 100755 --- a/maint/check_licenses +++ b/maint/check_licenses @@ -32,11 +32,13 @@ RECOGNIZED_LICENSES=( "Apache-2.0) OR MIT AND (MIT" # Used by unicode-ident "(MIT OR Apache-2.0) AND Unicode-3.0" + # Used by ring >= v0.17.10 + "Apache-2.0 AND ISC" ) # List of packages that don't list a license. NO_LICENSE=( - # The license for "ring" is something like "ISC AND openssl AND + # The license for "ring" < v0.17.10 is something like "ISC AND openssl AND # ssleay AND MIT"; the openssl license is not up-to-date with # modern openssl. It includes an advertising clause. :P # diff --git a/maint/reproducible_build b/maint/reproducible_build index 3cf5be6a1..2c20b4489 100755 --- a/maint/reproducible_build +++ b/maint/reproducible_build @@ -44,6 +44,18 @@ export RUSTFLAGS="-C target-cpu=westmere" cp -a "$here" /arti cd /arti +## FIXME: This is a workaround for: +## https://gitlab.torproject.org/tpo/core/arti/-/issues/1335 +## +## Since 'native-tls' >= 0.2.14 only builds on rust >= 1.80, +## and we can't use newer rust versions due to arti#1335, +## we need to downgrade 'native-tls'. +## (And similar for other libs.) +$CARGO update -p native-tls --precise 0.2.13 +$CARGO update -p zerofrom --precise 0.1.5 +$CARGO update -p litemap --precise 0.7.4 +$CARGO update -p tinystr:0.8.1 --precise 0.8.0 + cargo_build () { $CARGO build --locked "$@" } |