From nobody Wed Jun 08 17:18:08 2022 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 E1E7A8343AA; Wed, 8 Jun 2022 17:18:08 +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 4LJDSw61rlz4pKw; Wed, 8 Jun 2022 17:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654708688; 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=QNgHXuHADFktuaCPD4Ul6DLNvL3OfkKDyNys8SJbe04=; b=oX84BqI/p4/jwGye4P4LDvfhbO7PXhUwthAV5ZdixYm838kCBD7zdMaZjMSkhkZwkXYhb7 x5AoSoDtFaq8sdv7Qs9bka3wZCtKmu7BWql5IeWm1DfafaoA6bl/OdVpZV1Ka9MlG9+136 xgfA9BVGVD3Fozi0VWOnTz7/SQzakiJT6HlC9PfwCBs7gJWYMFKpar10HAW7HWcplnbjmT eltLeAWX7XchNhcH2bM2OqkUFjQXogTbrRNwD8KD795N7OBZaxD0gLV+bPM3VTQVQ+LdLh v6H+z1XUqzfNsPxLI2shhBOi2eejHVIn+3FpNg+lLlpsRUkVE54lpamBp6amcA== 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 AEDEA13C31; Wed, 8 Jun 2022 17:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 258HI8rj003319; Wed, 8 Jun 2022 17:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 258HI8Y6003318; Wed, 8 Jun 2022 17:18:08 GMT (envelope-from git) Date: Wed, 8 Jun 2022 17:18:08 GMT Message-Id: <202206081718.258HI8Y6003318@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 84555099e3ad - main - www/garage: fix build on ARM / POWER 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84555099e3ad01f3d900aa3c611e0f8c4910442d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654708688; 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=QNgHXuHADFktuaCPD4Ul6DLNvL3OfkKDyNys8SJbe04=; b=m2VtdgESd3aP/LHykev0zIsioQXeTXMd6ZWomBDXXReXPEzJiksI+KRFOthY73uO8Hib/q ZTeUkuU8fDmGp+0LaYVR4WUP+J5Y2hO//yra3I+JNI6slvXdX1XrH2ZZ8TGMq77l/rYyUE E0wLUHePcygFZANc3BbZJtxyv4NGeI9bNeIJCHRlXpLoJvmyA+oXLyWcMSqR4L5JgKBCMZ so24c5FTYfUmSLnCK5ttY47USI0OekJMHNL1c+nX7Ek/wM226WtHVvTTuo+pZNHd+t4+pz oB2ppWx1PJF7tgNpXf9hj8gBacIV7glGm7LAGmRbYRxTeJwCDSV+8bDT6X4e9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654708688; a=rsa-sha256; cv=none; b=hx7/O0R1FWhasJt4lHaXDJfZRYCKyBBWlDOeoZOqVsp4wqZdD8FwoP0HT8eXkPe11pgAHe 40yoM73ANascTNV/qgbd9eH4mrQNnS/cFnJFjAdjNS78/CzbJ7IZQh9CpyxPYAxeuV1c7i b2cpVYIcsE0bTotNR7CFLbKfVL+9eX6u2csiTj6+0JGXHFk5oJHmER5DQavL+wmh6ZYSot V1pzggsxuzlWwNc3CPZEB6gzBtI91Jx1/+TMw9ntpm1gxaP5NKvN7MKyFwctLOMuuk+9BM tr16FhNI216sy6paX206M8wEjoyj6aiyz/Y1ciRgXtdhyk7bzQJix4WECc9zuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=84555099e3ad01f3d900aa3c611e0f8c4910442d commit 84555099e3ad01f3d900aa3c611e0f8c4910442d Author: Piotr Kubaj AuthorDate: 2022-06-08 17:17:16 +0000 Commit: Piotr Kubaj CommitDate: 2022-06-08 17:18:06 +0000 www/garage: fix build on ARM / POWER error[E0308]: mismatched types --> /wrkdirs/usr/ports/www/garage/work/garage/cargo-crates/pnet_datalink-0.28.0/src/bpf.rs:133:29 | 133 | iface.ifr_name[i] = c as i8; | ----------------- ^^^^^^^ expected `u8`, found `i8` | | | expected due to the type of this binding --- .../files/patch-cargo-crates_pnet__datalink-0.28.0_src_bpf.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/www/garage/files/patch-cargo-crates_pnet__datalink-0.28.0_src_bpf.rs b/www/garage/files/patch-cargo-crates_pnet__datalink-0.28.0_src_bpf.rs new file mode 100644 index 000000000000..271eea130ae9 --- /dev/null +++ b/www/garage/files/patch-cargo-crates_pnet__datalink-0.28.0_src_bpf.rs @@ -0,0 +1,11 @@ +--- cargo-crates/pnet_datalink-0.28.0/src/bpf.rs.orig 2022-06-08 16:54:23 UTC ++++ cargo-crates/pnet_datalink-0.28.0/src/bpf.rs +@@ -130,7 +130,7 @@ pub fn channel(network_interface: &NetworkInterface, c + } + let mut iface: bpf::ifreq = unsafe { mem::zeroed() }; + for (i, c) in network_interface.name.bytes().enumerate() { +- iface.ifr_name[i] = c as i8; ++ iface.ifr_name[i] = c as libc::c_char; + } + + let buflen = config.read_buffer_size as libc::c_uint;