diff --git a/system/dust/dust.SlackBuild b/system/dust/dust.SlackBuild index d634028216..9ec1f77fbb 100644 --- a/system/dust/dust.SlackBuild +++ b/system/dust/dust.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for dust # Copyright 2019-2021 Benjamin Trigona-Harany +# Copyright 2021 Erich Ritz, Jenks, Oklahoma, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dust -VERSION=${VERSION:-0.6.0} +VERSION=${VERSION:-0.7.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -87,13 +88,13 @@ cd $PRGNAM-$VERSION # configuration tells cargo to use the configured directory # for dependencies intead of downloading from crates.io mkdir .cargo -cat << EOF >> .cargo/config +cat << EOF >> .cargo/config.toml +[source] [source.crates-io] -registry = 'https://github.com/rust-lang/crates.io-index' -replace-with = 'vendored-sources' +replace-with = "vendored-sources" [source.vendored-sources] -directory = '$(pwd)/vendor' +directory = "vendor" EOF # deps and versions come from Cargo.lock @@ -101,15 +102,31 @@ mkdir vendor ( cd vendor - grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ - sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ - awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ - grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do + grep -h -A 4 "\[\[package\]\]" \ + $(find "../" -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4, $5 }' | \ + sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep " source=" | \ + sed 's/ dependencies=.*$//' | \ + sed 's/ source=[^ ]*//' | \ + sed 's/ checksum=/=/' | \ + sort -u | \ + while read -r dep ; do + cksum="$(printf "%s\n" "$dep" | cut -d= -f3)" ver="$(printf "%s\n" "$dep" | cut -d= -f2)" dep="$(printf "%s\n" "$dep" | cut -d= -f1)" - tar xvf $CWD/$dep-$ver.crate + CRATE_FILE=$CWD/$dep-$ver.crate + + if [ -z "$cksum" ] ; then + mkdir $dep-$ver + tar xvf $CRATE_FILE -C $dep-$ver --strip-components=1 + cksum="null" + else + tar xvf $CRATE_FILE + fi touch $dep-$ver/.cargo-ok @@ -124,9 +141,7 @@ mkdir vendor ) | sed '$ s/,$//' printf " },\n" - printf ' "package": "' - - sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' + printf ' "package": "%s"' "$cksum" printf "}\n" } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json diff --git a/system/dust/dust.info b/system/dust/dust.info index 4064bd85f7..4145d68350 100644 --- a/system/dust/dust.info +++ b/system/dust/dust.info @@ -1,47 +1,47 @@ PRGNAM="dust" -VERSION="0.6.0" +VERSION="0.7.5" HOMEPAGE="https://github.com/bootandy/dust/" -DOWNLOAD="https://github.com/bootandy/dust/archive/v0.6.0/dust-0.6.0.tar.gz \ +DOWNLOAD="https://github.com/bootandy/dust/archive/v0.7.5/dust-0.7.5.tar.gz \ https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.18.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cmd/assert_cmd-1.0.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cmd/assert_cmd-1.0.8.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.3.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.16.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.8.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.9.5.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/difference/difference-2.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/difflib/difflib-0.4.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/doc-comment/doc-comment-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/du-dust/du-dust-0.6.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.6.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.18.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/itertools/itertools-0.10.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.97.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.101.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/lscolors/lscolors-0.7.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.4.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.6.4.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.10.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates/predicates-1.0.8.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-core/predicates-core-1.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-tree/predicates-tree-1.0.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-tree/predicates-tree-1.0.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates/predicates-2.0.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.8.4.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.3.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.6.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.3.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.5.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon-core/rayon-core-1.9.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.2.9.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.5.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.5.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.2.10.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-automata/regex-automata-0.1.10.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.25.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.5.4.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/stfu8/stfu8-0.2.4.crate \ @@ -56,51 +56,51 @@ DOWNLOAD="https://github.com/bootandy/dust/archive/v0.6.0/dust-0.6.0.tar.gz \ https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.2.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.2+wasi-snapshot-preview1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate" -MD5SUM="cd2d607f96f18602f20ad4e2035ab067 \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate" +MD5SUM="3379a33a230154455cd3d52328082f69 \ 425b8fdf70df59998d9b7c89083e48d1 \ 294a49d3c53865fa7ac5d0ce2f5d5735 \ f44e8d1d2e61974b268852797530ea41 \ - b51fc6924f92ea67ab4eef8b54de45ec \ + 56b0d48b275aaee1ec3263f2894e479a \ 142cb4b9a653e56e56311f0c883b8582 \ c6443ec8d007c729ba5482008d0c864d \ - 6799c26a7eacaf8e58d3e45c6c5add89 \ + a295edb6953237ebbdfa8e731229f9a3 \ a24bd43eb77d74bb2820e5a3f336f7bc \ 74634128440dbc3766bda76fdf0aaa05 \ bc79e0eb364df515a33755ac9a581cfd \ 8ccc134aada411c061ab48129d8e943d \ - e38f9483da311ab0e0811a12201dfa1a \ + 93c803ad55de44eedc24870f83d0279b \ abc0193f7682dc24b842904a251c5258 \ 408eb4dde8dcd169b3892ec48827e84b \ - 5e49f4c3f9076fe30ae207fe951f9195 \ + bebc8338ae113a87a04564c97c1e3f0c \ dd1e49c76e9d5853e673a3b41ba02917 \ - dff1ddaa2d677d86dd6be539355d26ae \ b4e2b229c362ad0dd313ff631816d5db \ 9db1c40cc98e60cc7bd6782249a0ba01 \ - 2c4bc5c16b345ce4d4bbf977577fab35 \ + 0b7994d1256215201bdfb810a357ffa2 \ + 721a3e3f82633f6ed70a5abfe64c80bc \ fba3b040a55c01be7376d3dd5c4d4920 \ - 319c5014f308c349ef4cb669b1e19020 \ + e8cde90955df7cb1c47c99d126ff313a \ f3373fd861a0066fa446a8ab3dabc749 \ - 9d375c3f54df74656fa0543c068b861e \ + d75b1c734f85b007c55ca84217df4201 \ 39c54f1d98447d48b9c1e0dd345d4316 \ c36d452e37c73b1e99f40bae18cddfdb \ a4ff7abd41c57dfd24bbd4b50edb848f \ - 0b64bd1f832710eb571c97ee0b7e2388 \ 30d783a004d6ae43913983d49b8466c9 \ - 59425b318d7a80253445671a9fda0aa4 \ + 346c8301f6e42dbec4da77fda7818f67 \ + a5a28184736c2966cb138d7fcb9a8ce6 \ d5489ff3f6a307622ba98c4def55cdb5 \ e30085994bbeb4b7f4895d48216d5476 \ ae5dab3db7dc317e16bb6f9e7eb15d14 \ 792d44fd2c664a81c10d7b261c5fda06 \ - 41b00d1e0264d76da321d4ee0b03baae \ be7c328cd6073cb72cae911580c7ddcf \ - c4ee6883f04838d193fd03138184a72a \ - 4606e4a248df4d70509afded817aca14 \ + 41b00d1e0264d76da321d4ee0b03baae \ + 4a80ab58144fc731cd12abc6d5139d7f \ 95f4b6766a27d814b4e54d1ccb3b7fc9 \ 82401c70623ccc1bfc0bcb5c3b0ac8b7 \ + 4606e4a248df4d70509afded817aca14 \ 0538d1da369f3e3f0412aa4d735c1b61 \ b4a0a98a54439a5a37952c8879187ee3 \ c58c5d6565be5a35674117b9826795b4 \ @@ -115,12 +115,12 @@ MD5SUM="cd2d607f96f18602f20ad4e2035ab067 \ 333b4ba3f64c35b6f89b521e8d64548b \ 6708629acf3d2ecb7404e43255d2df85 \ a061ad1db3e0d839725b037ff8be84e7 \ - 0498c4a11448bfc35dc7bb2caa64c753 \ db96b50050277bf05a3c68534bbb9586 \ b9e37d5fc4ad28b612b78ad37816684d \ - 09de9d01e7331ff3da11f58be8bef0df" + 09de9d01e7331ff3da11f58be8bef0df \ + 0498c4a11448bfc35dc7bb2caa64c753" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +MAINTAINER="Erich Ritz" +EMAIL="erich.public@protonmail.com"