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 CCE7C158094 for ; Fri, 23 Sep 2022 02:15:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14929E0ABB; Fri, 23 Sep 2022 02:15:01 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ECF25E09E8 for ; Fri, 23 Sep 2022 02:15:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 348D7340139 for ; Fri, 23 Sep 2022 02:15:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95C9C5CD for ; Fri, 23 Sep 2022 02:14:58 +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: <1663899216.72df47c7b128fc5e8b7019dee4632ddf9b20ed35.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/files/, net-firewall/iptables/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/iptables/Manifest net-firewall/iptables/files/iptables-1.8.7-cache-double-free.patch net-firewall/iptables/iptables-1.8.7-r2.ebuild X-VCS-Directories: net-firewall/iptables/ net-firewall/iptables/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 72df47c7b128fc5e8b7019dee4632ddf9b20ed35 X-VCS-Branch: master Date: Fri, 23 Sep 2022 02:14:58 +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: d4523524-4a37-4c50-82fe-78fcd260934a X-Archives-Hash: 67adcaecefe5d291ead2ac414d984131 commit: 72df47c7b128fc5e8b7019dee4632ddf9b20ed35 Author: Sam James gentoo org> AuthorDate: Fri Sep 23 02:12:39 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 23 02:13:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72df47c7 net-firewall/iptables: drop 1.8.7-r2 Signed-off-by: Sam James gentoo.org> net-firewall/iptables/Manifest | 1 - .../files/iptables-1.8.7-cache-double-free.patch | 61 ------- net-firewall/iptables/iptables-1.8.7-r2.ebuild | 176 --------------------- 3 files changed, 238 deletions(-) diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest index 76320a6fa208..44c1d5abb450 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -1,2 +1 @@ -DIST iptables-1.8.7.tar.bz2 717862 BLAKE2B fd4dcff142eaadde2a14ce3eb5e45d41c326752553b52900c77fd2e2a20c0685d0a04b95755995e914df47658834d52216d6465c2ae9cd6abc6eb122b95cc976 SHA512 c0a33fafbf1139157a9f52860938ebedc282a1394a68dcbd58981159379eb525919f999b25925f2cb4d6b18089bd99a94b00b3e73cff5cb0a0e47bdff174ed75 DIST iptables-1.8.8.tar.bz2 746985 BLAKE2B 0da021cc7313b86af331768904956dab3eee3de245a7b03965129f3d7f13097fc03fbb1390167dcd971eff216eabad9e59b261a9c0f54bfc48a77453aa40d164 SHA512 f21df23279a77531a23f3fcb1b8f0f8ec0c726bda236dd0e33af74b06753baff6ce3f26fb9fcceb6fada560656ba901e68fc6452eb840ac1b206bc4654950f59 diff --git a/net-firewall/iptables/files/iptables-1.8.7-cache-double-free.patch b/net-firewall/iptables/files/iptables-1.8.7-cache-double-free.patch deleted file mode 100644 index fc88636d2944..000000000000 --- a/net-firewall/iptables/files/iptables-1.8.7-cache-double-free.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit 4318961230bce82958df82b57f1796143bf2f421 -Author: Phil Sutter -Date: Tue Sep 21 11:39:45 2021 +0200 - - nft: cache: Avoid double free of unrecognized base-chains - - On error, nft_cache_add_chain() frees the allocated nft_chain object - along with the nftnl_chain it points at. Fix nftnl_chain_list_cb() to - not free the nftnl_chain again in that case. - - Fixes: 176c92c26bfc9 ("nft: Introduce a dedicated base chain array") - Signed-off-by: Phil Sutter - -diff --git a/iptables/nft-cache.c b/iptables/nft-cache.c -index 2c88301c..9a03bbfb 100644 ---- a/iptables/nft-cache.c -+++ b/iptables/nft-cache.c -@@ -314,9 +314,7 @@ static int nftnl_chain_list_cb(const struct nlmsghdr *nlh, void *data) - goto out; - } - -- if (nft_cache_add_chain(h, t, c)) -- goto out; -- -+ nft_cache_add_chain(h, t, c); - return MNL_CB_OK; - out: - nftnl_chain_free(c); -diff --git a/iptables/tests/shell/testcases/chain/0004extra-base_0 b/iptables/tests/shell/testcases/chain/0004extra-base_0 -new file mode 100755 -index 00000000..1b85b060 ---- /dev/null -+++ b/iptables/tests/shell/testcases/chain/0004extra-base_0 -@@ -0,0 +1,27 @@ -+#!/bin/bash -+ -+case $XT_MULTI in -+*xtables-nft-multi) -+ ;; -+*) -+ echo skip $XT_MULTI -+ exit 0 -+ ;; -+esac -+ -+set -e -+ -+nft -f - </dev/null; then - elog "Current iptables implementation is unset, setting to ${default_iptables}" - eselect iptables set "${default_iptables}" - fi - - if use nftables; then - local tables - for tables in {arp,eb}tables; do - if ! eselect ${tables} show &>/dev/null; then - elog "Current ${tables} implementation is unset, setting to ${default_iptables}" - eselect ${tables} set xtables-nft-multi - fi - done - fi - - eselect iptables show -} - -pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} ]]; then - elog "Unsetting iptables symlinks before removal" - eselect iptables unset - fi - - if ! has_version 'net-firewall/ebtables'; then - elog "Unsetting ebtables symlinks before removal" - eselect ebtables unset - elif [[ -z ${REPLACED_BY_VERSION} ]]; then - elog "Resetting ebtables symlinks to ebtables-legacy" - eselect ebtables set ebtables-legacy - fi - - if ! has_version 'net-firewall/arptables'; then - elog "Unsetting arptables symlinks before removal" - eselect arptables unset - elif [[ -z ${REPLACED_BY_VERSION} ]]; then - elog "Resetting arptables symlinks to arptables-legacy" - eselect arptables set arptables-legacy - fi - - # the eselect module failing should not be fatal - return 0 -}