Rust upstream has 1.58.1 available as of January 20th. https://blog.rust-lang.org/2022/01/20/Rust-1.58.1.html Can the lang/rust port get an update for this?
There is security issue involved. After patch, if you could add entry in security/vuxml that would be great CVE-2022-21658 https://www.cvedetails.com/cve/CVE-2022-21658/ Resume: An attacker could use this security issue to trick a privileged program into deleting files and directories the attacker couldn't otherwise access or delete.
Registered in vuxml > Security: ee26f513-826e-11ec-8be6-d4c9ef517024
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd3a9279310ec68c634964e6a819296aa470fadb commit bd3a9279310ec68c634964e6a819296aa470fadb Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2022-02-03 14:02:31 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2022-02-03 14:02:31 +0000 lang/rust: Update to 1.58.1 https://blog.rust-lang.org/2022/01/20/Rust-1.58.1.html PR: 261449 Security: ee26f513-826e-11ec-8be6-d4c9ef517024 Mk/Uses/cargo.mk | 2 +- Mk/bsd.gecko.mk | 2 +- lang/rust-bootstrap/Makefile | 2 +- lang/rust-bootstrap/distinfo | 6 +++--- lang/rust/Makefile | 2 +- lang/rust/distinfo | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=d64a2a380f88ceec8264db6bbc94805f58112ee7 commit d64a2a380f88ceec8264db6bbc94805f58112ee7 Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2022-02-03 14:02:32 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2022-02-03 14:02:32 +0000 lang/rust: Relink consumers PR: 261449 Security: ee26f513-826e-11ec-8be6-d4c9ef517024 accessibility/sctd/Makefile | 2 +- accessibility/wl-gammarelay-rs/Makefile | 1 + audio/gnome-podcasts/Makefile | 2 +- audio/lewton/Makefile | 2 +- audio/myxer/Makefile | 2 +- audio/ncspot/Makefile | 2 +- audio/shortwave/Makefile | 2 +- audio/spotify-tui/Makefile | 2 +- audio/spotifyd/Makefile | 2 +- benchmarks/hyperfine/Makefile | 2 +- benchmarks/inferno/Makefile | 2 +- converters/yj-bruceadams/Makefile | 1 + databases/ods2sql/Makefile | 2 +- databases/redisjson/Makefile | 2 +- databases/xls2txt/Makefile | 2 +- deskutils/just/Makefile | 1 + deskutils/solanum/Makefile | 2 +- devel/bingrep/Makefile | 2 +- devel/cargo-c/Makefile | 1 + devel/cargo-generate/Makefile | 2 +- devel/desed/Makefile | 2 +- devel/dtool/Makefile | 2 +- devel/elfcat/Makefile | 2 +- devel/gbump/Makefile | 2 +- devel/git-absorb/Makefile | 2 +- devel/git-delta/Makefile | 2 +- devel/gitui/Makefile | 1 + devel/grcov/Makefile | 2 +- devel/grex/Makefile | 2 +- devel/interactive_rebase_tool/Makefile | 2 +- devel/pijul/Makefile | 2 +- devel/py-maturin/Makefile | 2 +- devel/racer/Makefile | 2 +- devel/rust-analyzer/Makefile | 1 + devel/rust-bindgen/Makefile | 2 +- devel/rust-cbindgen/Makefile | 2 +- devel/sccache/Makefile | 2 +- devel/sentry-cli/Makefile | 2 +- devel/stylua/Makefile | 2 +- devel/texlab/Makefile | 1 + devel/tokei/Makefile | 2 +- dns/dog/Makefile | 2 +- dns/doh-proxy/Makefile | 2 +- dns/encrypted-dns-server/Makefile | 2 +- editors/helix/Makefile | 2 +- editors/kak-lsp/Makefile | 1 + editors/kibi/Makefile | 2 +- editors/parinfer-rust/Makefile | 1 + editors/xi-core/Makefile | 2 +- editors/xi-term/Makefile | 2 +- finance/tickrs/Makefile | 2 +- games/0ad/Makefile | 2 +- games/abstreet/Makefile | 2 +- games/anki/Makefile | 2 +- games/dose-response/Makefile | 2 +- games/genact/Makefile | 2 +- games/jaggedalliance2/Makefile | 2 +- games/rpg-cli/Makefile | 2 +- games/veloren/Makefile | 2 +- graphics/dssim/Makefile | 1 + graphics/gifski/Makefile | 1 + graphics/ikona/Makefile | 2 +- graphics/libopenraw/Makefile | 2 +- graphics/librsvg2-rust/Makefile | 2 +- graphics/pastel/Makefile | 2 +- graphics/rx/Makefile | 2 +- graphics/svgbob/Makefile | 2 +- graphics/viu/Makefile | 2 +- java/icedtea-web/Makefile | 2 +- lang/gleam/Makefile | 2 +- lang/spidermonkey78/Makefile | 2 +- mail/thunderbird/Makefile | 1 + math/kalker/Makefile | 2 +- misc/broot/Makefile | 1 + misc/ruut/Makefile | 2 +- misc/xd-rust/Makefile | 2 +- misc/xplr/Makefile | 2 +- multimedia/av1an/Makefile | 2 +- multimedia/gstreamer1-plugins-rust/Makefile | 2 +- multimedia/helvum/Makefile | 1 + multimedia/kooha/Makefile | 2 +- multimedia/librav1e/Makefile | 2 +- multimedia/librespot/Makefile | 2 +- multimedia/neolink/Makefile | 2 +- multimedia/rav1e/Makefile | 2 +- multimedia/scte35dump/Makefile | 2 +- multimedia/termplay/Makefile | 2 +- net-im/conduit/Makefile | 2 +- net-im/fractal/Makefile | 2 +- net-im/libsignal-client/Makefile | 2 +- net-im/yume/Makefile | 2 +- net-im/zkgroup/Makefile | 2 +- net-mgmt/bandwhich/Makefile | 2 +- net-mgmt/nfs-exporter/Makefile | 2 +- net-p2p/openethereum/Makefile | 2 +- net/findomain/Makefile | 2 +- net/gemserv/Makefile | 2 +- net/krill/Makefile | 2 +- net/oha/Makefile | 2 +- net/proby/Makefile | 2 +- net/quiche/Makefile | 2 +- net/rabbiteer/Makefile | 2 +- net/routinator/Makefile | 2 +- ports-mgmt/pkg-graph/Makefile | 1 + ports-mgmt/sccache-overlay/Makefile | 2 +- security/acmed/Makefile | 2 +- security/arti/Makefile | 1 + security/authenticator/Makefile | 2 +- security/cargo-audit/Makefile | 1 + security/cloak/Makefile | 2 +- security/gpg-tui/Makefile | 2 +- security/rustscan/Makefile | 2 +- security/sequoia/Makefile | 2 +- security/solana/Makefile | 1 + security/suricata/Makefile | 2 +- security/vaultwarden/Makefile | 2 +- security/weggli/Makefile | 1 + shells/ion/Makefile | 2 +- shells/nsh/Makefile | 2 +- shells/starship/Makefile | 2 +- sysutils/czkawka/Makefile | 1 + sysutils/diskonaut/Makefile | 2 +- sysutils/dua-cli/Makefile | 1 + sysutils/exa/Makefile | 2 +- sysutils/fd/Makefile | 1 + sysutils/flowgger/Makefile | 2 +- sysutils/fselect/Makefile | 2 +- sysutils/fusefs-sandboxfs/Makefile | 2 +- sysutils/fusefs-xfuse/Makefile | 2 +- sysutils/gstat-rs/Makefile | 2 +- sysutils/hexyl/Makefile | 2 +- sysutils/jail_exporter/Makefile | 2 +- sysutils/lsd/Makefile | 2 +- sysutils/mcfly/Makefile | 2 +- sysutils/onefetch/Makefile | 2 +- sysutils/potnet/Makefile | 2 +- sysutils/rsfetch/Makefile | 2 +- sysutils/tealdeer/Makefile | 2 +- sysutils/vector/Makefile | 2 +- sysutils/vivid/Makefile | 1 + sysutils/zellij/Makefile | 1 + sysutils/zoxide/Makefile | 2 +- sysutils/ztop/Makefile | 2 +- textproc/angle-grinder/Makefile | 2 +- textproc/bat/Makefile | 2 +- textproc/cast2gif/Makefile | 2 +- textproc/htmlq/Makefile | 1 + textproc/jql/Makefile | 1 + textproc/mdbook-linkcheck/Makefile | 2 +- textproc/mdbook/Makefile | 1 + textproc/meilisearch/Makefile | 1 + textproc/ripgrep-all/Makefile | 2 +- textproc/ripgrep/Makefile | 2 +- textproc/sd/Makefile | 2 +- textproc/sonic/Makefile | 2 +- textproc/xsv-rs/Makefile | 2 +- www/castor/Makefile | 2 +- www/deno/Makefile | 1 + www/ffsend/Makefile | 2 +- www/firefox-esr/Makefile | 1 + www/geckodriver/Makefile | 2 +- www/jwt-cli/Makefile | 1 + www/lychee/Makefile | 2 +- www/miniserve/Makefile | 2 +- www/monolith/Makefile | 2 +- www/newsboat/Makefile | 2 +- www/py-adblock/Makefile | 2 +- www/rearx/Makefile | 2 +- www/websocat/Makefile | 2 +- www/xh/Makefile | 2 +- www/zola/Makefile | 1 + x11-wm/leftwm/Makefile | 2 +- x11/admiral/Makefile | 2 +- x11/alacritty/Makefile | 1 + x11/inputplug/Makefile | 2 +- x11/sirula/Makefile | 2 +- x11/squeekboard/Makefile | 1 + x11/swayr/Makefile | 1 + x11/wezterm/Makefile | 2 +- x11/wmfocus/Makefile | 2 +- 180 files changed, 180 insertions(+), 145 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=99de21f2a15c52fd488b59aaaa418843955f9741 commit 99de21f2a15c52fd488b59aaaa418843955f9741 Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2022-02-03 14:02:33 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2022-02-03 14:02:33 +0000 security/vuxml: Fix recent lang/rust entry PR: 261449 security/vuxml/vuln-2022.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
You're welcome.
(In reply to commit-hook from comment #5) Oops! That was bad :'( Thanks for updating the port (and vuxml entry)
Should this also be merged to the quarterly branch?
(In reply to Dan Langille from comment #8) Go ahead. I think merging 1.58.0 and 1.58.1 would be fine. We did not have to apply any build fixes to ports for Rust 1.58.0 IIRC.
(In reply to Dan Langille from comment #8) > Should this also be merged to the quarterly branch? OMG, I just tried this. It's horrific.
(In reply to Dan Langille from comment #10) I think I did it wrong. This time it's much better. A 'poudriere testport' is underway.
A commit in branch 2022Q1 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc19f57b5f44928118a4467f0c4b820465fa0cfa commit fc19f57b5f44928118a4467f0c4b820465fa0cfa Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2022-02-03 14:02:31 +0000 Commit: Dan Langille <dvl@FreeBSD.org> CommitDate: 2022-02-04 18:34:46 +0000 lang/rust: Update to 1.58.1 https://blog.rust-lang.org/2022/01/20/Rust-1.58.1.html PR: 261449 Security: ee26f513-826e-11ec-8be6-d4c9ef517024 (cherry picked from commit bd3a9279310ec68c634964e6a819296aa470fadb) Mk/Uses/cargo.mk | 2 +- Mk/bsd.gecko.mk | 2 +- lang/rust-bootstrap/Makefile | 2 +- lang/rust-bootstrap/distinfo | 6 +++--- lang/rust/Makefile | 2 +- lang/rust/distinfo | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-)
Do you plan to backport comment 4 as well? CVE-2022-21658 affects the standard library which is linked statically (*.rlib) due to unstable ABI. Until something else triggers a rebuild (e.g., OSVERSION bump via freebsd-update) consumers are going to remain vulnerable while users assume a false sense of security. $ echo 'fn main() {}' foo.rs $ RUSTC_BOOTSTRAP=1 rustc -Z print-link-args=yes foo.rs | sed 'y/ /\n/' | sed '/libstd/!d' "/usr/local/lib/rustlib/x86_64-unknown-freebsd/lib/libstd-b94163daca34e02a.rlib" "/usr/local/lib/rustlib/x86_64-unknown-freebsd/lib/libstd_detect-c0dac963d1e412b5.rlib" $ tar tf /usr/local/lib/rustlib/x86_64-unknown-freebsd/lib/libstd-b94163daca34e02a.rlib / // std-b94163daca34e02a.std.72847365-cgu.0.rcgu.o std-b94163daca34e02a.std.72847365-cgu.1.rcgu.o std-b94163daca34e02a.std.72847365-cgu.10.rcgu.o std-b94163daca34e02a.std.72847365-cgu.11.rcgu.o std-b94163daca34e02a.std.72847365-cgu.12.rcgu.o std-b94163daca34e02a.std.72847365-cgu.13.rcgu.o std-b94163daca34e02a.std.72847365-cgu.14.rcgu.o std-b94163daca34e02a.std.72847365-cgu.15.rcgu.o std-b94163daca34e02a.std.72847365-cgu.2.rcgu.o std-b94163daca34e02a.std.72847365-cgu.3.rcgu.o std-b94163daca34e02a.std.72847365-cgu.4.rcgu.o std-b94163daca34e02a.std.72847365-cgu.5.rcgu.o std-b94163daca34e02a.std.72847365-cgu.6.rcgu.o std-b94163daca34e02a.std.72847365-cgu.7.rcgu.o std-b94163daca34e02a.std.72847365-cgu.8.rcgu.o std-b94163daca34e02a.std.72847365-cgu.9.rcgu.o lib.rmeta
(In reply to Jan Beich from comment #14) I did not intended to and now I'm AFK for some time. Happy for someone else to attack it or I can look at it again on Monday morning.
I found time tonight. rust seems to be particular brutal on merges. [pkg01 dan ~/ports/head] % git cherry-pick -x d64a2a380f88ceec8264db6bbc94805f58112ee7 0:52:01 Auto-merging accessibility/sctd/Makefile CONFLICT (content): Merge conflict in accessibility/sctd/Makefile CONFLICT (modify/delete): accessibility/wl-gammarelay-rs/Makefile deleted in HEAD and modified in d64a2a380f88 (lang/rust: Relink consumers). Version d64a2a380f88 (lang/rust: Relink consumers) of accessibility/wl-gammarelay-rs/Makefile left in tree. Auto-merging audio/gnome-podcasts/Makefile CONFLICT (content): Merge conflict in audio/gnome-podcasts/Makefile Auto-merging audio/lewton/Makefile CONFLICT (content): Merge conflict in audio/lewton/Makefile Auto-merging audio/myxer/Makefile CONFLICT (content): Merge conflict in audio/myxer/Makefile Auto-merging audio/ncspot/Makefile CONFLICT (content): Merge conflict in audio/ncspot/Makefile Auto-merging audio/shortwave/Makefile CONFLICT (content): Merge conflict in audio/shortwave/Makefile Auto-merging audio/spotify-tui/Makefile CONFLICT (content): Merge conflict in audio/spotify-tui/Makefile Auto-merging audio/spotifyd/Makefile CONFLICT (content): Merge conflict in audio/spotifyd/Makefile Auto-merging benchmarks/hyperfine/Makefile CONFLICT (content): Merge conflict in benchmarks/hyperfine/Makefile Auto-merging benchmarks/inferno/Makefile CONFLICT (content): Merge conflict in benchmarks/inferno/Makefile Auto-merging converters/yj-bruceadams/Makefile CONFLICT (content): Merge conflict in converters/yj-bruceadams/Makefile Auto-merging databases/ods2sql/Makefile CONFLICT (content): Merge conflict in databases/ods2sql/Makefile Auto-merging databases/redisjson/Makefile CONFLICT (content): Merge conflict in databases/redisjson/Makefile Auto-merging databases/xls2txt/Makefile CONFLICT (content): Merge conflict in databases/xls2txt/Makefile Auto-merging deskutils/just/Makefile CONFLICT (content): Merge conflict in deskutils/just/Makefile Auto-merging deskutils/solanum/Makefile CONFLICT (content): Merge conflict in deskutils/solanum/Makefile Auto-merging devel/bingrep/Makefile CONFLICT (content): Merge conflict in devel/bingrep/Makefile Auto-merging devel/cargo-c/Makefile CONFLICT (content): Merge conflict in devel/cargo-c/Makefile Auto-merging devel/cargo-generate/Makefile CONFLICT (content): Merge conflict in devel/cargo-generate/Makefile Auto-merging devel/desed/Makefile CONFLICT (content): Merge conflict in devel/desed/Makefile Auto-merging devel/dtool/Makefile CONFLICT (content): Merge conflict in devel/dtool/Makefile Auto-merging devel/elfcat/Makefile CONFLICT (content): Merge conflict in devel/elfcat/Makefile Auto-merging devel/gbump/Makefile CONFLICT (content): Merge conflict in devel/gbump/Makefile Auto-merging devel/git-absorb/Makefile CONFLICT (content): Merge conflict in devel/git-absorb/Makefile Auto-merging devel/git-delta/Makefile CONFLICT (content): Merge conflict in devel/git-delta/Makefile Auto-merging devel/gitui/Makefile CONFLICT (content): Merge conflict in devel/gitui/Makefile Auto-merging devel/grcov/Makefile CONFLICT (content): Merge conflict in devel/grcov/Makefile Auto-merging devel/grex/Makefile CONFLICT (content): Merge conflict in devel/grex/Makefile Auto-merging devel/interactive_rebase_tool/Makefile CONFLICT (content): Merge conflict in devel/interactive_rebase_tool/Makefile Auto-merging devel/pijul/Makefile CONFLICT (content): Merge conflict in devel/pijul/Makefile Auto-merging devel/py-maturin/Makefile CONFLICT (content): Merge conflict in devel/py-maturin/Makefile Auto-merging devel/racer/Makefile CONFLICT (content): Merge conflict in devel/racer/Makefile Auto-merging devel/rust-analyzer/Makefile CONFLICT (content): Merge conflict in devel/rust-analyzer/Makefile Auto-merging devel/rust-bindgen/Makefile CONFLICT (content): Merge conflict in devel/rust-bindgen/Makefile Auto-merging devel/rust-cbindgen/Makefile CONFLICT (content): Merge conflict in devel/rust-cbindgen/Makefile Auto-merging devel/sccache/Makefile CONFLICT (content): Merge conflict in devel/sccache/Makefile Auto-merging devel/sentry-cli/Makefile CONFLICT (content): Merge conflict in devel/sentry-cli/Makefile Auto-merging devel/stylua/Makefile CONFLICT (content): Merge conflict in devel/stylua/Makefile Auto-merging devel/texlab/Makefile CONFLICT (content): Merge conflict in devel/texlab/Makefile Auto-merging devel/tokei/Makefile CONFLICT (content): Merge conflict in devel/tokei/Makefile Auto-merging dns/dog/Makefile CONFLICT (content): Merge conflict in dns/dog/Makefile Auto-merging dns/doh-proxy/Makefile CONFLICT (content): Merge conflict in dns/doh-proxy/Makefile Auto-merging dns/encrypted-dns-server/Makefile CONFLICT (content): Merge conflict in dns/encrypted-dns-server/Makefile Auto-merging editors/helix/Makefile CONFLICT (content): Merge conflict in editors/helix/Makefile Auto-merging editors/kak-lsp/Makefile CONFLICT (content): Merge conflict in editors/kak-lsp/Makefile Auto-merging editors/kibi/Makefile CONFLICT (content): Merge conflict in editors/kibi/Makefile Auto-merging editors/parinfer-rust/Makefile CONFLICT (content): Merge conflict in editors/parinfer-rust/Makefile Auto-merging editors/xi-core/Makefile CONFLICT (content): Merge conflict in editors/xi-core/Makefile Auto-merging editors/xi-term/Makefile CONFLICT (content): Merge conflict in editors/xi-term/Makefile Auto-merging finance/tickrs/Makefile CONFLICT (content): Merge conflict in finance/tickrs/Makefile Auto-merging games/0ad/Makefile CONFLICT (content): Merge conflict in games/0ad/Makefile Auto-merging games/abstreet/Makefile CONFLICT (content): Merge conflict in games/abstreet/Makefile Auto-merging games/anki/Makefile CONFLICT (content): Merge conflict in games/anki/Makefile Auto-merging games/dose-response/Makefile CONFLICT (content): Merge conflict in games/dose-response/Makefile Auto-merging games/genact/Makefile CONFLICT (content): Merge conflict in games/genact/Makefile Auto-merging games/jaggedalliance2/Makefile CONFLICT (content): Merge conflict in games/jaggedalliance2/Makefile Auto-merging games/rpg-cli/Makefile CONFLICT (content): Merge conflict in games/rpg-cli/Makefile Auto-merging games/veloren/Makefile CONFLICT (content): Merge conflict in games/veloren/Makefile Auto-merging graphics/gifski/Makefile CONFLICT (content): Merge conflict in graphics/gifski/Makefile Auto-merging graphics/ikona/Makefile CONFLICT (content): Merge conflict in graphics/ikona/Makefile Auto-merging graphics/libopenraw/Makefile CONFLICT (content): Merge conflict in graphics/libopenraw/Makefile Auto-merging graphics/librsvg2-rust/Makefile CONFLICT (content): Merge conflict in graphics/librsvg2-rust/Makefile Auto-merging graphics/pastel/Makefile CONFLICT (content): Merge conflict in graphics/pastel/Makefile Auto-merging graphics/rx/Makefile CONFLICT (content): Merge conflict in graphics/rx/Makefile Auto-merging graphics/svgbob/Makefile CONFLICT (content): Merge conflict in graphics/svgbob/Makefile Auto-merging graphics/viu/Makefile CONFLICT (content): Merge conflict in graphics/viu/Makefile Auto-merging java/icedtea-web/Makefile CONFLICT (content): Merge conflict in java/icedtea-web/Makefile Auto-merging lang/gleam/Makefile CONFLICT (content): Merge conflict in lang/gleam/Makefile Auto-merging lang/spidermonkey78/Makefile CONFLICT (content): Merge conflict in lang/spidermonkey78/Makefile Auto-merging math/kalker/Makefile CONFLICT (content): Merge conflict in math/kalker/Makefile Auto-merging misc/broot/Makefile CONFLICT (content): Merge conflict in misc/broot/Makefile Auto-merging misc/ruut/Makefile CONFLICT (content): Merge conflict in misc/ruut/Makefile Auto-merging misc/xd-rust/Makefile CONFLICT (content): Merge conflict in misc/xd-rust/Makefile Auto-merging misc/xplr/Makefile CONFLICT (content): Merge conflict in misc/xplr/Makefile Auto-merging multimedia/av1an/Makefile CONFLICT (content): Merge conflict in multimedia/av1an/Makefile Auto-merging multimedia/gstreamer1-plugins-rust/Makefile CONFLICT (content): Merge conflict in multimedia/gstreamer1-plugins-rust/Makefile Auto-merging multimedia/helvum/Makefile CONFLICT (content): Merge conflict in multimedia/helvum/Makefile Auto-merging multimedia/kooha/Makefile CONFLICT (content): Merge conflict in multimedia/kooha/Makefile Auto-merging multimedia/librav1e/Makefile CONFLICT (content): Merge conflict in multimedia/librav1e/Makefile Auto-merging multimedia/librespot/Makefile CONFLICT (content): Merge conflict in multimedia/librespot/Makefile Auto-merging multimedia/neolink/Makefile CONFLICT (content): Merge conflict in multimedia/neolink/Makefile Auto-merging multimedia/rav1e/Makefile CONFLICT (content): Merge conflict in multimedia/rav1e/Makefile Auto-merging multimedia/scte35dump/Makefile CONFLICT (content): Merge conflict in multimedia/scte35dump/Makefile Auto-merging multimedia/termplay/Makefile CONFLICT (content): Merge conflict in multimedia/termplay/Makefile Auto-merging net-im/conduit/Makefile CONFLICT (content): Merge conflict in net-im/conduit/Makefile Auto-merging net-im/fractal/Makefile CONFLICT (content): Merge conflict in net-im/fractal/Makefile Auto-merging net-im/libsignal-client/Makefile CONFLICT (content): Merge conflict in net-im/libsignal-client/Makefile Auto-merging net-im/yume/Makefile CONFLICT (content): Merge conflict in net-im/yume/Makefile Auto-merging net-im/zkgroup/Makefile CONFLICT (content): Merge conflict in net-im/zkgroup/Makefile Auto-merging net-mgmt/bandwhich/Makefile CONFLICT (content): Merge conflict in net-mgmt/bandwhich/Makefile Auto-merging net-mgmt/nfs-exporter/Makefile CONFLICT (content): Merge conflict in net-mgmt/nfs-exporter/Makefile Auto-merging net-p2p/openethereum/Makefile CONFLICT (content): Merge conflict in net-p2p/openethereum/Makefile Auto-merging net/findomain/Makefile CONFLICT (content): Merge conflict in net/findomain/Makefile Auto-merging net/gemserv/Makefile CONFLICT (content): Merge conflict in net/gemserv/Makefile Auto-merging net/krill/Makefile CONFLICT (content): Merge conflict in net/krill/Makefile Auto-merging net/oha/Makefile CONFLICT (content): Merge conflict in net/oha/Makefile Auto-merging net/proby/Makefile CONFLICT (content): Merge conflict in net/proby/Makefile Auto-merging net/quiche/Makefile CONFLICT (content): Merge conflict in net/quiche/Makefile Auto-merging net/rabbiteer/Makefile CONFLICT (content): Merge conflict in net/rabbiteer/Makefile Auto-merging net/routinator/Makefile CONFLICT (content): Merge conflict in net/routinator/Makefile CONFLICT (modify/delete): ports-mgmt/pkg-graph/Makefile deleted in HEAD and modified in d64a2a380f88 (lang/rust: Relink consumers). Version d64a2a380f88 (lang/rust: Relink consumers) of ports-mgmt/pkg-graph/Makefile left in tree. Auto-merging ports-mgmt/sccache-overlay/Makefile CONFLICT (content): Merge conflict in ports-mgmt/sccache-overlay/Makefile Auto-merging security/acmed/Makefile CONFLICT (content): Merge conflict in security/acmed/Makefile Auto-merging security/arti/Makefile CONFLICT (content): Merge conflict in security/arti/Makefile Auto-merging security/authenticator/Makefile CONFLICT (content): Merge conflict in security/authenticator/Makefile Auto-merging security/cargo-audit/Makefile CONFLICT (content): Merge conflict in security/cargo-audit/Makefile Auto-merging security/cloak/Makefile CONFLICT (content): Merge conflict in security/cloak/Makefile Auto-merging security/gpg-tui/Makefile CONFLICT (content): Merge conflict in security/gpg-tui/Makefile Auto-merging security/rustscan/Makefile CONFLICT (content): Merge conflict in security/rustscan/Makefile Auto-merging security/sequoia/Makefile CONFLICT (content): Merge conflict in security/sequoia/Makefile Auto-merging security/solana/Makefile CONFLICT (content): Merge conflict in security/solana/Makefile Auto-merging security/suricata/Makefile CONFLICT (content): Merge conflict in security/suricata/Makefile Auto-merging security/vaultwarden/Makefile CONFLICT (content): Merge conflict in security/vaultwarden/Makefile Auto-merging security/weggli/Makefile CONFLICT (content): Merge conflict in security/weggli/Makefile Auto-merging shells/ion/Makefile CONFLICT (content): Merge conflict in shells/ion/Makefile Auto-merging shells/nsh/Makefile CONFLICT (content): Merge conflict in shells/nsh/Makefile Auto-merging shells/starship/Makefile CONFLICT (content): Merge conflict in shells/starship/Makefile Auto-merging sysutils/czkawka/Makefile CONFLICT (content): Merge conflict in sysutils/czkawka/Makefile Auto-merging sysutils/diskonaut/Makefile CONFLICT (content): Merge conflict in sysutils/diskonaut/Makefile Auto-merging sysutils/dua-cli/Makefile CONFLICT (content): Merge conflict in sysutils/dua-cli/Makefile Auto-merging sysutils/exa/Makefile CONFLICT (content): Merge conflict in sysutils/exa/Makefile Auto-merging sysutils/fd/Makefile CONFLICT (content): Merge conflict in sysutils/fd/Makefile Auto-merging sysutils/flowgger/Makefile CONFLICT (content): Merge conflict in sysutils/flowgger/Makefile Auto-merging sysutils/fselect/Makefile CONFLICT (content): Merge conflict in sysutils/fselect/Makefile Auto-merging sysutils/fusefs-sandboxfs/Makefile CONFLICT (content): Merge conflict in sysutils/fusefs-sandboxfs/Makefile Auto-merging sysutils/fusefs-xfuse/Makefile CONFLICT (content): Merge conflict in sysutils/fusefs-xfuse/Makefile Auto-merging sysutils/gstat-rs/Makefile CONFLICT (content): Merge conflict in sysutils/gstat-rs/Makefile Auto-merging sysutils/hexyl/Makefile CONFLICT (content): Merge conflict in sysutils/hexyl/Makefile Auto-merging sysutils/jail_exporter/Makefile CONFLICT (content): Merge conflict in sysutils/jail_exporter/Makefile Auto-merging sysutils/lsd/Makefile CONFLICT (content): Merge conflict in sysutils/lsd/Makefile Auto-merging sysutils/mcfly/Makefile CONFLICT (content): Merge conflict in sysutils/mcfly/Makefile Auto-merging sysutils/onefetch/Makefile CONFLICT (content): Merge conflict in sysutils/onefetch/Makefile Auto-merging sysutils/potnet/Makefile CONFLICT (content): Merge conflict in sysutils/potnet/Makefile Auto-merging sysutils/rsfetch/Makefile CONFLICT (content): Merge conflict in sysutils/rsfetch/Makefile Auto-merging sysutils/tealdeer/Makefile CONFLICT (content): Merge conflict in sysutils/tealdeer/Makefile Auto-merging sysutils/vector/Makefile CONFLICT (content): Merge conflict in sysutils/vector/Makefile Auto-merging sysutils/vivid/Makefile CONFLICT (content): Merge conflict in sysutils/vivid/Makefile Auto-merging sysutils/zoxide/Makefile CONFLICT (content): Merge conflict in sysutils/zoxide/Makefile Auto-merging sysutils/ztop/Makefile CONFLICT (content): Merge conflict in sysutils/ztop/Makefile Auto-merging textproc/angle-grinder/Makefile CONFLICT (content): Merge conflict in textproc/angle-grinder/Makefile Auto-merging textproc/bat/Makefile CONFLICT (content): Merge conflict in textproc/bat/Makefile Auto-merging textproc/cast2gif/Makefile CONFLICT (content): Merge conflict in textproc/cast2gif/Makefile Auto-merging textproc/htmlq/Makefile CONFLICT (content): Merge conflict in textproc/htmlq/Makefile Auto-merging textproc/jql/Makefile CONFLICT (content): Merge conflict in textproc/jql/Makefile Auto-merging textproc/mdbook-linkcheck/Makefile CONFLICT (content): Merge conflict in textproc/mdbook-linkcheck/Makefile Auto-merging textproc/mdbook/Makefile CONFLICT (content): Merge conflict in textproc/mdbook/Makefile CONFLICT (modify/delete): textproc/meilisearch/Makefile deleted in HEAD and modified in d64a2a380f88 (lang/rust: Relink consumers). Version d64a2a380f88 (lang/rust: Relink consumers) of textproc/meilisearch/Makefile left in tree. Auto-merging textproc/ripgrep-all/Makefile CONFLICT (content): Merge conflict in textproc/ripgrep-all/Makefile Auto-merging textproc/ripgrep/Makefile CONFLICT (content): Merge conflict in textproc/ripgrep/Makefile Auto-merging textproc/sd/Makefile CONFLICT (content): Merge conflict in textproc/sd/Makefile Auto-merging textproc/sonic/Makefile CONFLICT (content): Merge conflict in textproc/sonic/Makefile Auto-merging textproc/xsv-rs/Makefile CONFLICT (content): Merge conflict in textproc/xsv-rs/Makefile Auto-merging www/castor/Makefile CONFLICT (content): Merge conflict in www/castor/Makefile Auto-merging www/deno/Makefile CONFLICT (content): Merge conflict in www/deno/Makefile Auto-merging www/ffsend/Makefile CONFLICT (content): Merge conflict in www/ffsend/Makefile Auto-merging www/geckodriver/Makefile CONFLICT (content): Merge conflict in www/geckodriver/Makefile Auto-merging www/jwt-cli/Makefile CONFLICT (content): Merge conflict in www/jwt-cli/Makefile Auto-merging www/lychee/Makefile CONFLICT (content): Merge conflict in www/lychee/Makefile Auto-merging www/miniserve/Makefile CONFLICT (content): Merge conflict in www/miniserve/Makefile Auto-merging www/monolith/Makefile CONFLICT (content): Merge conflict in www/monolith/Makefile Auto-merging www/newsboat/Makefile CONFLICT (content): Merge conflict in www/newsboat/Makefile Auto-merging www/py-adblock/Makefile CONFLICT (content): Merge conflict in www/py-adblock/Makefile Auto-merging www/rearx/Makefile CONFLICT (content): Merge conflict in www/rearx/Makefile Auto-merging www/websocat/Makefile CONFLICT (content): Merge conflict in www/websocat/Makefile Auto-merging www/xh/Makefile CONFLICT (content): Merge conflict in www/xh/Makefile Auto-merging www/zola/Makefile CONFLICT (content): Merge conflict in www/zola/Makefile Auto-merging x11-wm/leftwm/Makefile CONFLICT (content): Merge conflict in x11-wm/leftwm/Makefile Auto-merging x11/admiral/Makefile CONFLICT (content): Merge conflict in x11/admiral/Makefile Auto-merging x11/alacritty/Makefile CONFLICT (content): Merge conflict in x11/alacritty/Makefile Auto-merging x11/inputplug/Makefile CONFLICT (content): Merge conflict in x11/inputplug/Makefile Auto-merging x11/sirula/Makefile CONFLICT (content): Merge conflict in x11/sirula/Makefile Auto-merging x11/swayr/Makefile CONFLICT (content): Merge conflict in x11/swayr/Makefile Auto-merging x11/wezterm/Makefile CONFLICT (content): Merge conflict in x11/wezterm/Makefile Auto-merging x11/wmfocus/Makefile CONFLICT (content): Merge conflict in x11/wmfocus/Makefile error: could not apply d64a2a380f88... lang/rust: Relink consumers hint: After resolving the conflicts, mark them with hint: "git add/rm <pathspec>", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort".
A commit in branch 2022Q1 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fab63b6c71253d9aaa413214d971ef067e2755c commit 8fab63b6c71253d9aaa413214d971ef067e2755c Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2022-02-05 02:58:58 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2022-02-05 02:58:58 +0000 lang/rust: Relink consumers This is a recreation of commit d64a2a380f88ceec8264db6bbc94805f58112ee7 PR: 261449 Security: ee26f513-826e-11ec-8be6-d4c9ef517024 accessibility/sctd/Makefile | 2 +- audio/gnome-podcasts/Makefile | 1 + audio/lewton/Makefile | 2 +- audio/myxer/Makefile | 2 +- audio/ncspot/Makefile | 1 + audio/shortwave/Makefile | 2 +- audio/spotify-tui/Makefile | 2 +- audio/spotifyd/Makefile | 1 + benchmarks/hyperfine/Makefile | 2 +- benchmarks/inferno/Makefile | 1 + converters/yj-bruceadams/Makefile | 2 +- databases/ods2sql/Makefile | 2 +- databases/redisjson/Makefile | 1 + databases/xls2txt/Makefile | 2 +- deskutils/just/Makefile | 1 + deskutils/solanum/Makefile | 2 +- devel/bingrep/Makefile | 2 +- devel/cargo-c/Makefile | 1 + devel/cargo-generate/Makefile | 2 +- devel/desed/Makefile | 2 +- devel/dtool/Makefile | 2 +- devel/elfcat/Makefile | 2 +- devel/gbump/Makefile | 2 +- devel/git-absorb/Makefile | 2 +- devel/git-delta/Makefile | 2 +- devel/gitui/Makefile | 1 + devel/grcov/Makefile | 2 +- devel/grex/Makefile | 2 +- devel/interactive_rebase_tool/Makefile | 2 +- devel/pijul/Makefile | 2 +- devel/py-maturin/Makefile | 2 +- devel/racer/Makefile | 2 +- devel/rust-analyzer/Makefile | 1 + devel/rust-bindgen/Makefile | 2 +- devel/rust-cbindgen/Makefile | 2 +- devel/sccache/Makefile | 2 +- devel/sentry-cli/Makefile | 2 +- devel/stylua/Makefile | 2 +- devel/texlab/Makefile | 2 +- devel/tokei/Makefile | 2 +- dns/dog/Makefile | 2 +- dns/doh-proxy/Makefile | 2 +- dns/encrypted-dns-server/Makefile | 2 +- editors/helix/Makefile | 2 +- editors/kak-lsp/Makefile | 1 + editors/kibi/Makefile | 2 +- editors/parinfer-rust/Makefile | 2 +- editors/xi-core/Makefile | 2 +- editors/xi-term/Makefile | 2 +- finance/tickrs/Makefile | 2 +- games/0ad/Makefile | 2 +- games/abstreet/Makefile | 2 +- games/anki/Makefile | 2 +- games/dose-response/Makefile | 2 +- games/genact/Makefile | 2 +- games/jaggedalliance2/Makefile | 2 +- games/rpg-cli/Makefile | 2 +- games/veloren/Makefile | 2 +- graphics/dssim/Makefile | 1 + graphics/gifski/Makefile | 2 +- graphics/ikona/Makefile | 2 +- graphics/libopenraw/Makefile | 2 +- graphics/librsvg2-rust/Makefile | 1 + graphics/pastel/Makefile | 2 +- graphics/rx/Makefile | 2 +- graphics/svgbob/Makefile | 2 +- graphics/viu/Makefile | 2 +- java/icedtea-web/Makefile | 2 +- lang/gleam/Makefile | 1 + lang/spidermonkey78/Makefile | 2 +- mail/thunderbird/Makefile | 1 + math/kalker/Makefile | 1 + misc/broot/Makefile | 2 +- misc/ruut/Makefile | 2 +- misc/xd-rust/Makefile | 2 +- misc/xplr/Makefile | 1 + multimedia/av1an/Makefile | 1 + multimedia/gstreamer1-plugins-rust/Makefile | 2 +- multimedia/helvum/Makefile | 2 +- multimedia/kooha/Makefile | 2 +- multimedia/librav1e/Makefile | 2 +- multimedia/librespot/Makefile | 2 +- multimedia/neolink/Makefile | 2 +- multimedia/rav1e/Makefile | 2 +- multimedia/scte35dump/Makefile | 2 +- multimedia/termplay/Makefile | 2 +- net-im/conduit/Makefile | 2 +- net-im/fractal/Makefile | 2 +- net-im/libsignal-client/Makefile | 2 +- net-im/yume/Makefile | 2 +- net-im/zkgroup/Makefile | 2 +- net-mgmt/bandwhich/Makefile | 2 +- net-mgmt/nfs-exporter/Makefile | 2 +- net-p2p/openethereum/Makefile | 2 +- net/findomain/Makefile | 2 +- net/gemserv/Makefile | 2 +- net/krill/Makefile | 1 + net/oha/Makefile | 2 +- net/proby/Makefile | 2 +- net/quiche/Makefile | 2 +- net/rabbiteer/Makefile | 2 +- net/routinator/Makefile | 1 + ports-mgmt/sccache-overlay/Makefile | 2 +- security/acmed/Makefile | 2 +- security/arti/Makefile | 2 +- security/authenticator/Makefile | 2 +- security/cargo-audit/Makefile | 2 +- security/cloak/Makefile | 2 +- security/gpg-tui/Makefile | 1 + security/rustscan/Makefile | 2 +- security/sequoia/Makefile | 2 +- security/solana/Makefile | 1 + security/suricata/Makefile | 1 + security/vaultwarden/Makefile | 1 + security/weggli/Makefile | 2 +- shells/ion/Makefile | 2 +- shells/nsh/Makefile | 2 +- shells/starship/Makefile | 1 + sysutils/czkawka/Makefile | 2 +- sysutils/diskonaut/Makefile | 2 +- sysutils/dua-cli/Makefile | 2 +- sysutils/exa/Makefile | 2 +- sysutils/fd/Makefile | 2 +- sysutils/flowgger/Makefile | 2 +- sysutils/fselect/Makefile | 2 +- sysutils/fusefs-sandboxfs/Makefile | 2 +- sysutils/fusefs-xfuse/Makefile | 2 +- sysutils/gstat-rs/Makefile | 2 +- sysutils/hexyl/Makefile | 2 +- sysutils/jail_exporter/Makefile | 2 +- sysutils/lsd/Makefile | 2 +- sysutils/mcfly/Makefile | 1 + sysutils/onefetch/Makefile | 2 +- sysutils/potnet/Makefile | 2 +- sysutils/rsfetch/Makefile | 2 +- sysutils/tealdeer/Makefile | 2 +- sysutils/vector/Makefile | 2 +- sysutils/vivid/Makefile | 2 +- sysutils/zellij/Makefile | 1 + sysutils/zoxide/Makefile | 2 +- sysutils/ztop/Makefile | 2 +- textproc/angle-grinder/Makefile | 2 +- textproc/bat/Makefile | 2 +- textproc/cast2gif/Makefile | 2 +- textproc/htmlq/Makefile | 2 +- textproc/jql/Makefile | 1 + textproc/mdbook-linkcheck/Makefile | 2 +- textproc/mdbook/Makefile | 2 +- textproc/ripgrep-all/Makefile | 2 +- textproc/ripgrep/Makefile | 2 +- textproc/sd/Makefile | 2 +- textproc/sonic/Makefile | 2 +- textproc/xsv-rs/Makefile | 2 +- www/castor/Makefile | 2 +- www/deno/Makefile | 1 + www/ffsend/Makefile | 2 +- www/firefox-esr/Makefile | 1 + www/firefox/Makefile | 2 +- www/geckodriver/Makefile | 2 +- www/jwt-cli/Makefile | 2 +- www/lychee/Makefile | 2 +- www/miniserve/Makefile | 2 +- www/monolith/Makefile | 2 +- www/newsboat/Makefile | 2 +- www/py-adblock/Makefile | 2 +- www/rearx/Makefile | 2 +- www/websocat/Makefile | 2 +- www/xh/Makefile | 1 + www/zola/Makefile | 1 + x11/admiral/Makefile | 2 +- x11/alacritty/Makefile | 2 +- x11/inputplug/Makefile | 2 +- x11/sirula/Makefile | 1 + x11/squeekboard/Makefile | 1 + x11/swayr/Makefile | 1 + x11/wezterm/Makefile | 1 + x11/wmfocus/Makefile | 2 +- 177 files changed, 177 insertions(+), 142 deletions(-)