pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

exa: Adds the missing crates which was failing fetch before.



Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Wed Jul 17 06:10:45 2019 -0500
Changeset:	d9c1125d6e417b7f0742712bece456b67d85881d

Modified Files:
	exa/Makefile
	exa/distinfo
Removed Files:
	exa/patches/patch-Cargo.lock
	exa/patches/patch-Cargo.toml

Log Message:
exa: Adds the missing crates which was failing fetch before.

pkgsrc's fetch now handles the misbehaving crates correctly.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d9c1125d6e417b7f0742712bece456b67d85881d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 exa/Makefile                 |  2 ++
 exa/distinfo                 | 10 ++++--
 exa/patches/patch-Cargo.lock | 76 --------------------------------------------
 exa/patches/patch-Cargo.toml | 19 -----------
 4 files changed, 10 insertions(+), 97 deletions(-)

diffs:
diff --git a/exa/Makefile b/exa/Makefile
index fa142a603b..d7fb244db4 100644
--- a/exa/Makefile
+++ b/exa/Makefile
@@ -44,6 +44,8 @@ CARGO_CRATE_DEPENDS+=	num-traits-0.1.43
 CARGO_CRATE_DEPENDS+=	num-traits-0.2.6
 CARGO_CRATE_DEPENDS+=	num_cpus-1.10.0
 CARGO_CRATE_DEPENDS+=	number_prefix-0.3.0
+CARGO_CRATE_DEPENDS+=	openssl-src-111.3.0+1.1.1c
+CARGO_CRATE_DEPENDS+=	openssl-sys-0.9.47
 CARGO_CRATE_DEPENDS+=	pad-0.1.5
 CARGO_CRATE_DEPENDS+=	percent-encoding-1.0.1
 CARGO_CRATE_DEPENDS+=	pkg-config-0.3.14
diff --git a/exa/distinfo b/exa/distinfo
index a007ebea96..637026045c 100644
--- a/exa/distinfo
+++ b/exa/distinfo
@@ -124,6 +124,14 @@ SHA1 (exa/number_prefix-0.3.0.crate) = 5605393f90d364ca00211fc8eb8eeb8d98763247
 RMD160 (exa/number_prefix-0.3.0.crate) = 08c016e02d4b22a1b62e5fb0dddad0d60c5a16a4
 SHA512 (exa/number_prefix-0.3.0.crate) = 014c37c477b1c99c20461dfa6deb1692d93f10c592387bdb757d9220347ec7bfce5861e82029286cf3a64e9d53427cbfc40549e358c3fbaaebeb73e91b598107
 Size (exa/number_prefix-0.3.0.crate) = 6291 bytes
+SHA1 (exa/openssl-src-111.3.0+1.1.1c.crate) = 505949b2397c7c474bac92eff35756e2a03f9af5
+RMD160 (exa/openssl-src-111.3.0+1.1.1c.crate) = adfaf595171992a7751683e7daf7f3de2b2b830f
+SHA512 (exa/openssl-src-111.3.0+1.1.1c.crate) = 4c7f0d5badb5d62e73cc324f069343f60a3431751e9b3adf4de1a474bba48767513508ce65019dfcc16433e0dc62fd36eaf1c6294b48e064f4575b40a847a64a
+Size (exa/openssl-src-111.3.0+1.1.1c.crate) = 5106252 bytes
+SHA1 (exa/openssl-sys-0.9.47.crate) = bfc921b5f16ddab6301f6811492a37cc6e781e59
+RMD160 (exa/openssl-sys-0.9.47.crate) = c94b8a5c6ede68cf8fef89937c0f8f66a5ad8446
+SHA512 (exa/openssl-sys-0.9.47.crate) = 8d3a38a5f403cbd957b069c60d80f790f2030490847113b3050afbe769b4c692b581ec763656042973167dee6ca70939fe0f15cc1150db67731fb3808d98b6cf
+Size (exa/openssl-sys-0.9.47.crate) = 44276 bytes
 SHA1 (exa/pad-0.1.5.crate) = ca5266c285579c2e204bf4b889aac7d931b6805a
 RMD160 (exa/pad-0.1.5.crate) = ddcf1ca353ad6f59c77ddb9f766f98c14c9c1718
 SHA512 (exa/pad-0.1.5.crate) = ebfdd66fa6a9dcf5f627dc7c469deb72870678bb6579877122534aad450618307ff345014cf777c5bd67306ac50de0a59bced3578951f661cace8e70c237f4ba
@@ -248,5 +256,3 @@ SHA1 (exa/zoneinfo_compiled-0.4.8.crate) = c2cc6619a722d9c255c0f1d66060b1c2040bc
 RMD160 (exa/zoneinfo_compiled-0.4.8.crate) = df404bc4989cec13396688f904b756a2eb8274b4
 SHA512 (exa/zoneinfo_compiled-0.4.8.crate) = e5337233b464cb97501a2694972a5707f6762ee567416bae876e0ee72aa0bb9cfd152a9253ba97c9fcb24a59e6b2fd5417d5567f7e17336ddc8dee121ba76589
 Size (exa/zoneinfo_compiled-0.4.8.crate) = 7959 bytes
-SHA1 (patch-Cargo.lock) = 20dd8dfdb5d43edc139af12f531961b1bc8dc41c
-SHA1 (patch-Cargo.toml) = 43cbd5d09195bc6d3782179479d58a75bad45085
diff --git a/exa/patches/patch-Cargo.lock b/exa/patches/patch-Cargo.lock
deleted file mode 100644
index 5c67fbc9b8..0000000000
--- a/exa/patches/patch-Cargo.lock
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD$
-
-Remove openssl-sys and openssl-src dependencies since this is causing
-fetch failures of the cargo crate with pkgsrc's fetch mechanism.
-
-The vendored openssl seems to be an optional feature as of now.
-
-https://github.com/ogham/exa/commit/b767c211e9147112780d8ce5e4714a08fa778ba4
-
---- Cargo.lock.orig	2019-07-15 03:28:21.965291684 +0000
-+++ Cargo.lock
-@@ -27,11 +27,6 @@ dependencies = [
- ]
- 
- [[package]]
--name = "autocfg"
--version = "0.1.4"
--source = "registry+https://github.com/rust-lang/crates.io-index";
--
--[[package]]
- name = "bitflags"
- version = "1.0.4"
- source = "registry+https://github.com/rust-lang/crates.io-index";
-@@ -111,7 +106,6 @@ dependencies = [
-  "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libgit2-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "openssl-sys 0.9.47 (registry+https://github.com/rust-lang/crates.io-index)",
-  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -250,27 +244,6 @@ version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index";
- 
- [[package]]
--name = "openssl-src"
--version = "111.3.0+1.1.1c"
--source = "registry+https://github.com/rust-lang/crates.io-index";
--dependencies = [
-- "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
--[[package]]
--name = "openssl-sys"
--version = "0.9.47"
--source = "registry+https://github.com/rust-lang/crates.io-index";
--dependencies = [
-- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-- "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
-- "openssl-src 111.3.0+1.1.1c (registry+https://github.com/rust-lang/crates.io-index)",
-- "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
-- "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
--[[package]]
- name = "pad"
- version = "0.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index";
-@@ -493,7 +466,6 @@ dependencies = [
- "checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
- "checksum ansi_term 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaa72766c3585a1f812a3387a7e2c6cab780f899c2f43ff6ea06c8d071fcbb36"
- "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
--"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf"
- "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
- "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
- "checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
-@@ -520,8 +492,6 @@ dependencies = [
- "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
- "checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
- "checksum number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
--"checksum openssl-src 111.3.0+1.1.1c (registry+https://github.com/rust-lang/crates.io-index)" = "53ed5f31d294bdf5f7a4ba0a206c2754b0f60e9a63b7e3076babc5317873c797"
--"checksum openssl-sys 0.9.47 (registry+https://github.com/rust-lang/crates.io-index)" = "75bdd6dbbb4958d38e47a1d2348847ad1eb4dc205dc5d37473ae504391865acc"
- "checksum pad 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9b8de33465981073e32e1d75bb89ade49062bb853e7c97ec2c13439095563a"
- "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
- "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
diff --git a/exa/patches/patch-Cargo.toml b/exa/patches/patch-Cargo.toml
deleted file mode 100644
index 2f589c6cec..0000000000
--- a/exa/patches/patch-Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Remove openssl-sys and openssl-src dependencies since this is causing
-fetch failures of the cargo crate with pkgsrc's fetch mechanism.
-
-The vendored openssl seems to be an optional feature as of now.
-
-https://github.com/ogham/exa/commit/b767c211e9147112780d8ce5e4714a08fa778ba4
-
---- Cargo.toml.orig	2019-07-15 03:28:09.967870073 +0000
-+++ Cargo.toml
-@@ -56,7 +56,6 @@ datetime = "0.4.7"
- [features]
- default = [ "git" ]
- git = [ "git2" ]
--vendored-openssl = ["git2/vendored-openssl"]
- 
- [profile.release]
- opt-level = 3


Home | Main Index | Thread Index | Old Index