Date: Sat, 25 Oct 2025 03:21:25 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: faf376181e0e - main - security/sequoia-sq: use rustls for reqwest to avoid OpenSSL/LibreSSL symbol clashing Message-ID: <202510250321.59P3LPvJ075024@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=faf376181e0e6548e754605bf4e5b5bc9710a478 commit faf376181e0e6548e754605bf4e5b5bc9710a478 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2025-10-25 03:14:42 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2025-10-25 03:14:42 +0000 security/sequoia-sq: use rustls for reqwest to avoid OpenSSL/LibreSSL symbol clashing Adjust reqwest features to use rustls instead of native-tls (openssl) and add missing rustls dependency crates. While here: - update native-tls - switch to CRATESIO MASTER_SITES instead of gitlab --- security/sequoia-sq/Makefile | 25 ++++++++--------- security/sequoia-sq/Makefile.crates | 13 ++++++++- security/sequoia-sq/distinfo | 32 ++++++++++++++++++---- security/sequoia-sq/files/patch-Cargo.toml | 14 ++++++++++ ...atch-cargo-crates_sequoia-net-0.30.0_Cargo.toml | 30 ++++++++++++++++++++ 5 files changed, 94 insertions(+), 20 deletions(-) diff --git a/security/sequoia-sq/Makefile b/security/sequoia-sq/Makefile index aaf571000b74..9dfac3d770b9 100644 --- a/security/sequoia-sq/Makefile +++ b/security/sequoia-sq/Makefile @@ -1,9 +1,10 @@ -PORTNAME= sq -DISTVERSIONPREFIX= v +PORTNAME= sequoia-sq DISTVERSION= 1.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security -PKGNAMEPREFIX= sequoia- +MASTER_SITES= CRATESIO +# XXX Teach USES=cargo to have proper default +DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT} MAINTAINER= vishwin@FreeBSD.org COMMENT= Sequoia-PGP command line tool @@ -17,10 +18,6 @@ LIB_DEPENDS= libnettle.so:security/nettle USES= cargo llvm sqlite ssl -USE_GITLAB= yes -GL_ACCOUNT= sequoia-pgp -GL_PROJECT= ${PKGNAMEPREFIX}${PORTNAME} - CARGO_ENV+= ASSET_OUT_DIR=${CARGO_TARGET_DIR} OPTIONS_DEFINE= BASH ELVISH FISH MANPAGES ZSH @@ -38,17 +35,17 @@ CARGO_ENV+= CARGO_PROFILE_RELEASE_LTO=false post-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions - ${INSTALL_DATA} ${CARGO_TARGET_DIR}/shell-completions/${PORTNAME}.bash \ - ${STAGEDIR}${PREFIX}/share/bash-completion/completions/${PORTNAME} + ${INSTALL_DATA} ${CARGO_TARGET_DIR}/shell-completions/sq.bash \ + ${STAGEDIR}${PREFIX}/share/bash-completion/completions/sq post-install-ELVISH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/elvish/lib - ${INSTALL_DATA} ${CARGO_TARGET_DIR}/shell-completions/${PORTNAME}.elv \ + ${INSTALL_DATA} ${CARGO_TARGET_DIR}/shell-completions/sq.elv \ ${STAGEDIR}${PREFIX}/share/elvish/lib post-install-FISH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions - ${INSTALL_DATA} ${CARGO_TARGET_DIR}/shell-completions/${PORTNAME}.fish \ + ${INSTALL_DATA} ${CARGO_TARGET_DIR}/shell-completions/sq.fish \ ${STAGEDIR}${PREFIX}/share/fish/completions post-install-MANPAGES-on: @@ -57,8 +54,8 @@ post-install-MANPAGES-on: post-install-ZSH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${INSTALL_DATA} ${CARGO_TARGET_DIR}/shell-completions/_${PORTNAME} \ - ${CARGO_TARGET_DIR}/shell-completions/_${PORTNAME}.ps1 \ + ${INSTALL_DATA} ${CARGO_TARGET_DIR}/shell-completions/_sq \ + ${CARGO_TARGET_DIR}/shell-completions/_sq.ps1 \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions .include <bsd.port.post.mk> diff --git a/security/sequoia-sq/Makefile.crates b/security/sequoia-sq/Makefile.crates index 387830b068c5..24cc73fc4ee8 100644 --- a/security/sequoia-sq/Makefile.crates +++ b/security/sequoia-sq/Makefile.crates @@ -236,6 +236,7 @@ CARGO_CRATES= addr2line-0.24.2 \ log-0.4.26 \ loom-0.5.6 \ lru-cache-0.1.2 \ + lru-slab-0.1.2 \ marked-yaml-0.7.2 \ match_cfg-0.1.0 \ matchers-0.1.0 \ @@ -246,7 +247,7 @@ CARGO_CRATES= addr2line-0.24.2 \ minimal-lexical-0.2.1 \ miniz_oxide-0.8.5 \ mio-1.0.3 \ - native-tls-0.2.13 \ + native-tls-0.2.14 \ nettle-7.4.0 \ nettle-sys-2.3.1 \ new_debug_unreachable-1.0.6 \ @@ -309,11 +310,17 @@ CARGO_CRATES= addr2line-0.24.2 \ pulldown-cmark-0.12.2 \ pulldown-cmark-escape-0.11.0 \ quick-error-1.2.3 \ + quinn-0.11.9 \ + quinn-proto-0.11.13 \ + quinn-udp-0.5.14 \ quote-1.0.39 \ radix_trie-0.2.1 \ rand-0.8.5 \ + rand-0.9.2 \ rand_chacha-0.3.1 \ + rand_chacha-0.9.0 \ rand_core-0.6.4 \ + rand_core-0.9.3 \ rayon-1.10.0 \ rayon-core-1.12.1 \ redox_syscall-0.5.9 \ @@ -338,9 +345,11 @@ CARGO_CRATES= addr2line-0.24.2 \ rusqlite-0.31.0 \ rustc-demangle-0.1.24 \ rustc-hash-1.1.0 \ + rustc-hash-2.1.1 \ rustc_version-0.4.1 \ rustix-0.38.44 \ rustls-0.23.23 \ + rustls-native-certs-0.8.2 \ rustls-pemfile-2.2.0 \ rustls-pki-types-1.11.0 \ rustls-webpki-0.102.8 \ @@ -479,6 +488,8 @@ CARGO_CRATES= addr2line-0.24.2 \ wasm-streams-0.4.2 \ web-sys-0.3.77 \ web-time-1.1.0 \ + webpki-roots-0.26.11 \ + webpki-roots-1.0.3 \ widestring-1.1.0 \ win-crypto-ng-0.5.1 \ winapi-0.3.9 \ diff --git a/security/sequoia-sq/distinfo b/security/sequoia-sq/distinfo index 5a90c1cccb31..c1f84c3fdde1 100644 --- a/security/sequoia-sq/distinfo +++ b/security/sequoia-sq/distinfo @@ -1,4 +1,6 @@ -TIMESTAMP = 1760869288 +TIMESTAMP = 1761346350 +SHA256 (rust/crates/sequoia-sq-1.3.1.crate) = 5c04b662da1c207e79beaeff6e5ab2d713ab10c1263f64c367f8489aac815705 +SIZE (rust/crates/sequoia-sq-1.3.1.crate) = 740320 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627 @@ -475,6 +477,8 @@ SHA256 (rust/crates/loom-0.5.6.crate) = ff50ecb28bb86013e935fb6683ab1f6d3a20016f SIZE (rust/crates/loom-0.5.6.crate) = 72186 SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307 +SHA256 (rust/crates/lru-slab-0.1.2.crate) = 112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154 +SIZE (rust/crates/lru-slab-0.1.2.crate) = 9090 SHA256 (rust/crates/marked-yaml-0.7.2.crate) = f2eb25a7ab146f4058d67a74dfea52e25c133c575f08ce5851da97d224e3ad8d SIZE (rust/crates/marked-yaml-0.7.2.crate) = 24771 SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4 @@ -495,8 +499,8 @@ SHA256 (rust/crates/miniz_oxide-0.8.5.crate) = 8e3e04debbb59698c15bacbb6d93584a8 SIZE (rust/crates/miniz_oxide-0.8.5.crate) = 62237 SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd SIZE (rust/crates/mio-1.0.3.crate) = 103703 -SHA256 (rust/crates/native-tls-0.2.13.crate) = 0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c -SIZE (rust/crates/native-tls-0.2.13.crate) = 29133 +SHA256 (rust/crates/native-tls-0.2.14.crate) = 87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e +SIZE (rust/crates/native-tls-0.2.14.crate) = 29385 SHA256 (rust/crates/nettle-7.4.0.crate) = 44e6ff4a94e5d34a1fd5abbd39418074646e2fa51b257198701330f22fcd6936 SIZE (rust/crates/nettle-7.4.0.crate) = 583944 SHA256 (rust/crates/nettle-sys-2.3.1.crate) = 61a3f5406064d310d59b1a219d3c5c9a49caf4047b6496032e3f930876488c34 @@ -621,16 +625,28 @@ SHA256 (rust/crates/pulldown-cmark-escape-0.11.0.crate) = 007d8adb5ddab6f8e3f491 SIZE (rust/crates/pulldown-cmark-escape-0.11.0.crate) = 6719 SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0 SIZE (rust/crates/quick-error-1.2.3.crate) = 15066 +SHA256 (rust/crates/quinn-0.11.9.crate) = b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20 +SIZE (rust/crates/quinn-0.11.9.crate) = 83606 +SHA256 (rust/crates/quinn-proto-0.11.13.crate) = f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31 +SIZE (rust/crates/quinn-proto-0.11.13.crate) = 243837 +SHA256 (rust/crates/quinn-udp-0.5.14.crate) = addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd +SIZE (rust/crates/quinn-udp-0.5.14.crate) = 33436 SHA256 (rust/crates/quote-1.0.39.crate) = c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801 SIZE (rust/crates/quote-1.0.39.crate) = 31206 SHA256 (rust/crates/radix_trie-0.2.1.crate) = c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd SIZE (rust/crates/radix_trie-0.2.1.crate) = 251366 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404 SIZE (rust/crates/rand-0.8.5.crate) = 87113 +SHA256 (rust/crates/rand-0.9.2.crate) = 6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1 +SIZE (rust/crates/rand-0.9.2.crate) = 99930 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251 +SHA256 (rust/crates/rand_chacha-0.9.0.crate) = d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb +SIZE (rust/crates/rand_chacha-0.9.0.crate) = 18258 SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c SIZE (rust/crates/rand_core-0.6.4.crate) = 22666 +SHA256 (rust/crates/rand_core-0.9.3.crate) = 99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38 +SIZE (rust/crates/rand_core-0.9.3.crate) = 24543 SHA256 (rust/crates/rayon-1.10.0.crate) = b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa SIZE (rust/crates/rayon-1.10.0.crate) = 180155 SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2 @@ -679,12 +695,16 @@ SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331 +SHA256 (rust/crates/rustc-hash-2.1.1.crate) = 357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d +SIZE (rust/crates/rustc-hash-2.1.1.crate) = 14154 SHA256 (rust/crates/rustc_version-0.4.1.crate) = cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92 SIZE (rust/crates/rustc_version-0.4.1.crate) = 12245 SHA256 (rust/crates/rustix-0.38.44.crate) = fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154 SIZE (rust/crates/rustix-0.38.44.crate) = 379347 SHA256 (rust/crates/rustls-0.23.23.crate) = 47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395 SIZE (rust/crates/rustls-0.23.23.crate) = 342561 +SHA256 (rust/crates/rustls-native-certs-0.8.2.crate) = 9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923 +SIZE (rust/crates/rustls-native-certs-0.8.2.crate) = 31903 SHA256 (rust/crates/rustls-pemfile-2.2.0.crate) = dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50 SIZE (rust/crates/rustls-pemfile-2.2.0.crate) = 25849 SHA256 (rust/crates/rustls-pki-types-1.11.0.crate) = 917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c @@ -961,6 +981,10 @@ SHA256 (rust/crates/web-sys-0.3.77.crate) = 33b6dd2ef9186f1f2072e409e99cd22a9753 SIZE (rust/crates/web-sys-0.3.77.crate) = 638246 SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb SIZE (rust/crates/web-time-1.1.0.crate) = 18026 +SHA256 (rust/crates/webpki-roots-0.26.11.crate) = 521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9 +SIZE (rust/crates/webpki-roots-0.26.11.crate) = 15557 +SHA256 (rust/crates/webpki-roots-1.0.3.crate) = 32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8 +SIZE (rust/crates/webpki-roots-1.0.3.crate) = 258244 SHA256 (rust/crates/widestring-1.1.0.crate) = 7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311 SIZE (rust/crates/widestring-1.1.0.crate) = 85046 SHA256 (rust/crates/win-crypto-ng-0.5.1.crate) = 99abfb435a71e54ab2971d8d8c32f1a7e006cdbf527f71743b1d45b93517bb92 @@ -1063,5 +1087,3 @@ SHA256 (rust/crates/zerovec-0.10.4.crate) = aa2b893d79df23bfb12d5461018d408ea19d SIZE (rust/crates/zerovec-0.10.4.crate) = 126398 SHA256 (rust/crates/zerovec-derive-0.10.3.crate) = 6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6 SIZE (rust/crates/zerovec-derive-0.10.3.crate) = 19438 -SHA256 (sequoia-sq-v1.3.1.tar.bz2) = ca4a6ef07ab9ca492c8166d6d6ed0354eb81f418bf819cf095c1ee856c461365 -SIZE (sequoia-sq-v1.3.1.tar.bz2) = 675650 diff --git a/security/sequoia-sq/files/patch-Cargo.toml b/security/sequoia-sq/files/patch-Cargo.toml new file mode 100644 index 000000000000..316964882b96 --- /dev/null +++ b/security/sequoia-sq/files/patch-Cargo.toml @@ -0,0 +1,14 @@ +--- Cargo.toml.orig 1970-01-01 00:00:01 UTC ++++ Cargo.toml +@@ -144,7 +144,11 @@ version = ">=0.12, <0.13" + + [dependencies.reqwest] + version = ">=0.12, <0.13" ++default-features = false + features = [ ++ "rustls-tls", ++ "charset", ++ "http2", + "hickory-dns", + "stream", + ] diff --git a/security/sequoia-sq/files/patch-cargo-crates_sequoia-net-0.30.0_Cargo.toml b/security/sequoia-sq/files/patch-cargo-crates_sequoia-net-0.30.0_Cargo.toml new file mode 100644 index 000000000000..e4c95e24f8a8 --- /dev/null +++ b/security/sequoia-sq/files/patch-cargo-crates_sequoia-net-0.30.0_Cargo.toml @@ -0,0 +1,30 @@ +--- cargo-crates/sequoia-net-0.30.0/Cargo.toml.orig 1970-01-01 00:00:01 UTC ++++ cargo-crates/sequoia-net-0.30.0/Cargo.toml +@@ -81,6 +81,12 @@ version = "0.12" + + [dependencies.reqwest] + version = "0.12" ++default-features = false ++features = [ ++ "rustls-tls", ++ "charset", ++ "http2", ++] + + [dependencies.sequoia-openpgp] + version = "2" +@@ -120,7 +126,13 @@ version = "0.12" + + [dev-dependencies.reqwest] + version = "0.12" +-features = ["socks"] ++default-features = false ++features = [ ++ "rustls-tls", ++ "charset", ++ "http2", ++ "socks", ++] + + [dev-dependencies.tempfile] + version = "3.1"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510250321.59P3LPvJ075024>