From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06FBD158086 for ; Thu, 16 Dec 2021 22:37:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 579FEE0826; Thu, 16 Dec 2021 22:37:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43AC1E0826 for ; Thu, 16 Dec 2021 22:37:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F3EB34341B for ; Thu, 16 Dec 2021 22:37:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05FB421D for ; Thu, 16 Dec 2021 22:37:08 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1639694220.47dba6226b616c192fd3fb9d0f37ec2945498f60.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/files/, net-firewall/ipt_netflow/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild X-VCS-Directories: net-firewall/ipt_netflow/ net-firewall/ipt_netflow/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 47dba6226b616c192fd3fb9d0f37ec2945498f60 X-VCS-Branch: master Date: Thu, 16 Dec 2021 22:37:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b0716980-583c-44c7-b8a3-075fe68d0609 X-Archives-Hash: 175deb282c57534184af018227f89d90 commit: 47dba6226b616c192fd3fb9d0f37ec2945498f60 Author: Sam James gentoo org> AuthorDate: Thu Dec 16 22:36:56 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 16 22:37:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dba622 net-firewall/ipt_netflow: fix build with linux-headers-5.14 Closes: https://bugs.gentoo.org/813993 Signed-off-by: Sam James gentoo.org> .../ipt_netflow-2.6-fix-linux-headers-5.14.patch | 29 ++++++++++++++++++++++ net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild | 2 ++ 2 files changed, 31 insertions(+) diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch new file mode 100644 index 000000000000..0f52b68d5235 --- /dev/null +++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch @@ -0,0 +1,29 @@ +https://github.com/aabc/ipt-netflow/commit/66e4304101010108892376866334ec9317b427d8.patch +https://bugs.gentoo.org/813993 + +From: ABC +Date: Wed, 14 Jul 2021 15:39:42 +0300 +Subject: [PATCH] Namespace sk_error_report + +sk_error_report is introduced in v5.14-rc1: e3ae2365efc14 ("net: sock: +introduce sk_error_report"). +--- a/ipt_NETFLOW.c ++++ b/ipt_NETFLOW.c +@@ -1943,7 +1943,7 @@ static struct ctl_path netflow_sysctl_path[] = { + #endif /* CONFIG_SYSCTL */ + + /* socket code */ +-static void sk_error_report(struct sock *sk) ++static void netflow_sk_error_report(struct sock *sk) + { + struct ipt_netflow_sock *usock; + +@@ -1974,7 +1974,7 @@ static struct socket *usock_open_sock(struct ipt_netflow_sock *usock) + } + sock->sk->sk_allocation = GFP_ATOMIC; + sock->sk->sk_prot->unhash(sock->sk); /* hidden from input */ +- sock->sk->sk_error_report = &sk_error_report; /* clear ECONNREFUSED */ ++ sock->sk->sk_error_report = &netflow_sk_error_report; /* clear ECONNREFUSED */ + sock->sk->sk_user_data = usock; + sock->sk->sk_reuse = SK_CAN_REUSE; + diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild index 35009fb8ac17..4665d475be3d 100644 --- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild +++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild @@ -32,6 +32,8 @@ PATCHES=( "${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984 "${FILESDIR}/${PN}-2.6-gentoo.patch" "${FILESDIR}/${P}-ref_module_fix.patch" # bug #781014 + "${FILESDIR}/${P}-fix-linux-headers-5.14.patch" # bug #813993 + ) pkg_setup() {