From: Ian Ladd <ianwladd@gmail.com>
Date: Wed, 2 Jul 2025 14:54:47 +0000 (-0400)
Subject: libnetfilter-conntrack: bump to 1.1.0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a41c63eb59f4ba585aeb156cf6b7d8583d49e82;p=thirdparty%2Fopenwrt.git

libnetfilter-conntrack: bump to 1.1.0

Updates libnetfilter-conntrack to version 1.1.0.
Removes patches which should no longer be needed according to changelog for
libnetfilter-conntrack 1.1.0

Signed-off-by: Ian Ladd <ianwladd@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19282
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/package/libs/libnetfilter-conntrack/Makefile b/package/libs/libnetfilter-conntrack/Makefile
index 97197b4a619..d1782d460ee 100644
--- a/package/libs/libnetfilter-conntrack/Makefile
+++ b/package/libs/libnetfilter-conntrack/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2013 OpenWrt.org
+# Copyright (C) 2009-2025 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnetfilter_conntrack
-PKG_VERSION:=1.0.9
-PKG_RELEASE:=2
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.netfilter.org/projects/libnetfilter_conntrack/files
-PKG_HASH:=67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8
+PKG_HASH:=67edcb4eb826c2f8dc98af08dabff68f3b3d0fe6fb7d9d0ac1ee7ecce0fe694e
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0-or-later
diff --git a/package/libs/libnetfilter-conntrack/patches/0001-conntrack-fix-build-with-kernel-5_15-and-musl.patch b/package/libs/libnetfilter-conntrack/patches/0001-conntrack-fix-build-with-kernel-5_15-and-musl.patch
deleted file mode 100644
index d04f4b5e425..00000000000
--- a/package/libs/libnetfilter-conntrack/patches/0001-conntrack-fix-build-with-kernel-5_15-and-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robimarko@gmail.com>
-Date: Thu, 24 Feb 2022 15:01:11 +0100
-Subject: conntrack: fix build with kernel 5.15 and musl
-
-Currently, with kernel 5.15 headers and musl building is failing with
-redefinition errors due to a conflict between the kernel and musl headers.
-
-Musl is able to suppres the conflicting kernel header definitions if they
-are included after the standard libc ones, however since ICMP definitions
-were moved into a separate internal header to avoid duplication this has
-stopped working and is breaking the builds.
-
-It seems that the issue is that <netinet/in.h> which contains the UAPI
-suppression defines is included in the internal.h header and not in the
-proto.h which actually includes the kernel ICMP headers and thus UAPI
-supression defines are not present.
-
-Solve this by moving the <netinet/in.h> include before the ICMP kernel
-includes in the proto.h
-
-Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file")
-Signed-off-by: Robert Marko <robimarko@gmail.com>
-Signed-off-by: Florian Westphal <fw@strlen.de>
----
- include/internal/internal.h | 1 -
- include/internal/proto.h    | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
---- a/include/internal/internal.h
-+++ b/include/internal/internal.h
-@@ -14,7 +14,6 @@
- #include <arpa/inet.h>
- #include <time.h>
- #include <errno.h>
--#include <netinet/in.h>
- 
- #include <libnfnetlink/libnfnetlink.h>
- #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
---- a/include/internal/proto.h
-+++ b/include/internal/proto.h
-@@ -2,6 +2,7 @@
- #define _NFCT_PROTO_H_
- 
- #include <stdint.h>
-+#include <netinet/in.h>
- #include <linux/icmp.h>
- #include <linux/icmpv6.h>
-