openvpn3: fix build on latest Linux (#439017)

authored by Sandro and committed by GitHub 9f6b9e00 7fd0a62f

+32
+5
pkgs/by-name/op/openvpn3/package.nix
··· 40 fetchSubmodules = true; 41 }; 42 43 postPatch = '' 44 echo '#define OPENVPN_VERSION "3.git:unknown:unknown" 45 #define PACKAGE_GUIVERSION "v${builtins.replaceStrings [ "_" ] [ ":" ] version}"
··· 40 fetchSubmodules = true; 41 }; 42 43 + patches = [ 44 + # Should be fixed in v26: https://codeberg.org/OpenVPN/openvpn3-linux/issues/70 45 + ./v25-latest-linux-fix.patch 46 + ]; 47 + 48 postPatch = '' 49 echo '#define OPENVPN_VERSION "3.git:unknown:unknown" 50 #define PACKAGE_GUIVERSION "v${builtins.replaceStrings [ "_" ] [ ":" ] version}"
+27
pkgs/by-name/op/openvpn3/v25-latest-linux-fix.patch
···
··· 1 + diff --git a/openvpn3-core/openvpn/dco/ovpn_dco_linux.h b/openvpn3-core/openvpn/dco/ovpn_dco_linux.h 2 + index 238f71f7a..5b7fe8d8c 100644 3 + --- a/openvpn3-core/openvpn/dco/ovpn_dco_linux.h 4 + +++ b/openvpn3-core/openvpn/dco/ovpn_dco_linux.h 5 + @@ -239,22 +239,6 @@ enum ovpn_netlink_packet_attrs { 6 + OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1, 7 + }; 8 + 9 + -enum ovpn_ifla_attrs { 10 + - IFLA_OVPN_UNSPEC = 0, 11 + - IFLA_OVPN_MODE, 12 + - 13 + - __IFLA_OVPN_AFTER_LAST, 14 + - IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST - 1, 15 + -}; 16 + - 17 + -enum ovpn_mode { 18 + - __OVPN_MODE_FIRST = 0, 19 + - OVPN_MODE_P2P = __OVPN_MODE_FIRST, 20 + - OVPN_MODE_MP, 21 + - 22 + - __OVPN_MODE_AFTER_LAST, 23 + -}; 24 + - 25 + /// \endcond 26 + 27 + #endif /* _UAPI_LINUX_OVPN_DCO_H_ */