From nobody Wed Aug 31 13:42:16 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 4MHlj46cf3z4bRY8; Wed, 31 Aug 2022 13:42:16 +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 4MHlj46CC7z3lXG; Wed, 31 Aug 2022 13:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661953336; 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=xQFZk4RzzNQ/rZ8+dgMlPwI7Z6UAkNibPOHAubamrew=; b=xq09hdTdAQwy3+aOs/x2gTBDntploD/Ndw+nGABesXBNT17WpG9Q6O3UyL6fVsDqVGiUe0 xcBzfqMmNrgKX5s9NgqMio+9gqqz0V56gfzvQggROcKlS+iBl8LU9LO90KY406ulYwlvGL VkdHItk9gR0WGmvSbITUZdP8zJQAHNL/L+cu+oCBhML2pKgnsiSb8c5Cixik9kwdqatnXp GhDTghwPdEY/GwjwxTXyjwzQdQ+kWfUYOelDoBsEIuAWJBK+z0EuZq3bPbrW1G0kVfmcXS polZMlLWudfivyXFKfBMUAFHGdK5HY/xDfXa+N1La5FAgRoUz74jkBZgbqRsKg== 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 4MHlj4528cz18HL; Wed, 31 Aug 2022 13:42:16 +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 27VDgGPe051205; Wed, 31 Aug 2022 13:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27VDgG2i051204; Wed, 31 Aug 2022 13:42:16 GMT (envelope-from git) Date: Wed, 31 Aug 2022 13:42:16 GMT Message-Id: <202208311342.27VDgG2i051204@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 96703d221628 - main - net-mgmt/ipacctd: use PF_DIVERT on FreeBSD 14 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: glebius X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96703d22162836130ce696d99faa2a451db2b592 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661953336; 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=xQFZk4RzzNQ/rZ8+dgMlPwI7Z6UAkNibPOHAubamrew=; b=ZCE9/FLdbEGfWPMKfnvEujQsE0ncihyF3wngZNMHMh7K0Yn2oS5pnafKLdEWyd4IVO/WCx FFpLZhtRFXvOePclKY9R2pp0Lu8tTqMd1rm+DawtybJ8sA9RCcjYpZ0F1gTTtJs5NALGTN JCjpwYAO83z+NUJwADTUNYq31/k55iU+ECgBx88EkgaOoY6ZcUhZeU7FWUEyQvr+oOJJt3 dVM7hv0FXUb6JvMgLiAB9iT7e30YlOYhuNgR81hRZomcZn0m/M3jYipTWJUXK2kx6V1Zaj jGfRWes3FnGjJyldnsW1NkgQ0PVNyO8hl4BX3wnosvwhr2sDBAFUyBXAffqlUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661953336; a=rsa-sha256; cv=none; b=uSP97TCgts0i4g1uwFZlIql4BjgpuYB6JwSCk2uTErRc6qlT3il9vpTspccz16fswPiULN CIEGwF21xzVHsLsS4DTTFXhroF4YVhGFbrYfITxobSYPUKPOnfWZw95LzO5VbiF0zZ81bg mDkTmDhsxs5pBx9ov7UpUJPbwS/BZvMkz7Y3yuz96UTRX3BBDlbaIq/SyrfTeT89WCGYKp LKhdxEYw2lIsVeKvY39XB14w1+Pjv3oPt2jndoDqD+cOsbjywwqEr16CdXAMF+1YJlILg2 GyFlpOYdyCqCE50QaOhRQf9pJvJkzZFkTKgRpx6vhvuRGiv8zyxOAu4uw9sw7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=96703d22162836130ce696d99faa2a451db2b592 commit 96703d22162836130ce696d99faa2a451db2b592 Author: Gleb Smirnoff AuthorDate: 2022-08-31 13:41:53 +0000 Commit: Gleb Smirnoff CommitDate: 2022-08-31 13:41:53 +0000 net-mgmt/ipacctd: use PF_DIVERT on FreeBSD 14 to avoid runtime warning. Approved by: mikael --- net-mgmt/ipacctd/Makefile | 1 + net-mgmt/ipacctd/files/patch-src_ipacctd.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/net-mgmt/ipacctd/Makefile b/net-mgmt/ipacctd/Makefile index 4675469a1dc2..42dc70c29457 100644 --- a/net-mgmt/ipacctd/Makefile +++ b/net-mgmt/ipacctd/Makefile @@ -1,5 +1,6 @@ PORTNAME= ipacctd PORTVERSION= 1.47 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/skv diff --git a/net-mgmt/ipacctd/files/patch-src_ipacctd.c b/net-mgmt/ipacctd/files/patch-src_ipacctd.c new file mode 100644 index 000000000000..8fd8c9e490d5 --- /dev/null +++ b/net-mgmt/ipacctd/files/patch-src_ipacctd.c @@ -0,0 +1,14 @@ +--- src/ipacctd.c.orig 2022-08-30 21:59:34 UTC ++++ src/ipacctd.c +@@ -232,7 +232,11 @@ + + ds.sin_family = AF_INET; + ++#ifdef PF_DIVERT ++ if ((spkt = socket(PF_DIVERT, SOCK_RAW, 0)) == -1) ++#else + if ((spkt = socket(PF_INET, SOCK_RAW, IPPROTO_DIVERT)) == -1) ++#endif + err(1, "socket(IP_DIVERT)"); + + if ((bind(spkt, (struct sockaddr *)&ds, sizeof(ds))) == -1)