From nobody Tue Jun 18 10:59:44 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3P0J4VXyz5Nb63; Tue, 18 Jun 2024 10:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W3P0J3J1bz46JD; Tue, 18 Jun 2024 10:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718708384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wysc77cs/ua13zomuMu5f6FteqtM9Ket2QYWS73uRfo=; b=JW2CmYUtN30neZY4wH+P+xY8Up9iWGPNCKI3hT9UAdBelVDIWrJxU16ZL/xyb4FMgXN0fM /0fUo2cnMmgtTPUab5Ymsld3Bp+P1uEfH/5yM9anhwEL4sjjaM3JBHNanede3PAKmMmflc hfHotMTBV60q0o7emUuJhDUNB8ePfHXf2QMDMr8a6L6T4BwSe0dkhNpPY5nRv2jdkdlYm9 2xMExESTZRSySzDRVftcjbFSZnxr189uZTuGToMzb4pdnnqqsbSJKx0ZikR8R0b7tSIicQ diN33/D+p8A/jyNPHbY7eDcZvM/pYZcE42pdZFs2kPsYlb04LdIgaeBeSU+pQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718708384; a=rsa-sha256; cv=none; b=PFmDX91e4kuVuQi35scQAldtOwLKl+oGa2LdhYAIT5sgTY0gzT3do+ZP3WFn/zb2iOHd3b dTUuPq5PH0+djJ2rRRjDIROgr8URmUY2w/GpG4iCwsfRUlG76qLZO7IYhXOq8VFgKpQa/h XjsWbILcB/+TmiY9Zk0nvoaJvqIkBi5uYoh4r4b07LHDV4LuqP/Zg0PvSbf25xmT03SkOE KNGd7fXWOHGY+sanS7YT7lUbVf3Ddoagj7PJp6ozvTfrsXpH3Lb3N2eXCM0NC6eOeNbfbn ndtp2idJMbgQvEuCjgEKyDATU4WtNCDKxrjyR7uQVem/yesffjdCVii9DoFHFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718708384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wysc77cs/ua13zomuMu5f6FteqtM9Ket2QYWS73uRfo=; b=sCjEk8pUG1h2m9V5ExIfURW9hh2vT4GfloQUTogyVRjnPKvvffLBpxFuY6ZS7637mb0WE+ SfafOYlXIOySTD0SW1NCMGhbZwz9r9MXg+zx16VMMwLJoNAyoIpd7Hd6uI+BNgYZzNVeoL eVgzCpTto6DHgm2UDihGvxuWXa/GVCXN5+1Q/Lmtj+nadBvI1feVaJaPAfMVbji8XFZ6mR xtyPWdy/Jy30tpdYqGgkgLk5g0SROFm5e0XaiYJ+8XKN8H1ODCyUWtCCW1Hx1jaj43Hwb5 lDLoE8pgoHXd/itZg9Yqzxop5r6tT4AJ4n6Ms16i9miEwaL9HQvV8EQB/4mX+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3P0J2swMzwYh; Tue, 18 Jun 2024 10:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45IAxiKp079434; Tue, 18 Jun 2024 10:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IAxirB079431; Tue, 18 Jun 2024 10:59:44 GMT (envelope-from git) Date: Tue, 18 Jun 2024 10:59:44 GMT Message-Id: <202406181059.45IAxirB079431@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 6ab970cc2f20 - main - net/rabbiteer: Fix build with rust 1.79.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ab970cc2f207aff166d852b1bcaeae3ba35163a Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ab970cc2f207aff166d852b1bcaeae3ba35163a commit 6ab970cc2f207aff166d852b1bcaeae3ba35163a Author: Mikael Urankar AuthorDate: 2024-06-14 15:25:00 +0000 Commit: Mikael Urankar CommitDate: 2024-06-18 10:59:02 +0000 net/rabbiteer: Fix build with rust 1.79.0 PR: 279707 Approved by: portmgr (build fix blanket) --- net/rabbiteer/files/patch-src_output.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/net/rabbiteer/files/patch-src_output.rs b/net/rabbiteer/files/patch-src_output.rs index 8755a4ce04b3..4d6ccb1292eb 100644 --- a/net/rabbiteer/files/patch-src_output.rs +++ b/net/rabbiteer/files/patch-src_output.rs @@ -1,9 +1,11 @@ ---- src/output.rs.orig 2018-10-14 20:00:28 UTC +--- src/output.rs.orig 2018-09-09 07:55:09 UTC +++ src/output.rs -@@ -1,10 +1,9 @@ +@@ -1,10 +1,11 @@ -use rustc_serialize::json::{self, Json, Object}; -use rustc_serialize::base64::{self, ToBase64}; -use amqp::protocol::basic::{Deliver, BasicProperties}; ++#![allow(deprecated, soft_unstable)] ++ +use amqp::protocol::basic::{BasicProperties, Deliver}; use amqp::{Table, TableEntry}; use error::RbtError; @@ -14,7 +16,7 @@ #[derive(RustcEncodable)] struct MsgDeliver { consumer_tag: String, -@@ -27,24 +26,27 @@ struct Msg { +@@ -27,24 +28,27 @@ struct Msg { data: Json, } @@ -51,7 +53,7 @@ headers: Object::new(), }; -@@ -57,9 +59,9 @@ pub fn build_output(info:bool, deliver:&Deliver, +@@ -57,9 +61,9 @@ pub fn build_output(info:bool, deliver:&Deliver, // and put it together let msg = Msg { @@ -64,7 +66,7 @@ }; // encode -@@ -67,9 +69,7 @@ pub fn build_output(info:bool, deliver:&Deliver, +@@ -67,9 +71,7 @@ pub fn build_output(info:bool, deliver:&Deliver, // convert to bytes Ok(js.to_string().as_bytes().to_owned()) @@ -74,7 +76,7 @@ let content_type = props.content_type.clone().unwrap_or(String::from("")); match content_type.as_ref() { -@@ -82,32 +82,26 @@ pub fn build_output(info:bool, deliver:&Deliver, +@@ -82,32 +84,26 @@ pub fn build_output(info:bool, deliver:&Deliver, // convert to bytes Ok(js.to_string().as_bytes().to_owned()) @@ -113,7 +115,7 @@ let mut ret = Object::new(); for (skey, entry) in table { ret.insert(skey.clone().to_string(), entry_to_json(&entry)); -@@ -115,33 +109,35 @@ fn table_to_json(table:&Table) -> Object { +@@ -115,33 +111,35 @@ fn table_to_json(table:&Table) -> Object { ret }