gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-10 12:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

jool: update to 4.1.13

Browse Source 
* update jool to 4.1.13
* refresh patch

Changelog: https://github.com/NICMx/Jool/releases/tag/v4.1.13

Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
This commit is contained in:
Goetz Goerisch
2024-09-05 13:11:00 +02:00
committed by Rosen Penev
parent c703510a3c
commit 7f29b5b7a1
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/jool/Makefile
View File

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=jool
PKG_VERSION:=4.1.12
PKG_VERSION:=4.1.13
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0-only
@@ -16,8 +16,8 @@ PKG_LICENSE_FILES:=COPYING
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/NICMx/Jool.git
PKG_SOURCE_VERSION:=8d2edffe40fc9ebcb558e88e66662ee813e00b5c
PKG_MIRROR_HASH:=5f4729aeca0a5895b15a9d77ec52b4c9efdffeb25926e3a7eff36ffa6a9b1a14
PKG_SOURCE_VERSION:=39ca69f8717a83733548bea3b7bfad2a4799572a
PKG_MIRROR_HASH:=f00592d639f34bc6c38e9d012d59a694b159a57ada1b86985cd4df38e4f85d5f
PKG_BUILD_DIR=$(KERNEL_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_BUILD_PARALLEL:=1

23
net/jool/patches/100-fix-compilation-warning-simple-fix.patch
View File

@@ -1,36 +1,21 @@
--- a/src/mod/common/skbuff.c
+++ b/src/mod/common/skbuff.c
@@ -109,9 +109,9 @@ static void print_skb_fields(struct sk_b
print(tabs, "network_header:%u", skb->network_header);
print(tabs, "mac_header:%u", skb->mac_header);
print(tabs, "head:%p", skb->head);
- print(tabs, "data:%ld", skb->data - skb->head);
- print(tabs, "tail:%u", skb->tail);
- print(tabs, "end:%u", skb->end);
+ print(tabs, "data:%ld", (long int)(skb->data - skb->head));
+ print(tabs, "tail:%u", (unsigned int)skb->tail);
+ print(tabs, "end:%u", (unsigned int)skb->end);
}
static int truncated(unsigned int tabs)
--- a/src/mod/common/xlator.c
+++ b/src/mod/common/xlator.c
@@ -890,7 +890,7 @@ void xlator_put(struct xlator *jool)
@@ -891,7 +891,7 @@ void xlator_put(struct xlator *jool)
static bool offset_equals(struct instance_entry_usr *offset,
struct jool_instance *instance)
{
- return (offset->ns == ((__u64)instance->jool.ns & 0xFFFFFFFF))
- return (offset->ns == ((PTR_AS_UINT_TYPE)instance->jool.ns & 0xFFFFFFFF))
+ return (offset->ns == ((uintptr_t)instance->jool.ns & 0xFFFFFFFF))
&& (strcmp(offset->iname, instance->jool.iname) == 0);
}
--- a/src/mod/common/nl/instance.c
+++ b/src/mod/common/nl/instance.c
@@ -37,7 +37,7 @@ static int serialize_instance(struct xla
@@ -38,7 +38,7 @@ static int serialize_instance(struct xla
if (!root)
return 1;
- error = nla_put_u32(skb, JNLAIE_NS, ((__u64)entry->ns) & 0xFFFFFFFF);
- error = nla_put_u32(skb, JNLAIE_NS, ((PTR_AS_UINT_TYPE)entry->ns) & 0xFFFFFFFF);
+ error = nla_put_u32(skb, JNLAIE_NS, ((uintptr_t)entry->ns) & 0xFFFFFFFF);
if (error)
goto cancel;