commit: 613dcd9dbcf2e703c50d2ae2455c978a1c8afbf1 Author: Jesse De Haan <dehaanjesses <AT> gmail <DOT> com> AuthorDate: Sun Oct 12 18:44:23 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Oct 13 18:09:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=613dcd9d
net-misc/websocat: update SRC_URI Closes: https://bugs.gentoo.org/959621 Signed-off-by: Jesse De Haan <dehaanjesses <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/44150 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> net-misc/websocat/Manifest | 1 + .../files/websocat-1.14.0-traitobject-lock.patch | 30 ++++++++++++++++++++++ net-misc/websocat/websocat-1.13.0-r1.ebuild | 10 ++++++-- net-misc/websocat/websocat-1.14.0.ebuild | 8 +++++- 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/net-misc/websocat/Manifest b/net-misc/websocat/Manifest index e9cf56fef6a6..c1f335c5397e 100644 --- a/net-misc/websocat/Manifest +++ b/net-misc/websocat/Manifest @@ -1,3 +1,4 @@ +DIST traitobject-0.1.1.crate 2411 BLAKE2B ee0398e4e79607111714edea6b9968ecec6302523e9112f4d25ab62f5111d9aae91ff1848c6ac094175953f9fb7e99abd707d557d1ee1d362dbc737f3f5031bd SHA512 48caf4b6f3b4e88a84fb34cc2262c05525f1efb42db1ddd9f19527dfc53c4e433ee5b0b23595f93b936117fd3672fb9500290f1e5960d5e064210f868b4116c2 DIST websocat-1.13.0-crates.tar.xz 26849464 BLAKE2B d7be9a8db3c1774d7ed607d5ec5cdf6435fa9f2ac4dca7c23d7dc5c858f0301b103794707fec036318ef1287faa9ecdc795385439a71d7bbce28f2e746841ddd SHA512 2fc155c69c0c115e8c8298e9756bb92b905982b5212bd51ce82032babf145cef79451ca981c2378caf1b54980ef12b491c6d324bc6915bca63cfd23ef9fa1152 DIST websocat-1.13.0.tar.gz 175990 BLAKE2B 287e869538246d9d5c62080aeb1627b0e8155585553800c0d639e2a8bebf9b4d65e3df35ff424c48076cdccbe79b54a15119793ae22cf68d1ce1774c0e795236 SHA512 119cb6d0c226ed4f1df86a42a26903ba8465db30e5d0908d4a28601a58636e9a906fbb44d2d811ec9b25103a8c48b4ccea8b31f2f61854d062bc436ac6afac78 DIST websocat-1.14.0-crates.tar.xz 19274384 BLAKE2B 6da1d79f8820c5830c7d4ad5ef31523412f74241d087d707c2795cf1e42cf8b9011e81f4f6de04588e8f63042ee14ed0c01f554ebef1568ce3278430eb7215dc SHA512 f2ff7181225eb6c789f36dc0b7074d843e5b2b2c4f2682887846b68aff20865b917705d1ec4a3f04ae6711a1f0ca639be824b5adc4cd8aca5467fbe9dc69846f diff --git a/net-misc/websocat/files/websocat-1.14.0-traitobject-lock.patch b/net-misc/websocat/files/websocat-1.14.0-traitobject-lock.patch new file mode 100644 index 000000000000..9c2004c2dba2 --- /dev/null +++ b/net-misc/websocat/files/websocat-1.14.0-traitobject-lock.patch @@ -0,0 +1,30 @@ +From upstream. +https://bugs.gentoo.org/959621 + +From d4455623e777231d69b029d69d7a17c0de2bafe7 Mon Sep 17 00:00:00 2001 +From: Vitaly _Vi Shukela <[email protected]> +Date: Fri, 23 May 2025 21:37:00 +0200 +Subject: [PATCH] Update traitobject dependency to fix compilation on new Rust + versions + +Addresses #293. +--- + Cargo.lock | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1768,9 +1768,9 @@ dependencies = [ + + [[package]] + name = "traitobject" +-version = "0.1.0" ++version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" ++checksum = "04a79e25382e2e852e8da874249358d382ebaf259d0d34e75d8db16a7efabbc7" + + [[package]] + name = "typeable" +-- +2.51.0 diff --git a/net-misc/websocat/websocat-1.13.0-r1.ebuild b/net-misc/websocat/websocat-1.13.0-r1.ebuild index cb5f4a415b7e..18bdeec40d09 100644 --- a/net-misc/websocat/websocat-1.13.0-r1.ebuild +++ b/net-misc/websocat/websocat-1.13.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2024 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -CRATES=" " +CRATES="[email protected]" inherit cargo @@ -11,6 +11,7 @@ DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like fu HOMEPAGE="https://github.com/vi/websocat"; SRC_URI="https://github.com/vi/websocat/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/net-misc/${PN}/${P}-crates.tar.xz"; +SRC_URI+=" ${CARGO_CRATE_URIS}" LICENSE="MIT" # Dependent crate licenses @@ -31,6 +32,11 @@ RDEPEND=" DEPEND=" ${RDEPEND} " + +PATCHES=( + "${FILESDIR}"/${PN}-1.14.0-traitobject-lock.patch +) + QA_FLAGS_IGNORED="/usr/bin/websocat" src_configure() { diff --git a/net-misc/websocat/websocat-1.14.0.ebuild b/net-misc/websocat/websocat-1.14.0.ebuild index 39df4258640f..a261aa31c442 100644 --- a/net-misc/websocat/websocat-1.14.0.ebuild +++ b/net-misc/websocat/websocat-1.14.0.ebuild @@ -3,13 +3,15 @@ EAPI=8 -CRATES="" +CRATES="[email protected]" + inherit cargo DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions" HOMEPAGE="https://github.com/vi/websocat"; SRC_URI="https://github.com/vi/websocat/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/net-misc/${PN}/${P}-crates.tar.xz"; +SRC_URI+=" ${CARGO_CRATE_URIS}" LICENSE="MIT" # Dependent crate licenses @@ -24,6 +26,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-traitobject-lock.patch +) + QA_FLAGS_IGNORED="/usr/bin/websocat" src_configure() {
