diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-08-17 21:33:19 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-17 21:33:19 +0100 |
| commit | 19e23b194d10e420ec050c4d8a6253aad17694b1 (patch) | |
| tree | 44ef9c9c2f5433a2251428352e4c9afb877e2500 /net-vpn/ovpn-dco | |
| parent | c74abf990d32765245eeb94b36ad4af642cae8c0 (diff) | |
gentoo auto-resync : 17:08:2023 - 21:33:19
Diffstat (limited to 'net-vpn/ovpn-dco')
| -rw-r--r-- | net-vpn/ovpn-dco/Manifest | 3 | ||||
| -rw-r--r-- | net-vpn/ovpn-dco/files/0001-ovpn-dco-include-new-GSO-header-file.patch | 76 | ||||
| -rw-r--r-- | net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild | 4 |
3 files changed, 82 insertions, 1 deletions
diff --git a/net-vpn/ovpn-dco/Manifest b/net-vpn/ovpn-dco/Manifest index 4555dde24e80..171633a9ea00 100644 --- a/net-vpn/ovpn-dco/Manifest +++ b/net-vpn/ovpn-dco/Manifest @@ -1,4 +1,5 @@ +AUX 0001-ovpn-dco-include-new-GSO-header-file.patch 2162 BLAKE2B fbf807905e1f783e89cc371a23b3ffd2aab715113f1846d1a1f14e17fa67f65866738f9a5e06d51ddda151a7605faf476ac86dd6c49960ea670a7dc8acd5dfcf SHA512 5be9f5c420b128fe0ac1b2bc2992c2864ff86013fc09cee2cf27105bb07f99660d735109e0297f306345856534ba07603930f889e055dfa170fd4b594e33132e DIST ovpn-dco-0.2.20230426.tar.gz 70341 BLAKE2B 95d468212a161f13659185d7e96b11afac63a8dd40aaf42a41463927a7f75b1d1ab2388bab5749c0127a07a8bf5d4a5a97626c0d782595f3d0561be4063d931c SHA512 929333fd0668008be77b57b3a0955c260770d91402e02d93a460569b8b17763ebe23eb6159bfefe04fa16fad2672d6a6c76e2f3c2e6b864593bef59ef3cfa29f -EBUILD ovpn-dco-0.2.20230426.ebuild 1180 BLAKE2B 8b4423d894df36566fe9b3246ead573a618026f8d3216fc2234453c73b72484490464ddeab69f93333e941899fec6ff44cc9bee15b073683a93ad8f088a91130 SHA512 4697ee4e2733e156aa36b793930096e6b9d3589350703c312a235d454407b35e6a51385959f4fc993bef50d5ed25c940d80f807612625a06ca095a38e7345beb +EBUILD ovpn-dco-0.2.20230426.ebuild 1256 BLAKE2B 6612c59fccdd8f7622374f1a45fd8de075fe153abba88bc7a4dd4f075270c2df6dab9ed3693a5735f9224a2878dfe618b2fbc4503ca2c2619cf19aec25ae5f5e SHA512 657a04ad3dd1ffc41004573cf673dee3cd07b623a017c976dd048e25e54ad627852cb816dd5e4dfe7ff31496deb32b33bd54d4ff800fcbc23b20b39305df8e7d EBUILD ovpn-dco-9999.ebuild 1239 BLAKE2B 066dca27a9b5dffd5b5557e2d66b6e177177d4cacecb60b39994092689491b626be6f2ec69394f9725fb059f45d05f1257872e861451070920d30d023b45e647 SHA512 b29b49fbc6701fb836314628dd23bc1a1dd31327761e49e7f57d2cb38e761e5214ca9dbae4f62b5200eabc2fd2d60023aaa59cf8177dedc16fdec8157d040ecb MISC metadata.xml 686 BLAKE2B c667b8740abf00a436a4043878ded6a9420298f21c38af2aef9d6336075df4c56ec3f99fdd71c6d53f2c66947f838af154f3f84258782c623f81b389b6289458 SHA512 d500104d1853b953cc3433e7185db707da162a5322f8e0433ead46211f95aea0a809f30a08d340c942b4844d5f1310873ea6d018112712eb2f3e6a2c59228dae diff --git a/net-vpn/ovpn-dco/files/0001-ovpn-dco-include-new-GSO-header-file.patch b/net-vpn/ovpn-dco/files/0001-ovpn-dco-include-new-GSO-header-file.patch new file mode 100644 index 000000000000..50e748cb5f0d --- /dev/null +++ b/net-vpn/ovpn-dco/files/0001-ovpn-dco-include-new-GSO-header-file.patch @@ -0,0 +1,76 @@ +From dba96d203f960356b477291d6a58d30fc096fbe4 Mon Sep 17 00:00:00 2001 +From: Antonio Quartulli <antonio@openvpn.net> +Date: Wed, 16 Aug 2023 22:15:01 +0200 +Subject: [PATCH] ovpn-dco: include new GSO header file + +GSO code has ben moved to its own files, therefore a new header +needs to be included accordingly. + +This patch also provides some compat files so that ovpn-dco can +continue to compile also on older kernels. + +Fixes: https://github.com/OpenVPN/ovpn-dco/issues/42 +Signed-off-by: Antonio Quartulli <antonio@openvpn.net> +--- + Makefile | 4 ++-- + compat-include/net/gso.h | 20 ++++++++++++++++++++ + drivers/net/ovpn-dco/ovpn.c | 1 + + 3 files changed, 23 insertions(+), 2 deletions(-) + create mode 100644 compat-include/net/gso.h + +diff --git a/Makefile b/Makefile +index a36a4d2..fe535e2 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,8 +34,8 @@ ELFLAG := $(EL8FLAG) $(EL9FLAG) + NOSTDINC_FLAGS += \ + -I$(PWD)/include/ \ + $(CFLAGS) $(ELFLAG) \ +- -include $(PWD)/linux-compat.h +-# -I$(PWD)/compat-include/ ++ -include $(PWD)/linux-compat.h \ ++ -I$(PWD)/compat-include/ + + ifneq ($(REVISION),) + NOSTDINC_FLAGS += -DOVPN_DCO_VERSION=\"$(REVISION)\" +diff --git a/compat-include/net/gso.h b/compat-include/net/gso.h +new file mode 100644 +index 0000000..2e41c8b +--- /dev/null ++++ b/compat-include/net/gso.h +@@ -0,0 +1,20 @@ ++/* SPDX-License-Identifier: GPL-2.0-only */ ++/* OpenVPN data channel accelerator ++ * ++ * Copyright (C) 2023 OpenVPN, Inc. ++ * ++ * Author: Antonio Quartulli <antonio@openvpn.net> ++ */ ++ ++#ifndef _NET_OVPN_COMPAT_NET_GSO_H ++#define _NET_OVPN_COMPAT_NET_GSO_H ++ ++#include <linux/version.h> ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 10) ++#include_next <net/gso.h> ++#else ++#include <linux/netdevice.h> ++#endif ++ ++#endif /* _NET_OVPN_COMPAT_NET_GSO_H */ +diff --git a/drivers/net/ovpn-dco/ovpn.c b/drivers/net/ovpn-dco/ovpn.c +index 772a34b..82e9f94 100644 +--- a/drivers/net/ovpn-dco/ovpn.c ++++ b/drivers/net/ovpn-dco/ovpn.c +@@ -22,6 +22,7 @@ + #include "udp.h" + + #include <linux/workqueue.h> ++#include <net/gso.h> + #include <uapi/linux/if_ether.h> + + static const unsigned char ovpn_keepalive_message[] = { +-- +2.41.0 + diff --git a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild index b98d189c7b99..b5ed651bbd09 100644 --- a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild +++ b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild @@ -20,6 +20,10 @@ LICENSE="GPL-2" SLOT="0" IUSE="debug" +PATCHES=( + "${FILESDIR}"/0001-ovpn-dco-include-new-GSO-header-file.patch +) + pkg_setup() { CONFIG_CHECK=" INET |