Skip to content

libnftnl: upgrade 1.1.4 -> 1.1.5 #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
t-cun wants to merge 1 commit into from
Closed

libnftnl: upgrade 1.1.4 -> 1.1.5 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
294 changes: 0 additions & 294 deletions ...working/recipes-filter/libnftnl/libnftnl/0001-Move-exports-before-symbol-definition.patch
View file
Open in desktop

This file was deleted.

19 changes: 16 additions & 3 deletions ...al-function-as-one-of-printf-family.patch → ...al-function-as-one-of-printf-family.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 373e13e28e34b4d415fc096e1c7175f4ecfbf0da Mon Sep 17 00:00:00 2001
From: Yuan Chao <[email protected].com>
Date: Wed, 21 Aug 2019 11:18:56 +0900
From e03b003610a176d608da9a02e433e7ded7e4b75f Mon Sep 17 00:00:00 2001
From: Todd Cunningham <tcunningham07@gmail.com>
Date: Wed, 11 Dec 2019 10:18:56 +1000
Subject: [PATCH] avoid naming local function as one of printf family

Fixes build issues with clang
Expand All @@ -10,6 +10,7 @@ Signed-off-by: Khem Raj <[email protected]>
Signed-off-by: Alex Kiernan <[email protected]>

Signed-off-by: Yuan Chao <[email protected]>
Signed-off-by: Todd Cunningham <[email protected]>
---
include/expr_ops.h | 2 +-
include/obj.h | 2 +-
Expand Down Expand Up @@ -58,6 +59,7 @@ Signed-off-by: Yuan Chao <[email protected]>
src/obj/limit.c | 2 +-
src/obj/quota.c | 2 +-
src/obj/secmark.c | 2 +-
src/obj/synproxy.c | 2 +-
src/obj/tunnel.c | 2 +-
src/object.c | 2 +-
49 files changed, 50 insertions(+), 50 deletions(-)
Expand Down Expand Up @@ -613,6 +615,17 @@ index d8c87ee..5307d7e 100644
obj);
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
diff --git a/src/obj/synproxy.c b/src/obj/synproxy.c
index 56ebc85..6b5380f 100644
--- a/src/obj/synproxy.c
+++ b/src/obj/synproxy.c
@@ -157,5 +157,5 @@ struct obj_ops obj_ops_synproxy = {
.get = nftnl_obj_synproxy_get,
.parse = nftnl_obj_synproxy_parse,
.build = nftnl_obj_synproxy_build,
- .snprintf = nftnl_obj_synproxy_snprintf,
+ .snprintf_ = nftnl_obj_synproxy_snprintf,
};
--
2.17.1

5 changes: 2 additions & 3 deletions ...recipes-filter/libnftnl/libnftnl_1.1.4.bb → ...recipes-filter/libnftnl/libnftnl_1.1.5.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26"
SECTION = "libs"
DEPENDS = "libmnl"

SRCREV = "7c19dc01a88dbcf9a45fa791cd27a51b563bcf29"
SRCREV = "a71599dc0ae1a808e970e96850ea83d77f452994"
SRC_URI = "git://git.netfilter.org/libnftnl \
file://0001-Move-exports-before-symbol-definition.patch \
file://0002-avoid-naming-local-function-as-one-of-printf-family.patch \
file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \
"

S = "${WORKDIR}/git"
Expand Down