Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00
Code Issues Wiki Activity

main/libnetfilter_conntrack: upgrade to 1.1.0

Browse source 
https://www.netfilter.org/projects/libnetfilter_conntrack/files/changes-libnetfilter_conntrack-1.1.0.txt
This commit is contained in:
fossdd 2025-05-28 18:17:56 +00:00 • committed by Natanael Copa
parent 1ac8fa53cc
commit fdd0e90c12
2 changed files with 4 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

11
main/libnetfilter_conntrack/APKBUILD
View file

@ -1,16 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libnetfilter_conntrack pkgname=libnetfilter_conntrack
pkgver=1.0.9 pkgver=1.1.0
pkgrel=3 pkgrel=0
pkgdesc="programming interface (API) to the in-kernel connection tracking state table" pkgdesc="programming interface (API) to the in-kernel connection tracking state table"
url="https://www.netfilter.org/projects/libnetfilter_conntrack/" url="https://www.netfilter.org/projects/libnetfilter_conntrack/"
arch="all" arch="all"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
makedepends="linux-headers libnfnetlink-dev libmnl-dev" makedepends="linux-headers libnfnetlink-dev libmnl-dev"
subpackages="$pkgname-static $pkgname-dev" subpackages="$pkgname-static $pkgname-dev"
source="https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-$pkgver.tar.bz2 source="https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-$pkgver.tar.xz"
fix_build_with_kernel_5.15_and_musl.patch
"
prepare() { prepare() {
default_prepare default_prepare
@ -38,6 +36,5 @@ package() {
} }
sha512sums=" sha512sums="
e8b03425aaba3b72e6034c215656c34176d0550c08e0455aaeb1365d9141505d0c4feaa8978c8ccf2b7af9db6c9e874ceb866347e533b41cb03a189884f4004c libnetfilter_conntrack-1.0.9.tar.bz2 5435f45b61e4e13b63b4a39f0c34fb0b59d2eed1e5dc182bc91369b72df54f5a555c111223f4f4a786a2c47dd5c6efd97205b8dca2f522e28d9d54035f928882 libnetfilter_conntrack-1.1.0.tar.xz
1a93a36cf5cb89cec08e6e2476bf8d6fc68e9608f55e370418ed6a87e369545bdff1050e810aab2d5a9706f9559b3c1c48c404d954b2d01b84dbd68bae063450 fix_build_with_kernel_5.15_and_musl.patch
" "

56
main/libnetfilter_conntrack/fix_build_with_kernel_5.15_and_musl.patch
View file

@ -1,56 +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: [PATCH] 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(-)
diff --git a/include/internal/internal.h b/include/internal/internal.h
index 2ef8a90..7cd7c44 100644
--- 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>
diff --git a/include/internal/proto.h b/include/internal/proto.h
index 40e7bfe..60a5f4e 100644
--- 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>
--
2.37.1