net-firewall/conntrack-tools: Add patch to be compatible with libnetfilter-conntrack-1.0.9
BUG=b/278834986
TEST=presubmit
RELEASE_NOTE=None
Change-Id: I152219acad5a260bd30dae7f6570abae7e42f596
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/chromiumos-overlay/+/47167
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Chenglong Tang <chenglongtang@google.com>
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r22.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r23.ebuild
similarity index 100%
rename from net-firewall/conntrack-tools/conntrack-tools-1.4.4-r22.ebuild
rename to net-firewall/conntrack-tools/conntrack-tools-1.4.4-r23.ebuild
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.4.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.4.ebuild
index 72562f7..4d2cc58 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.4.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.4.ebuild
@@ -41,6 +41,7 @@
"${FILESDIR}"/${P}-upnp-helper.patch
"${FILESDIR}"/${P}-pktb-memory-leak.patch
"${FILESDIR}"/${P}-rpc.patch
+ "${FILESDIR}"/${P}-libnetfilter-conntrack-1.0.9-compatible.patch
)
src_prepare() {
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-libnetfilter-conntrack-1.0.9-compatible.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-libnetfilter-conntrack-1.0.9-compatible.patch
new file mode 100644
index 0000000..b262379
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-libnetfilter-conntrack-1.0.9-compatible.patch
@@ -0,0 +1,36 @@
+diff --git a/include/helper-old.h b/include/helper.h
+index f412e55..780b931 100644
+--- a/include/helper-old.h
++++ b/include/helper.h
+@@ -76,31 +76,6 @@ enum ip_conntrack_dir {
+ IP_CT_DIR_MAX
+ };
+
+-/* Connection state tracking for netfilter. This is separated from,
+- but required by, the NAT layer; it can also be used by an iptables
+- extension. */
+-enum ip_conntrack_info {
+- /* Part of an established connection (either direction). */
+- IP_CT_ESTABLISHED,
+-
+- /* Like NEW, but related to an existing connection, or ICMP error
+- (in either direction). */
+- IP_CT_RELATED,
+-
+- /* Started a new connection to track (only
+- IP_CT_DIR_ORIGINAL); may be a retransmission. */
+- IP_CT_NEW,
+-
+- /* >= this indicates reply direction */
+- IP_CT_IS_REPLY,
+-
+- IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY,
+- IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY,
+- IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY,
+- /* Number of distinct IP_CT types (no NEW in reply dirn). */
+- IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1
+-};
+-
+ #define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL)
+
+ #if 0
