cargo-deny: update to 0.6.0

This commit is contained in:
Mikkel Hauvgaard 2020-01-21 23:01:08 +01:00 committed by Daniel Kolesa
parent 4941fb875c
commit ab95f59726
2 changed files with 11 additions and 39 deletions

View File

@ -1,38 +1,10 @@
From c6f727f08b4ebc8ebc46abe374345937a1b0f0b9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 12 Jan 2020 03:53:28 +0100
Subject: [PATCH] get rid of the vendored-openssl insanity
Using vendored openssl will break multiple targets because the
openssl-src crate only has a bunch of target triples defined.
The point of this change was to apparently simplify building
on musl, well, it worked on musl fine before and now it's broken.
This reverts https://github.com/EmbarkStudios/cargo-deny/pull/67.
---
Cargo.toml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git Cargo.toml Cargo.toml
index 566b02a..da3c844 100644
--- Cargo.toml
+++ Cargo.toml
@@ -42,7 +42,7 @@ parking_lot = "0.10.0"
petgraph = "0.4.13"
rayon = "1.2.1"
regex = { version = "1.3.1", default-features = true }
-rustsec = { version = "0.16.0", features = ["vendored-openssl"] }
+rustsec = "0.16.0"
semver = "0.9.0"
serde = { version = "1.0.103", features = ["derive"] }
serde_json = "1.0.44"
@@ -60,6 +60,3 @@ lazy_static = "1.4.0"
# We use this for creating fake crate directories for
# crawling license files on disk
tempfile = "3.1.0"
-
-[patch.crates-io]
-rustsec = { git = "https://github.com/RustSec/rustsec-crate.git", rev = "aaba369" }
--
2.24.0
@@ -54,7 +54,6 @@
[dependencies.rustsec]
version = "0.16.0"
-features = ["vendored-openssl"]
[dev-dependencies]
# We use this for pretty printing errors

View File

@ -1,7 +1,7 @@
# Template file for 'cargo-deny'
pkgname=cargo-deny
version=0.5.2
revision=2
version=0.6.0
revision=1
build_style=cargo
hostmakedepends="pkg-config perl"
makedepends="libressl-devel"
@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
homepage="https://github.com/EmbarkStudios/cargo-deny"
distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
checksum=3b0c44b22abefd115b0d972dfa95401ea904f73e88cba28cb5c148caa5747f4c
checksum=8c08619a66b2102498facf1ccc11896589981cd0ebf0972ed50efe48d2abb4f9
if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
broken="bitvec crate unimplemented for big endian"