From e97eb8d70c767164c695fa04953d1f4282d18d2f Mon Sep 17 00:00:00 2001 From: electricboogie <32370782+kimono-koans@users.noreply.github.com> Date: Tue, 13 Aug 2024 01:41:40 -0500 Subject: [PATCH] Bump version --- Cargo.lock | 29 +++++++++--------- Cargo.toml | 8 ++--- httm.1 | 6 ++-- third_party/LICENSES_THIRD_PARTY.html | 44 ++++++++++++++++++++++----- 4 files changed, 59 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 859ae899..f690e877 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" @@ -156,18 +156,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.13" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" +checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.13" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -484,10 +484,10 @@ dependencies = [ [[package]] name = "httm" -version = "0.41.3" +version = "0.41.4" dependencies = [ "ahash 0.8.11", - "clap 4.5.13", + "clap 4.5.15", "crossbeam-channel", "exacl", "hashbrown 0.14.5", @@ -894,18 +894,18 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" dependencies = [ "proc-macro2", "quote", @@ -914,12 +914,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 88aaae97..b89bc1b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "httm" authors = ["Robert Swinford gmail.com>"] -version = "0.41.3" +version = "0.41.4" edition = "2021" keywords = ["zfs", "backup", "restore", "cli-utility", "snapshot"] description = "A CLI tool for viewing snapshot file versions on ZFS and btrfs datasets" @@ -37,7 +37,7 @@ xattr = { version = "1.3.1", default-features = false, optional = true } [dependencies] ahash = { version = "0.8.11", default-features = false } -clap = { version = "4.5.13", default-features = true, features = [ +clap = { version = "4.5.15", default-features = true, features = [ "std", "cargo", ] } @@ -67,8 +67,8 @@ nix = { version = "0.29.0", default-features = false, features = [ "user", "zerocopy", ] } -serde = { version = "1.0.204", default-features = false } -serde_json = { version = "1.0.120", default-features = false, features = [ +serde = { version = "1.0.207", default-features = false } +serde_json = { version = "1.0.124", default-features = false, features = [ "preserve_order", ] } realpath-ext = { version = "0.1.3", default-features = false, features = [ diff --git a/httm.1 b/httm.1 index e08a86bd..494092e8 100644 --- a/httm.1 +++ b/httm.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH HTTM "1" "August 2024" "httm 0.41.3" "User Commands" +.TH HTTM "1" "August 2024" "httm 0.41.4" "User Commands" .SH NAME -httm \- manual page for httm 0.41.3 +httm \- manual page for httm 0.41.4 .SH SYNOPSIS .B httm [\fI\,OPTIONS\/\fR] [\fI\,INPUT_FILES\/\fR]... @@ -50,7 +50,7 @@ display snapshots names for a file. This argument optionally takes a value. By d prune all snapshot/s which contain the input file/s on that file's most immediate mount via "zfs destroy". "zfs destroy" is a DESTRUCTIVE operation which *does not* only apply to the file in question, but the entire snapshot upon which it resides. Careless use may cause you to lose snapshot data you care about. This argument requires and will be filtered according to any values specified at LIST_SNAPS. User may also enable SELECT mode to make a granular selection of specific snapshots to prune. Note: This is a ZFS only option. .TP \fB\-\-roll\-forward=\fR -traditionally 'zfs rollback' is a destructive operation, whereas httm roll\-forward is non\-destructive. httm will copy only files and their attributes that have changed since a specified snapshot, from that snapshot, to its live dataset. httm will also take two precautionary snapshots, one before and one after the copy. Should the roll forward fail for any reason, httm will roll back to the pre\-execution state. Caveats: This is a ZFS only option which requires super user privileges. +traditionally 'zfs rollback' is a destructive operation, whereas httm roll\-forward is non\-destructive. httm will copy only files and their attributes that have changed since a specified snapshot, from that snapshot, to its live dataset. httm will also take two precautionary snapshots, one before and one after the copy. Should the roll forward fail for any reason, httm will roll back to the pre\-execution state. Caveats: This is a ZFS only option which requires super user privileges. Not all filesystem features are supported (for instance, Solaris door or sockets on the snapshot) and will cause a roll forward to fail. Certain special/files objects will be copied or recreated, but are not guaranteed to be in the same state as the snapshot (for instance, fifos).The block clone copying so many file in parallel may also cause a kernel crash on some configurations, and is therefore disabled in this mode. .TP \fB\-m\fR, \fB\-\-file\-mount[=\fR] by default, display the all mount point/s of all dataset/s which contain/s the input file/s. This argument optionally takes a value to display other information about the path. Possible values are: "mount" or "target" or "directory", return the directory upon which the underlying dataset or device of the mount, "source" or "device" or "dataset", return the underlying dataset/device of the mount, and, "relative\-path" or "relative", return the path relative to the underlying dataset/device of the mount. [aliases: mount] [possible values: source, target, mount, directory, device, dataset, relative\-path, relative, relpath] diff --git a/third_party/LICENSES_THIRD_PARTY.html b/third_party/LICENSES_THIRD_PARTY.html index e78e52fa..f23d63f5 100644 --- a/third_party/LICENSES_THIRD_PARTY.html +++ b/third_party/LICENSES_THIRD_PARTY.html @@ -47,7 +47,7 @@

Third Party Licenses

Overview of licenses:

@@ -1504,7 +1504,7 @@

Used by:

Apache License 2.0

Used by:

@@ -1926,8 +1926,8 @@

Used by:

The MIT License (MIT)
 
+Copyright (c) 2016 Jinzhou Zhang
+Copyright (c) 2016 Junegunn Choi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+ +
  • +

    MIT License

    +

    Used by:

    + + 
    The MIT License (MIT)
+
 Copyright (c) 2016 Jinzhou Zhang
 Copyright (c) 2023 Robert Swinford
 
@@ -3499,7 +3529,7 @@ 
    Used by:
    
                 
    Mozilla Public License 2.0
    
                 
    Used by:
    
                 
                 
    Mozilla Public License Version 2.0
 ==================================