Browse Source

Bump versions.

master
Thomas Kerber 1 week ago
parent
commit
928d85099c
Signed by: Thomas Kerber <tk@drwx.org> GPG Key ID: 8489B911F9ED617B
12 changed files with 8057 additions and 3833 deletions
  1. +910
    -600
      Cargo.lock
  2. +923
    -3205
      Cargo.nix
  3. +7
    -7
      Cargo.toml
  4. +174
    -0
      crates-io.list
  5. +6010
    -0
      crates-io.nix
  6. +2
    -1
      default.nix
  7. +13
    -13
      goblin-core/Cargo.toml
  8. +1
    -1
      goblin-core/src/format.rs
  9. +2
    -2
      goblin-core/src/ssh.rs
  10. +3
    -3
      src/cmd/generate.rs
  11. +10
    -0
      src/err.rs
  12. +2
    -1
      update.sh

+ 910
- 600
Cargo.lock
File diff suppressed because it is too large
View File


+ 923
- 3205
Cargo.nix
File diff suppressed because it is too large
View File


+ 7
- 7
Cargo.toml View File

@@ -10,16 +10,16 @@ default_features = []
weak-scrypt = ["goblin-core/weak-scrypt"]

[dependencies]
clap = "2.26"
clipboard = "0.4.4"
clap = "2.33"
clipboard = "0.5"
getch = "0.2"
goblin-core = { path = "goblin-core" }
log = { version = "0.4", features = ["release_max_level_info"] }
rand = "0.3"
rpassword = "1.0"
term = "0.4"
rand = "0.6"
rpassword = "3"
term = "0.5"
atty = "0.2"
serde = "1.0"
serde_json = "1.0"
serde = "1"
serde_json = "1"
chrono = "0.4"
ssh2 = { version = "0.3", optional = true }

+ 174
- 0
crates-io.list View File

@@ -0,0 +1,174 @@
aho-corasick-0.7.6
ansi_term-0.11.0
arrayref-0.3.5
arrayvec-0.5.1
atty-0.2.13
autocfg-0.1.7
backtrace-0.3.40
backtrace-sys-0.1.32
base64-0.10.1
bitflags-0.7.0
bitflags-1.2.1
blake2b_simd-0.5.9
block-0.1.6
bstr-0.2.8
byteorder-1.3.2
bytes-0.4.12
cc-1.0.47
cfg-if-0.1.10
chrono-0.4.10
clap-2.33.0
clipboard-0.5.0
clipboard-win-2.2.0
cloudabi-0.0.3
constant_time_eq-0.1.4
crossbeam-deque-0.7.2
crossbeam-epoch-0.8.0
crossbeam-queue-0.1.2
crossbeam-utils-0.6.6
crossbeam-utils-0.7.0
cstr-argument-0.1.1
dirs-1.0.5
failure-0.1.6
failure_derive-0.1.6
filetime-0.2.8
fnv-1.0.6
fuchsia-cprng-0.1.1
fuchsia-zircon-0.3.3
fuchsia-zircon-sys-0.3.3
futures-0.1.29
gcrypt-0.6.1
getch-0.2.1
globset-0.4.4
gpg-error-0.4.1
hermit-abi-0.1.3
hex-0.2.0
idna-0.1.5
iovec-0.1.4
itoa-0.4.4
jsonrpc-core-10.1.0
jsonrpc-ipc-server-10.1.0
jsonrpc-macros-10.1.0
jsonrpc-pubsub-10.1.0
jsonrpc-server-utils-10.1.0
kernel32-sys-0.2.2
lazy_static-1.4.0
libc-0.2.66
libgcrypt-sys-0.6.1
libgpg-error-sys-0.4.1
libssh2-sys-0.2.13
libz-sys-1.0.25
lock_api-0.1.5
lock_api-0.3.2
log-0.4.8
malloc_buf-0.0.6
matches-0.1.8
maybe-uninit-2.0.0
memchr-2.2.1
memoffset-0.5.3
mio-0.6.21
mio-named-pipes-0.1.6
mio-uds-0.6.7
miow-0.2.1
miow-0.3.3
net2-0.2.33
nix-0.13.1
num-integer-0.1.41
num-traits-0.2.10
num_cpus-1.11.1
objc-0.2.7
objc-foundation-0.1.1
objc_id-0.1.1
openssl-sys-0.9.53
owning_ref-0.4.0
parity-tokio-ipc-0.1.0
parking_lot-0.7.1
parking_lot-0.9.0
parking_lot_core-0.4.0
parking_lot_core-0.6.2
percent-encoding-1.0.1
pkg-config-0.3.17
proc-macro2-1.0.6
quote-1.0.2
rand-0.3.23
rand-0.4.6
rand-0.6.5
rand_chacha-0.1.1
rand_core-0.3.1
rand_core-0.4.2
rand_hc-0.1.0
rand_isaac-0.1.1
rand_jitter-0.1.4
rand_os-0.1.3
rand_pcg-0.1.2
rand_xorshift-0.1.1
rdrand-0.4.0
redox_syscall-0.1.56
redox_users-0.3.1
regex-1.3.1
regex-syntax-0.6.12
remove_dir_all-0.5.2
rpassword-3.0.2
rust-argon2-0.5.1
rustc-demangle-0.1.16
rustc_version-0.2.3
ryu-1.0.2
scopeguard-0.3.3
scopeguard-1.0.0
semver-0.9.0
semver-parser-0.7.0
serde-1.0.103
serde_derive-1.0.103
serde_json-1.0.42
slab-0.4.2
smallvec-0.6.13
smallvec-1.0.0
socket2-0.3.11
ssh2-0.3.3
stable_deref_trait-1.1.1
strsim-0.8.0
syn-1.0.11
synstructure-0.12.3
tar-0.4.26
tempdir-0.3.7
term-0.5.2
termios-0.2.2
textwrap-0.11.0
thread_local-0.3.6
time-0.1.42
tokio-0.1.22
tokio-codec-0.1.1
tokio-current-thread-0.1.6
tokio-executor-0.1.9
tokio-fs-0.1.6
tokio-io-0.1.12
tokio-named-pipes-0.1.0
tokio-reactor-0.1.11
tokio-service-0.1.0
tokio-sync-0.1.7
tokio-tcp-0.1.3
tokio-threadpool-0.1.16
tokio-timer-0.2.12
tokio-udp-0.1.5
tokio-uds-0.2.5
unicase-2.6.0
unicode-bidi-0.3.4
unicode-normalization-0.1.11
unicode-width-0.1.6
unicode-xid-0.2.0
url-1.7.2
users-0.9.1
vcpkg-0.2.8
vec_map-0.8.1
version_check-0.9.1
void-1.0.2
winapi-0.2.8
winapi-0.3.8
winapi-build-0.1.1
winapi-i686-pc-windows-gnu-0.4.0
winapi-x86_64-pc-windows-gnu-0.4.0
ws2_32-sys-0.2.1
x11-clipboard-0.3.3
xattr-0.2.2
xcb-0.8.2
xdg-2.2.0

+ 6010
- 0
crates-io.nix
File diff suppressed because it is too large
View File


+ 2
- 1
default.nix View File

@@ -5,7 +5,8 @@ with pkgs;
crateOverrides = defaultCrateOverrides // {
libgpg-error-sys = attrs: {
postFixup = ''
substituteInPlace $out/env --replace LIBGPG-ERROR GPG_ERROR
substituteInPlace $lib/env --replace LIBGPG-ERROR GPG_ERROR
substituteInPlace $lib/env --replace /build/libgpg-error-sys-0.4.1.tar.gz/target/build/ $lib/lib/
'';
buildInputs = [stdenv gcc automake autoconf gettext libgpgerror];
NUM_JOBS = "1";

+ 13
- 13
goblin-core/Cargo.toml View File

@@ -12,22 +12,22 @@ ssh = ["ssh2", "url"]
basedirs = ["xdg"]

[dependencies]
gcrypt = "0.5"
gcrypt = "0.6"
hex = "0.2"
jsonrpc-core = {git="https://git.drwx.org/tk/rust-jsonrpc.git", branch="core", optional=true}
jsonrpc-ipc-server = {git="https://git.drwx.org/tk/rust-jsonrpc.git", branch="ipc", optional=true}
jsonrpc-macros = {git="https://git.drwx.org/tk/rust-jsonrpc.git", branch="macros", optional=true}
log = {version="0.3", features=["release_max_level_debug"]}
rand = {version="0.3", optional=true}
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
jsonrpc-core = {version="10.0", optional=true}
jsonrpc-ipc-server = {version="10.0", optional=true}
jsonrpc-macros = {version="10.0", optional=true}
log = {version="0.4", features=["release_max_level_debug"]}
rand = {version="0.6", optional=true}
serde = "1"
serde_derive = "1"
serde_json = "1"
ssh2 = {version="0.3", optional=true}
tar = "0.4"
tempdir = "0.3"
url = {version="1.5", optional=true}
xdg = {version="2.1", optional=true}
url = {version="1.7", optional=true}
xdg = {version="2.2", optional=true}

[target.'cfg(unix)'.dependencies]
nix = "0.9"
users = "0.5"
nix = "0.13"
users = "0.9"

+ 1
- 1
goblin-core/src/format.rs View File

@@ -130,7 +130,7 @@ impl Vault {

fn check_key(&self, key: &Key) -> Result<()> {
let hash = Hash::new(key.as_ref());
if hash.as_ref() != self.memtar.entry("key")?.as_ref() {
if hash.as_ref() != &**self.memtar.entry("key")? {
Err(Error::InvalidHash("key hash mismatch"))
} else {
Ok(())

+ 2
- 2
goblin-core/src/ssh.rs View File

@@ -100,7 +100,7 @@ impl FromStr for FileRef {
if cfg!(unix) {
get_current_username().ok_or_else(
|| Error::invalid_url(s),
)?
)?.to_string_lossy().into_owned()
} else {
return Err(Error::invalid_url(s));
}
@@ -116,7 +116,7 @@ impl Display for FileRef {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fmt.write_str("ssh://")?;
if cfg!(not(unix)) ||
get_current_username().as_ref() != Some(&self.username)
get_current_username().map(|s| s.to_string_lossy().into_owned()) != Some(self.username.clone())
{
fmt.write_str(&self.username)?;
fmt.write_str("@")?;

+ 3
- 3
src/cmd/generate.rs View File

@@ -2,8 +2,8 @@ use cfg::Config;
use clap::ArgMatches;
use err::Result;
use goblin_core::{Access, Value, ZeroBox};
use rand::Rng;
use rand::os::OsRng;
use rand::rngs::OsRng;
use rand::seq::SliceRandom;
use std::borrow::Cow;
use term::Stylable;
use util::{ClientExt, require_client, should_autocommit};
@@ -49,7 +49,7 @@ pub fn main(matches: &ArgMatches) -> Result<()> {
20
};
let pass: String =
(0..len).map(|_| rng.choose(&pool[..]).unwrap()).collect();
(0..len).map(|_| pool[..].choose(&mut rng).unwrap()).collect();
if let Some(path) = matches.value_of("PATH") {
let mut cli = require_client(&cfg)?;
let value = Value::new(pass.into());

+ 10
- 0
src/err.rs View File

@@ -1,6 +1,7 @@
use self::Error::*;
use goblin_core::Error as CoreError;
use serde_json;
use rand;
use std::error::Error as StdError;
use std::fmt::{self, Display};
use std::io;
@@ -29,6 +30,7 @@ pub enum Error {
PasswordMismatch,
AutomergeFailed,
Json(serde_json::Error),
Rand(rand::Error),
}

impl From<serde_json::Error> for Error {
@@ -55,6 +57,12 @@ impl From<Box<StdError>> for Error {
}
}

impl From<rand::Error> for Error {
fn from(e: rand::Error) -> Error {
Error::Rand(e)
}
}

impl StdError for Error {
fn description(&self) -> &str {
match self {
@@ -72,6 +80,7 @@ impl StdError for Error {
"automerge failed; please attempt manual merge"
}
&Json(ref e) => e.description(),
&Rand(ref e) => e.description(),
}
}

@@ -81,6 +90,7 @@ impl StdError for Error {
&Io(ref e) => Some(e),
&Boxed(ref e) => Some(&**e),
&Json(ref e) => Some(e),
&Rand(ref e) => Some(e),
_ => None,
}
}

+ 2
- 1
update.sh View File

@@ -1,4 +1,5 @@
#!/bin/sh
cargo update
sed -i 's/?branch=[a-z\-]*//g' Cargo.lock
carnix nix --src=./.
carnix generate-nix --src=./. --standalone
sed -i 's/with import <nixpkgs> {};/{ pkgs }: with pkgs;/g' Cargo.nix

Loading…
Cancel
Save