diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
| commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
| tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /net-vpn/wireguard-modules | |
| parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) | |
gentoo resync : 25.04.2020
Diffstat (limited to 'net-vpn/wireguard-modules')
| -rw-r--r-- | net-vpn/wireguard-modules/Manifest | 5 | ||||
| -rw-r--r-- | net-vpn/wireguard-modules/files/wireguard-modules-1.0.20200413-sch_generic-header.patch | 26 | ||||
| -rw-r--r-- | net-vpn/wireguard-modules/wireguard-modules-1.0.20200413.ebuild (renamed from net-vpn/wireguard-modules/wireguard-modules-1.0.20200401.ebuild) | 2 |
3 files changed, 31 insertions, 2 deletions
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest index d6aae41f903b..dd8fa42b1b4e 100644 --- a/net-vpn/wireguard-modules/Manifest +++ b/net-vpn/wireguard-modules/Manifest @@ -1,4 +1,5 @@ -DIST wireguard-linux-compat-1.0.20200401.tar.xz 261000 BLAKE2B 8f2d2b775707efd2611c2b956c96fcb3a14884b78716629a5f572ca179279cca698ea0dff2e7f332780d8f667d391b37553fa41b22cf71a47269b5a879202410 SHA512 894da609c7102eb1d076a4a7bdaa96c7d5f0d64b4b86fdf01068ac5f4af966652e7ad7f18b1295a7fc4447f53b55a9ec45f1b3f36f0f9df7fb08836dfdff89f0 -EBUILD wireguard-modules-1.0.20200401.ebuild 3442 BLAKE2B 81c97ff68c71ce60d343266035852d2128246a3aa1c4ca95d0847904c021c5e4a7bb652d8c531e50be1dcc430fa34e54682462595101fded003af71e97e037e6 SHA512 1979d83d24156acf594edfc23c76e8e30e9a21ef9cd3fd45a06462ba20a30a9c90618852a611793af53424a52e0486a93d9198e18f89b7c57f9e8e06b434c9d5 +AUX wireguard-modules-1.0.20200413-sch_generic-header.patch 860 BLAKE2B a3eb14274fd7c9a2d4e04aedb17f6fb87711b4c0d092651137f9b5a1c7aff43894a3a2de88ece6da18c8638a870128d9c61eb5f1fc5b7c9c40d150a95ff046d9 SHA512 2824c822f94c15644b990b1a8c7a9fbe6e752556736eb47e6330a11e7d4bdd1077d922dd41e0f63ef519f427653497014154c1074bd1bfb564fcaeb0ec0b4f6c +DIST wireguard-linux-compat-1.0.20200413.tar.xz 261480 BLAKE2B 4a6e6571ba6e0285b08bb8b08b041cef02fdab99b516dd8717acf0f4cf86308382ed7b4f7333c5a97bd338aa973df83a7c8acd41c7022242700ec8db60f3aa64 SHA512 1df6802bf7bbae9292479b36a0ab54fc486ec0aa97e3c507634e4459b55f6755995ae73758ab169ed279e5d5dcf32bf3f38c18ce156d30f80be8ed77308fa8e8 +EBUILD wireguard-modules-1.0.20200413.ebuild 3499 BLAKE2B e7e3f05f8d854621fbf1ba6f19dbe5bc63c6c8c628b2ffa52594749bb149abc1fd0cc5b693df1422f0ef25a88511d1a203d897f8aa7ffd93b12d9f5d528d22cc SHA512 770a2d3d666560e022de710c0045f9057caa25989119417041d80e479a61628208b4adceb0534494f36ae9acf686b7334f48daca7816765e1e0e2e8acf090b66 EBUILD wireguard-modules-9999.ebuild 3442 BLAKE2B 81c97ff68c71ce60d343266035852d2128246a3aa1c4ca95d0847904c021c5e4a7bb652d8c531e50be1dcc430fa34e54682462595101fded003af71e97e037e6 SHA512 1979d83d24156acf594edfc23c76e8e30e9a21ef9cd3fd45a06462ba20a30a9c90618852a611793af53424a52e0486a93d9198e18f89b7c57f9e8e06b434c9d5 MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5 diff --git a/net-vpn/wireguard-modules/files/wireguard-modules-1.0.20200413-sch_generic-header.patch b/net-vpn/wireguard-modules/files/wireguard-modules-1.0.20200413-sch_generic-header.patch new file mode 100644 index 000000000000..8e263e9622a9 --- /dev/null +++ b/net-vpn/wireguard-modules/files/wireguard-modules-1.0.20200413-sch_generic-header.patch @@ -0,0 +1,26 @@ +From bd388363a66d67f0e04f9c45b20a9f33dfcf79f6 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +Date: Thu, 16 Apr 2020 00:27:33 -0600 +Subject: compat: include sch_generic.h header for skb_reset_tc + +Reported-by: King DuckZ <dev00@gmx.it> +Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> +--- + src/compat/compat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/compat/compat.h b/src/compat/compat.h +index 75bd3b7..bb996b8 100644 +--- a/src/compat/compat.h ++++ b/src/compat/compat.h +@@ -1029,6 +1029,7 @@ out: + + #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14)) + #include <linux/skbuff.h> ++#include <net/sch_generic.h> + static inline void skb_reset_redirect(struct sk_buff *skb) + { + #ifdef CONFIG_NET_SCHED +-- +cgit v1.2.3-4-ga26e + diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200401.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200413.ebuild index 16df945c1ab1..8a425d4191e6 100644 --- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200401.ebuild +++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200413.ebuild @@ -30,6 +30,8 @@ MODULE_NAMES="wireguard(kernel/drivers/net:src)" BUILD_TARGETS="module" CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI" +PATCHES=( "${FILESDIR}/${P}-sch_generic-header.patch" ) + pkg_setup() { if use module; then linux-mod_pkg_setup |