From 2097fdccf6c2d09f38af82f672d63d382b41ded7 Mon Sep 17 00:00:00 2001 From: electricboogie <32370782+kimono-koans@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:40:50 -0600 Subject: [PATCH] Bump version --- Cargo.lock | 2 +- Cargo.toml | 2 +- cargo_about/about.toml | 15 ++-- httm.1 | 6 +- third_party/LICENSES_THIRD_PARTY.html | 113 ++++++++++++++++++-------- 5 files changed, 94 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4469e634..3ae787eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -490,7 +490,7 @@ dependencies = [ [[package]] name = "httm" -version = "0.43.2" +version = "0.44.0" dependencies = [ "clap 4.5.23", "crossbeam-channel", diff --git a/Cargo.toml b/Cargo.toml index 0a9bd8c6..0fee9a7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "httm" authors = ["Robert Swinford gmail.com>"] -version = "0.43.2" +version = "0.44.0" edition = "2021" keywords = ["zfs", "backup", "restore", "cli-utility", "snapshot"] description = "A CLI tool for viewing snapshot file versions on ZFS and btrfs datasets" diff --git a/cargo_about/about.toml b/cargo_about/about.toml index c1abde42..0fefff08 100644 --- a/cargo_about/about.toml +++ b/cargo_about/about.toml @@ -1,8 +1,13 @@ -accepted = ["Apache-2.0", "MIT", "MPL-2.0", "Unicode-TOU", "Unicode-DFS-2016", "BSD-3-Clause"] -targets = [ - "x86_64-unknown-linux-gnu", - "x86_64-unknown-linux-musl", +accepted = [ + "Apache-2.0", + "MIT", + "MPL-2.0", + "Unicode-TOU", + "Unicode-DFS-2016", + "BSD-3-Clause", + "Zlib", ] +targets = ["x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"] ignore-build-dependencies = false ignore-dev-dependencies = false -ignore-transitive-dependencies = false \ No newline at end of file +ignore-transitive-dependencies = false diff --git a/httm.1 b/httm.1 index e5e73811..d3b358d8 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" "September 2024" "httm 0.43.2" "User Commands" +.TH HTTM "1" "December 2024" "httm 0.44.0" "User Commands" .SH NAME -httm \- manual page for httm 0.43.2 +httm \- manual page for httm 0.44.0 .SH SYNOPSIS .B httm [\fI\,OPTIONS\/\fR] [\fI\,INPUT_FILES\/\fR]... @@ -35,7 +35,7 @@ automatically discover locally replicated datasets and list their snapshots as w user may specify a command to preview snapshots while in a snapshot selection view. This argument optionally takes a value specifying the command to be executed. The default value/command, if no command value specified, is a 'bowie' formatted 'diff'. User defined commands must specify the snapshot file name "{snap_file}" and the live file name "{live_file}" within their shell command. NOTE: 'bash' is required to bootstrap any preview script, even if user defined preview commands or script is written in a different language. .TP \fB\-\-dedup\-by[=\fR] -comparing file versions solely on the basis of size and modify time (the default "metadata" behavior) may return what appear to be "false positives", in the sense that, modify time is not a precise measure of whether a file has actually changed. A program might overwrite a file with the same contents, or a user can simply update the modify time via 'touch'. If only this flag is specified, the "contents" option compares the actual file contents of file versions, if their sizes match, and overrides the default "metadata" behavior. The "contents" option can be expensive, as the file versions need to be read back and compared, and should probably only be used for smaller files. Given how expensive this operation can be, for larger files or files with many versions, "contents" option is not shown in Interactive browse mode, but after a selection is made, can be utilized in Select or Restore modes. The "disable" "all" or "no\-filter" option dumps all snapshot versions, and no attempt is made to determine if the file versions are distinct. [aliases: unique, uniqueness] [possible values: disable, all, no\-filter, metadata, contents] +comparing file versions solely on the basis of size and modify time (the default "metadata" behavior) may return what appear to be "false positives", in the sense that, modify time is not a precise measure of whether a file has actually changed. A program might overwrite a file with the same contents, or a user can simply update the modify time via 'touch'. If only this flag is specified, the "contents" option compares the actual file contents of file versions, if their sizes match, and overrides the default "metadata" behavior. The "contents" option can be expensive, as the file versions need to be read back and compared, and should probably only be used for smaller files. Given how expensive this operation can be, for larger files or files with many versions, "contents" option is not shown in Interactive browse mode, but after a selection is made, can be utilized, when enabled, in Select or Restore modes. The "disable" "all" or "no\-filter" option dumps all snapshot versions, and no attempt is made to determine if the file versions are distinct. [aliases: unique, uniqueness] [possible values: disable, all, no\-filter, metadata, contents] .TP \fB\-e\fR, \fB\-\-exact\fR use exact pattern matching for searches in the interactive modes (in contrast to the default fuzzy searching). diff --git a/third_party/LICENSES_THIRD_PARTY.html b/third_party/LICENSES_THIRD_PARTY.html index 73ea6c1f..971c3293 100644 --- a/third_party/LICENSES_THIRD_PARTY.html +++ b/third_party/LICENSES_THIRD_PARTY.html @@ -46,10 +46,11 @@

Third Party Licenses

Overview of licenses:

All license text:

@@ -1084,7 +1085,7 @@

Used by:

Apache License 2.0

Used by:

                                  Apache License
@@ -1294,9 +1295,11 @@ 
Used by:

                 
Apache License 2.0

                 
Used by:

                 
-                
                                 Apache License
+                
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -1484,7 +1487,7 @@ 
Used by:

       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 The Fuchsia Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1498,15 +1501,32 @@ 
Used by:

    See the License for the specific language governing permissions and
    limitations under the License.
 
+
+--- LLVM Exceptions to the Apache 2.0 License ----
+
+As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into an Object form of such source code, you
+may redistribute such embedded portions in such Object form without complying
+with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+
+In addition, if you combine or link compiled forms of this Software with
+software that is licensed under the GPLv2 ("Combined Software") and if a
+court of competent jurisdiction determines that the patent provision (Section
+3), the indemnity provision (Section 9) or other Section of the License
+conflicts with the conditions of the GPLv2, you may retroactively and
+prospectively choose to deem waived or otherwise exclude such Section(s) of
+the License, but only in their entirety and only with respect to the Combined
+Software.
+
 

             
             
  • 
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                     Apache License
                            Version 2.0, January 2004
@@ -1927,12 +1947,12 @@ 
    Used by:
    
                     
  • anstream 0.6.13
    • 
                     
  • anstyle-query 1.0.2
    • 
                     
  • anstyle 1.0.8
    • 
-                    
  • clap 4.5.18
    • 
+                    
  • clap 4.5.23
    • 
                     
  • colorchoice 1.0.0
    • 
-                    
  • derive_builder 0.20.1
    • 
-                    
  • derive_builder_core 0.20.1
    • 
-                    
  • derive_builder_macro 0.20.1
    • 
-                    
  • terminal_size 0.3.0
    • 
+                    
  • derive_builder 0.20.2
    • 
+                    
  • derive_builder_core 0.20.2
    • 
+                    
  • derive_builder_macro 0.20.2
    • 
+                    
  • terminal_size 0.4.1
    • 
                 
                 
                                     Apache License
                            Version 2.0, January 2004
@@ -2326,19 +2346,18 @@ 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                  Apache License
                         Version 2.0, January 2004
@@ -2522,7 +2541,6 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                  Apache License
@@ -3054,6 +3073,7 @@ 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
    Licensed under the Apache License, Version 2.0
 <LICENSE-APACHE or
@@ -3068,7 +3088,7 @@ 
    Used by:
    
                 
    MIT License
    
                 
    Used by:
    
                 
                 
    Copyright (c) 2015 fangyuanziti
 
@@ -3121,9 +3141,9 @@ 
    Used by:
    
                 
    MIT License
    
                 
    Used by:
    
                 
                 
    MIT License
 
@@ -3364,7 +3384,6 @@ 
    Used by:
    
                 
    MIT License
    
                 
    Used by:
    
                 
                 
    The MIT License (MIT)
@@ -3396,7 +3415,7 @@ 
    Used by:
    
                 
    MIT License
    
                 
    Used by:
    
                 
                 
    The MIT License (MIT)
 
@@ -3427,7 +3446,7 @@ 
    MIT License
    
                 
    Used by:
    
                 
                 
    The MIT License (MIT)
 
@@ -3457,7 +3476,7 @@ 
    Used by:
    
                 
    MIT License
    
                 
    Used by:
    
                 
                 
    The MIT License (MIT)
 
@@ -3499,7 +3518,7 @@ 
    Used by:
    
                 
    Mozilla Public License 2.0
    
                 
    Used by:
    
                 
                 
    Mozilla Public License Version 2.0
 ==================================
@@ -3905,6 +3924,32 @@ 
    Used by:
    
 Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
 
    
             
    • 
+            
  • 
+                
    zlib License
    
+                
    Used by:
    
+                
+                
    Copyright (c) 2024 Orson Peters
+
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use of
+this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim
+    that you wrote the original software. If you use this software in a product,
+    an acknowledgment in the product documentation would be appreciated but is
+    not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
    
+            
    •