git: 6e35767f6e8e - main - sysutils/eza: update to 0.19.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 Sep 2024 06:30:16 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6e35767f6e8e556cfbd40b3273708952c9b97b62
commit 6e35767f6e8e556cfbd40b3273708952c9b97b62
Author: Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp>
AuthorDate: 2024-09-21 10:29:11 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-09-25 06:28:07 +0000
sysutils/eza: update to 0.19.4
- unbundle OpenSSL
Changelog: https://github.com/eza-community/eza/releases/tag/v0.19.4
PR: 281577
Event: EuroBSDcon 2024
---
sysutils/eza/Makefile | 2 +-
sysutils/eza/Makefile.crates | 11 ++++----
sysutils/eza/distinfo | 32 ++++++++++------------
sysutils/eza/files/patch-Cargo.toml | 10 +++++++
.../patch-cargo-crates_git2-0.19.0_Cargo.toml | 13 +++++++++
...argo-crates_libgit2-sys-0.17.0+1.8.1_Cargo.toml | 10 +++++++
...atch-cargo-crates_openssl-sys-0.9.61_Cargo.toml | 17 ++++++++++++
7 files changed, 71 insertions(+), 24 deletions(-)
diff --git a/sysutils/eza/Makefile b/sysutils/eza/Makefile
index 2e773484877e..6725406f5580 100644
--- a/sysutils/eza/Makefile
+++ b/sysutils/eza/Makefile
@@ -1,6 +1,6 @@
PORTNAME= eza
DISTVERSIONPREFIX= v
-DISTVERSION= 0.19.3
+DISTVERSION= 0.19.4
CATEGORIES= sysutils
MASTER_SITES= https://github.com/eza-community/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/:man
DISTFILES= man-${DISTVERSION}.tar.gz:man
diff --git a/sysutils/eza/Makefile.crates b/sysutils/eza/Makefile.crates
index ef8e372b1f34..ca7951fc986a 100644
--- a/sysutils/eza/Makefile.crates
+++ b/sysutils/eza/Makefile.crates
@@ -59,7 +59,7 @@ CARGO_CRATES= aho-corasick-1.0.5 \
iana-time-zone-0.1.57 \
iana-time-zone-haiku-0.1.2 \
idna-0.2.3 \
- indexmap-2.1.0 \
+ indexmap-2.5.0 \
is-terminal-0.4.9 \
itertools-0.10.5 \
itoa-1.0.9 \
@@ -83,7 +83,6 @@ CARGO_CRATES= aho-corasick-1.0.5 \
number_prefix-0.4.0 \
once_cell-1.19.0 \
oorandom-11.1.3 \
- openssl-src-111.26.0+1.1.1u \
openssl-sys-0.9.61 \
option-ext-0.2.0 \
os_pipe-1.1.4 \
@@ -121,11 +120,11 @@ CARGO_CRATES= aho-corasick-1.0.5 \
ryu-1.0.15 \
same-file-1.0.6 \
scopeguard-1.2.0 \
- serde-1.0.193 \
- serde_derive-1.0.193 \
+ serde-1.0.210 \
+ serde_derive-1.0.210 \
serde_json-1.0.107 \
+ serde_norway-0.9.38 \
serde_spanned-0.6.5 \
- serde_yaml-0.9.29 \
shlex-1.3.0 \
similar-2.2.1 \
siphasher-0.3.11 \
@@ -150,7 +149,7 @@ CARGO_CRATES= aho-corasick-1.0.5 \
unicode-ident-1.0.11 \
unicode-normalization-0.1.17 \
unicode-width-0.1.13 \
- unsafe-libyaml-0.2.10 \
+ unsafe-libyaml-0.2.11 \
url-2.2.1 \
utf8parse-0.2.1 \
uutils_term_grid-0.6.0 \
diff --git a/sysutils/eza/distinfo b/sysutils/eza/distinfo
index de078cd77c68..536da983d224 100644
--- a/sysutils/eza/distinfo
+++ b/sysutils/eza/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1726124143
-SHA256 (eza/man-0.19.3.tar.gz) = 2776e34531f8055649f0d164896cc0ececfe9dd8e3da3b2da2a6c7651f3fd52d
-SIZE (eza/man-0.19.3.tar.gz) = 9647
+TIMESTAMP = 1726881690
+SHA256 (eza/man-0.19.4.tar.gz) = cc3b61aad6f480566babc2896ff3306decac16fa5fa99d2a25b1a08e0b23e013
+SIZE (eza/man-0.19.4.tar.gz) = 9580
SHA256 (eza/rust/crates/aho-corasick-1.0.5.crate) = 0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783
SIZE (eza/rust/crates/aho-corasick-1.0.5.crate) = 172064
SHA256 (eza/rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
@@ -123,8 +123,8 @@ SHA256 (eza/rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e59
SIZE (eza/rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
SHA256 (eza/rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8
SIZE (eza/rust/crates/idna-0.2.3.crate) = 271023
-SHA256 (eza/rust/crates/indexmap-2.1.0.crate) = d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f
-SIZE (eza/rust/crates/indexmap-2.1.0.crate) = 68224
+SHA256 (eza/rust/crates/indexmap-2.5.0.crate) = 68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5
+SIZE (eza/rust/crates/indexmap-2.5.0.crate) = 85919
SHA256 (eza/rust/crates/is-terminal-0.4.9.crate) = cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b
SIZE (eza/rust/crates/is-terminal-0.4.9.crate) = 8109
SHA256 (eza/rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
@@ -171,8 +171,6 @@ SHA256 (eza/rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467
SIZE (eza/rust/crates/once_cell-1.19.0.crate) = 33046
SHA256 (eza/rust/crates/oorandom-11.1.3.crate) = 0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575
SIZE (eza/rust/crates/oorandom-11.1.3.crate) = 10068
-SHA256 (eza/rust/crates/openssl-src-111.26.0+1.1.1u.crate) = efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37
-SIZE (eza/rust/crates/openssl-src-111.26.0+1.1.1u.crate) = 5110372
SHA256 (eza/rust/crates/openssl-sys-0.9.61.crate) = 313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f
SIZE (eza/rust/crates/openssl-sys-0.9.61.crate) = 52010
SHA256 (eza/rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
@@ -247,16 +245,16 @@ SHA256 (eza/rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4b
SIZE (eza/rust/crates/same-file-1.0.6.crate) = 10183
SHA256 (eza/rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
SIZE (eza/rust/crates/scopeguard-1.2.0.crate) = 11619
-SHA256 (eza/rust/crates/serde-1.0.193.crate) = 25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89
-SIZE (eza/rust/crates/serde-1.0.193.crate) = 76863
-SHA256 (eza/rust/crates/serde_derive-1.0.193.crate) = 43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3
-SIZE (eza/rust/crates/serde_derive-1.0.193.crate) = 55692
+SHA256 (eza/rust/crates/serde-1.0.210.crate) = c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a
+SIZE (eza/rust/crates/serde-1.0.210.crate) = 78338
+SHA256 (eza/rust/crates/serde_derive-1.0.210.crate) = 243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f
+SIZE (eza/rust/crates/serde_derive-1.0.210.crate) = 56020
SHA256 (eza/rust/crates/serde_json-1.0.107.crate) = 6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65
SIZE (eza/rust/crates/serde_json-1.0.107.crate) = 146458
+SHA256 (eza/rust/crates/serde_norway-0.9.38.crate) = 46ed7109f6112481319ad20539e5c4411125c0e8133502a35dc0f80d19d9beb5
+SIZE (eza/rust/crates/serde_norway-0.9.38.crate) = 69181
SHA256 (eza/rust/crates/serde_spanned-0.6.5.crate) = eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1
SIZE (eza/rust/crates/serde_spanned-0.6.5.crate) = 8349
-SHA256 (eza/rust/crates/serde_yaml-0.9.29.crate) = a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129
-SIZE (eza/rust/crates/serde_yaml-0.9.29.crate) = 64840
SHA256 (eza/rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
SIZE (eza/rust/crates/shlex-1.3.0.crate) = 18713
SHA256 (eza/rust/crates/similar-2.2.1.crate) = 420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf
@@ -305,8 +303,8 @@ SHA256 (eza/rust/crates/unicode-normalization-0.1.17.crate) = 07fbfce1c8a97d547e
SIZE (eza/rust/crates/unicode-normalization-0.1.17.crate) = 100345
SHA256 (eza/rust/crates/unicode-width-0.1.13.crate) = 0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d
SIZE (eza/rust/crates/unicode-width-0.1.13.crate) = 457228
-SHA256 (eza/rust/crates/unsafe-libyaml-0.2.10.crate) = ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b
-SIZE (eza/rust/crates/unsafe-libyaml-0.2.10.crate) = 61964
+SHA256 (eza/rust/crates/unsafe-libyaml-0.2.11.crate) = 673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861
+SIZE (eza/rust/crates/unsafe-libyaml-0.2.11.crate) = 62101
SHA256 (eza/rust/crates/url-2.2.1.crate) = 9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b
SIZE (eza/rust/crates/url-2.2.1.crate) = 65434
SHA256 (eza/rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
@@ -389,5 +387,5 @@ SHA256 (eza/rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3
SIZE (eza/rust/crates/winnow-0.5.40.crate) = 159316
SHA256 (eza/rust/crates/zoneinfo_compiled-0.5.1.crate) = 64fbebe65e899530f43bd760b23fda8f141118f4db49952b02998cbd0907a5de
SIZE (eza/rust/crates/zoneinfo_compiled-0.5.1.crate) = 8837
-SHA256 (eza/eza-community-eza-v0.19.3_GH0.tar.gz) = c85760bcc14259f87937357cd1c8c9d301fe3d4d2da2e6129b572899e97345b1
-SIZE (eza/eza-community-eza-v0.19.3_GH0.tar.gz) = 1399587
+SHA256 (eza/eza-community-eza-v0.19.4_GH0.tar.gz) = c0094b3ee230702d4dd983045e38ea2bd96375c16381c0206c88fae82fb551a4
+SIZE (eza/eza-community-eza-v0.19.4_GH0.tar.gz) = 1399592
diff --git a/sysutils/eza/files/patch-Cargo.toml b/sysutils/eza/files/patch-Cargo.toml
new file mode 100644
index 000000000000..b10b14afed24
--- /dev/null
+++ b/sysutils/eza/files/patch-Cargo.toml
@@ -0,0 +1,10 @@
+--- Cargo.toml.orig 2024-09-18 13:53:01 UTC
++++ Cargo.toml
+@@ -126,7 +126,6 @@ git = ["git2"]
+ [features]
+ default = ["git"]
+ git = ["git2"]
+-vendored-openssl = ["git2/vendored-openssl"]
+ vendored-libgit2 = ["git2/vendored-libgit2"]
+ # Should only be used inside of flake.nix
+ nix = []
diff --git a/sysutils/eza/files/patch-cargo-crates_git2-0.19.0_Cargo.toml b/sysutils/eza/files/patch-cargo-crates_git2-0.19.0_Cargo.toml
new file mode 100644
index 000000000000..b1eb39ba2f52
--- /dev/null
+++ b/sysutils/eza/files/patch-cargo-crates_git2-0.19.0_Cargo.toml
@@ -0,0 +1,13 @@
+--- cargo-crates/git2-0.19.0/Cargo.toml.orig 1970-01-01 00:00:01 UTC
++++ cargo-crates/git2-0.19.0/Cargo.toml
+@@ -69,10 +69,6 @@ vendored-libgit2 = ["libgit2-sys/vendored"]
+ ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
+ unstable = []
+ vendored-libgit2 = ["libgit2-sys/vendored"]
+-vendored-openssl = [
+- "openssl-sys/vendored",
+- "libgit2-sys/vendored-openssl",
+-]
+ zlib-ng-compat = ["libgit2-sys/zlib-ng-compat"]
+
+ [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe]
diff --git a/sysutils/eza/files/patch-cargo-crates_libgit2-sys-0.17.0+1.8.1_Cargo.toml b/sysutils/eza/files/patch-cargo-crates_libgit2-sys-0.17.0+1.8.1_Cargo.toml
new file mode 100644
index 000000000000..5b2d25d8c461
--- /dev/null
+++ b/sysutils/eza/files/patch-cargo-crates_libgit2-sys-0.17.0+1.8.1_Cargo.toml
@@ -0,0 +1,10 @@
+--- cargo-crates/libgit2-sys-0.17.0+1.8.1/Cargo.toml.orig 1970-01-01 00:00:01 UTC
++++ cargo-crates/libgit2-sys-0.17.0+1.8.1/Cargo.toml
+@@ -58,7 +58,6 @@ vendored = []
+ ssh = ["libssh2-sys"]
+ ssh_key_from_memory = []
+ vendored = []
+-vendored-openssl = ["openssl-sys/vendored"]
+ zlib-ng-compat = [
+ "libz-sys/zlib-ng",
+ "libssh2-sys?/zlib-ng-compat",
diff --git a/sysutils/eza/files/patch-cargo-crates_openssl-sys-0.9.61_Cargo.toml b/sysutils/eza/files/patch-cargo-crates_openssl-sys-0.9.61_Cargo.toml
new file mode 100644
index 000000000000..8036060b2501
--- /dev/null
+++ b/sysutils/eza/files/patch-cargo-crates_openssl-sys-0.9.61_Cargo.toml
@@ -0,0 +1,17 @@
+--- cargo-crates/openssl-sys-0.9.61/Cargo.toml.orig 1970-01-01 00:00:00 UTC
++++ cargo-crates/openssl-sys-0.9.61/Cargo.toml
+@@ -31,14 +31,8 @@ version = "1.0"
+ [build-dependencies.cc]
+ version = "1.0"
+
+-[build-dependencies.openssl-src]
+-version = "111.0.1"
+-optional = true
+-
+ [build-dependencies.pkg-config]
+ version = "0.3.9"
+
+-[features]
+-vendored = ["openssl-src"]
+ [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
+ version = "0.2.8"