From nobody Mon Apr 25 14:28:22 2022 X-Original-To: dev-commits-ports-all@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 7ECC619973A4; Mon, 25 Apr 2022 14:28:23 +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 4Kn6nL5hv2z3F5M; Mon, 25 Apr 2022 14:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650896903; 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=h369YodnD/C6cf1ZWsShHAa1pF1D0HGXeMQ95QgBia0=; b=Q694K0KqcgkynwKbfdCDdSlD+7zU90UKpwHfBZgNlRZ6+WZGkxBH1tFb8XFCXp/oeBGpRg xFBqc5xGmHHU17kf8TBEXsd0Lhm/JVzvvVNplVTwzzCfdc7wKWXlWv9CYUmNKqlIjm3jq9 kMw4FlkZzm2KvV5v00HfST+hXrKF+lMAz57oI0YW2AExoTUqQDUVGb2z/05du4FNBg9ydO Qoq0JVfZs+bNuD7zB1gk4wEyPOMbwRZmVWsn6xV4T5KyBeWHe50nDdKf0X+McBdEnvPGgA jNbApdl9LOAVh2YzDwfMK5H7xl00y6nIK08eB11GRnD9sV/is/UgAyeNSq0KhQ== 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 96A1C1C77D; Mon, 25 Apr 2022 14:28:22 +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 23PESMNl033585; Mon, 25 Apr 2022 14:28:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23PESMTG033584; Mon, 25 Apr 2022 14:28:22 GMT (envelope-from git) Date: Mon, 25 Apr 2022 14:28:22 GMT Message-Id: <202204251428.23PESMTG033584@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: 1e2e95f6d6bc - main - net-mgmt/bandwhich: generalize char handling List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 1e2e95f6d6bc5a63c899f0f6e4db8966c1cd3acb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650896903; 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=h369YodnD/C6cf1ZWsShHAa1pF1D0HGXeMQ95QgBia0=; b=E2S75Mx1SDXWrQOQqv780xqyFqwh+agLhFG4W7RMlxBBxkhObT0rEF3z3lU0yI+oqC12Ug PSUEytM+SjFoSNhlvdQRfK9G/qiFgviDwGILi7Sj805YWtSWv6qkxNgPK48xAevPkL89EH gF9Ape76K63YhwJpVOvE4rYSMzSvcfqN504sCN1VY3DlHpMhjKNXVAmf/mWiYp+ncqIyuH yVKhAeE+JrxgUi8coZIGVs2oIrLkZFcjOVJp3UpnHIf+6yVn0ViORYpJvm46xNnn+vJe4D mGCRJeT7t53/Bk2ghDa1/XR3cNlMTRZyM7RBlkPn/L4jNn5rNFXL1afGJgfhEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650896903; a=rsa-sha256; cv=none; b=cXU1sJICnWM+4YKcVZaBxIC6piSKrNmMSDPiscVKF43ZeFvsp4helLlA/t3bAv/dZA32/x prqk/XoMBrvDUBWA3P025XFWswALPQLysh+6uLwASamdwxzsQv8ELcMYD8xB+T7jQvzjxZ 8jTJH9+odr5wFcEM9fpAQ4aDZzto7T5De6PpUglw07Uu49t+IjC7WmqJfZYksAUXr0ESAr m06VuIVSc0wK+6VqN7LFmU2ZQTDmRnOSDlOtoXSsdDWt8abOsQcK2z1zODzTmCQ/QaNzY5 HA8NRPCTt6dhMz70gCy7L/Sgfu6FP7mI+zGt3i60o03qMDxJUYmMGtYfxk/XtQ== 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=1e2e95f6d6bc5a63c899f0f6e4db8966c1cd3acb commit 1e2e95f6d6bc5a63c899f0f6e4db8966c1cd3acb Author: Piotr Kubaj AuthorDate: 2022-04-25 14:12:42 +0000 Commit: Piotr Kubaj CommitDate: 2022-04-25 14:12:42 +0000 net-mgmt/bandwhich: generalize char handling --- net-mgmt/bandwhich/Makefile | 6 ------ ...c_bpf.rs => patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs} | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/net-mgmt/bandwhich/Makefile b/net-mgmt/bandwhich/Makefile index ae014bc5e2cb..3b721e5270b1 100644 --- a/net-mgmt/bandwhich/Makefile +++ b/net-mgmt/bandwhich/Makefile @@ -262,12 +262,6 @@ CARGO_CRATES= adler-0.2.3 \ PLIST_FILES= bin/bandwhich \ man/man1/bandwhich.1.gz -.include - -.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc*} -EXTRA_PATCHES= ${FILESDIR}/extra-patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs -.endif - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bandwhich ${INSTALL_MAN} ${WRKSRC}/docs/bandwhich.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 diff --git a/net-mgmt/bandwhich/files/extra-patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs b/net-mgmt/bandwhich/files/patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs similarity index 90% rename from net-mgmt/bandwhich/files/extra-patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs rename to net-mgmt/bandwhich/files/patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs index 847c2c135bf9..a3543ac3e33a 100644 --- a/net-mgmt/bandwhich/files/extra-patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs +++ b/net-mgmt/bandwhich/files/patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs @@ -5,7 +5,7 @@ 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 u8; ++ iface.ifr_name[i] = c as libc::c_char; } let buflen = config.read_buffer_size as libc::c_uint;