1
0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-23 16:17:36 +02:00
Commit Graph

29 Commits

Author SHA1 Message Date
Tiago Gaspar
26bf35bb43 jool: update package to version 4.1.10
Update jool to version 4.1.10 and remove a no longer needed patch.
There was also a need to backport a patch to fix compile in some archs.

Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
2023-09-02 16:50:16 +02:00
Christian Marangi
89731e6f4d
jool: fix compilation warning
Add patch fixing compilation warning due to wrong cast.
Fix compilation warning:
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/xlator.c: In function 'offset_equals':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/xlator.c:878:32: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  878 |         return (offset->ns == ((__u64)instance->jool.ns & 0xFFFFFFFF))
      |                                ^
cc1: all warnings being treated as errors

In file included from ./include/linux/kernel.h:19,
                 from ./include/linux/skbuff.h:13,
                 from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/../../mod/common/skbuff.h:4,
                 from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:1:
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c: In function 'print_skb_fields':
./include/linux/kern_levels.h:5:25: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'int' [-Werror=format=]
    5 | #define KERN_SOH        "\001"          /* ASCII Start Of Header */
      |                         ^~~~~~
./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap'
  422 |                 _p_func(_fmt, ##__VA_ARGS__);                           \
      |                         ^~~~
./include/linux/printk.h:535:9: note: in expansion of macro 'printk'
  535 |         printk(KERN_CONT fmt, ##__VA_ARGS__)
      |         ^~~~~~
./include/linux/kern_levels.h:24:25: note: in expansion of macro 'KERN_SOH'
   24 | #define KERN_CONT       KERN_SOH "c"
      |                         ^~~~~~~~
./include/linux/printk.h:535:16: note: in expansion of macro 'KERN_CONT'
  535 |         printk(KERN_CONT fmt, ##__VA_ARGS__)
      |                ^~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:38:17: note: in expansion of macro 'pr_cont'
   38 |                 pr_cont(text "\n", ##__VA_ARGS__); \
      |                 ^~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:112:9: note: in expansion of macro 'print'
  112 |         print(tabs, "data:%ld", skb->data - skb->head);
      |         ^~~~~
./include/linux/kern_levels.h:5:25: error: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'sk_buff_data_t' {aka 'unsigned char *'} [-Werror=format=]
    5 | #define KERN_SOH        "\001"          /* ASCII Start Of Header */
      |                         ^~~~~~
./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap'
  422 |                 _p_func(_fmt, ##__VA_ARGS__);                           \
      |                         ^~~~
./include/linux/printk.h:535:9: note: in expansion of macro 'printk'
  535 |         printk(KERN_CONT fmt, ##__VA_ARGS__)
      |         ^~~~~~
./include/linux/kern_levels.h:24:25: note: in expansion of macro 'KERN_SOH'
   24 | #define KERN_CONT       KERN_SOH "c"
      |                         ^~~~~~~~
./include/linux/printk.h:535:16: note: in expansion of macro 'KERN_CONT'
  535 |         printk(KERN_CONT fmt, ##__VA_ARGS__)
      |                ^~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:38:17: note: in expansion of macro 'pr_cont'
   38 |                 pr_cont(text "\n", ##__VA_ARGS__); \
      |                 ^~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:113:9: note: in expansion of macro 'print'
  113 |         print(tabs, "tail:%u", skb->tail);
      |         ^~~~~
./include/linux/kern_levels.h:5:25: error: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'sk_buff_data_t' {aka 'unsigned char *'} [-Werror=format=]
    5 | #define KERN_SOH        "\001"          /* ASCII Start Of Header */
      |                         ^~~~~~
./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap'
  422 |                 _p_func(_fmt, ##__VA_ARGS__);                           \
      |                         ^~~~
./include/linux/printk.h:535:9: note: in expansion of macro 'printk'
  535 |         printk(KERN_CONT fmt, ##__VA_ARGS__)
      |         ^~~~~~
./include/linux/kern_levels.h:24:25: note: in expansion of macro 'KERN_SOH'
   24 | #define KERN_CONT       KERN_SOH "c"
      |                         ^~~~~~~~
./include/linux/printk.h:535:16: note: in expansion of macro 'KERN_CONT'
  535 |         printk(KERN_CONT fmt, ##__VA_ARGS__)
      |                ^~~~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:38:17: note: in expansion of macro 'pr_cont'
   38 |                 pr_cont(text "\n", ##__VA_ARGS__); \
      |                 ^~~~~~~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:114:9: note: in expansion of macro 'print'
  114 |         print(tabs, "end:%u", skb->end);
      |         ^~~~~
cc1: all warnings being treated as errors

/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/nl/instance.c: In function 'serialize_instance':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/nl/instance.c:40:46: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
   40 |         error = nla_put_u32(skb, JNLAIE_NS, ((__u64)entry->ns) & 0xFFFFFFFF);
      |                                              ^
cc1: all warnings being treated as errors

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2023-05-15 00:30:17 +02:00
Paul Fertser
0c10c224be treewide: remove AUTORELEASE
Automatically compute and substitute current values for all
$(AUTORELEASE) instances as this feature is deprecated and shouldn't be
used.

The following temporary change was made to the core:

diff --git a/rules.mk b/rules.mk
index 57d7995d4fa8..f16367de87a8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -429,7 +429,7 @@ endef
 abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1))))

 COMMITCOUNT = $(if $(DUMP),0,$(call commitcount))
-AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1))
+AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile))

 all:
 FORCE: ;

And this command used to fix affected packages:

for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \
                              sed 's^.*/\([^/]*\)/Makefile^\1^';);
do
  make package/$i/download
done

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
2023-04-21 22:46:58 +02:00
Tiago Gaspar
1dd0c8bfbb jool: update to 4.1.8
Update jool to the latest version.

 Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
2022-03-29 06:00:24 -07:00
Tiago Gaspar
5482b98940 jool: update default config
Update the default configuration files to match the upstream example
ones.


Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
2022-02-10 19:32:38 -08:00
Tiago Gaspar
28ac3a6997 jool: remove iptables support and update templates
This commit removes iptables backend support and leaves only the
netfilter backend support. This means that:
-  iptables and nftables firewall based systems (firewall3 and firewall
4) are supported trough the netfilter instance mode
-  the iptables/xtables mode support is disabled

For more information on the modes and how to use the new netfilter
instance checkout https://www.jool.mx/en/intro-jool.html

This move is made out of the commit upstream that sets firewall4 as the
default for new default buils and based on the conversation in #16818
and was decided that the netfilter interface is the priority since
iptables support will be dropped in the foreseeable future.

While at it update the templates provided.

Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
2022-01-21 18:57:02 -08:00
Tiago Gaspar
98ac608fb8 jool: update to 4.1.6, add init files and default configuration
This commit adds support for starting and running jool through init
scripts, with default config files as examples.

Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
2022-01-12 04:00:30 -08:00
Ondřej Caletka
0c044284b7 jool: Update to 4.1.5
Compile and run tested on: mvebu (Turris Omnia)

Signed-off-by: Ondřej Caletka <ondrej@caletka.cz>
2021-04-04 19:06:05 -07:00
Rosen Penev
cdaf0a8b3d jool: update to 4.1.4
Added BUILDONLY to eliminate warning.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-10-14 19:46:08 -07:00
David Bauer
df891a50c5 jool: downgrade to v4.0.9
Jool v4.1.0 suffers from bad offload management as well as broken
stateful NAT64 translation. See upstream issues #331 as well as #332 for
more information.

Downgrade to v4.0.9 until these are ironed out.

Tested on: ipq40xx-generic

Fixes commit 0a6891feac ("jool: update to v4.1.0")
Signed-off-by: David Bauer <mail@david-bauer.net>
2020-06-28 15:12:47 +02:00
David Bauer
0a6891feac jool: update to v4.1.0
Compile-tested: ipq40xx-generic
Run-tested: ipq40xx-generic

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-06-26 02:39:58 +02:00
David Bauer
f494e37d15 jool: update to 4.0.8
Fixes issues with big-endian systems (e.g. ath79).

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-04-02 01:18:07 +02:00
David Bauer
a9ebaa07da jool: replace SUBDIRS with M in package recipe
The SUBDIRS variable has been removed in kernel 5.4, and was deprecated
since the beginnig of kernel git history in favour of M or KBUILD_EXTMOD.

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-03-11 00:49:04 +01:00
Rosen Penev
11fa1572e3 jool: update to 4.0.7
Adds support for kernel 5.4

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-03-06 18:16:58 +01:00
David Bauer
a1a8f74368 jool: compile common module first
Compile the common module first, as otherwise the dependency on the
jool-common module is not detected.

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-02-19 00:57:02 +01:00
David Bauer
770ae84245 jool: increment PKG_RELEASE
Fixes 1a85f72e51

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-02-13 10:15:14 +01:00
David Bauer
1a85f72e51 jool: package missing components
Jool as well as the jool-siit package depend on jool-common, which isn't
currently built nur packages up. Compile and include jool-common with
the jool package to fix this.

The iptables component is currently also not packaged up. Fix this also.

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-02-12 21:52:05 +01:00
Rosen Penev
526b384503
jool: Remove ethtool dependency
Unneeded since jool 4.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-11-12 20:13:56 -08:00
Tiago Gaspar
e64cac5d7b jool: Update to 4.0.6
Update jool to te latest stable version (4.0.6).

Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
2019-11-06 17:00:22 +00:00
Rosen Penev
cae9da4d26 jool: Update to 4.0.5
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-10-01 18:40:39 -07:00
Dan Lüdtke
0d337e9d71 jool: Remove inactive maintainer
Signed-off-by: Dan Lüdtke <mail@danrl.com>
2018-11-10 13:58:10 +01:00
Rosen Penev
4f28139a3c jool: Backport two fixes for newer kernels.
The first is needed for 4.14 (maybe the relevant parts got packported and
the second is for when OpenWrt migrates to 4.19.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-10-11 10:58:35 -07:00
Rosen Penev
8cd3a6c295 jool: Update to 3.5.7 and switch to tarballs
Should be faster.

Rearranged Makefile slightly for consistency with other packages.

Version 3.5.6 and above are relicensed to GPL-2.0.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-09-17 23:53:44 -07:00
Matthias Schiffer
a331af8d5b
jool: update to latest git version
Fixes build against kernel 4.14.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2018-02-22 00:36:11 +01:00
Matthias Schiffer
dfd652ff3b
jool: fix PKG_BUILD_DIR to avoid kernel ABI mismatch
As jool builds a kernel module, a PKG_BUILD_DIR under KERNEL_BUILD_DIR must
be used to avoid reusing build artifacts when switching to a different
target of the same architecture. Otherwise, kernel ABI mismatches may
result, leading to an unusuable module, or build failures like the
following:

    Package kmod-jool is missing dependencies for the following libraries:
    crypto_hash.ko

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2017-10-29 18:36:59 +01:00
Etienne Champetier
4006865ae8 treewide: run "make check FIXUP=1"
fix Makefile chmod (644)
replace MD5SUM with HASH
add PKG_MIRROR_HASH when PKG_SOURCE_PROTO:=git

(PKG_SOURCE_PROTO:=svn tarballs are not reproducible for now)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-08-29 21:41:14 -07:00
danrl
abbea73a28 jool: update to upstream version 3.5.3
Signed-off-by: Dan Luedtke <mail@danrl.com>
2017-03-11 14:38:25 +01:00
danrl
0510753c25 jool: version bump (fixes #3657)
Latest upstream changes explicitly include `net/ip6_checksum.h`.
Fixes issue #3657.

Signed-off-by: Dan Luedtke <mail@danrl.com>
2016-12-17 02:45:39 -06:00
danrl
95a9364f05 jool: added support for Jool SIIT/NAT64
This adds support for the Jool SIIT/NAT64 translating kernel modules and user
space tools.

Signed-off-by: Dan Luedtke <mail@danrl.com>
2016-12-14 19:36:08 +01:00