diff options
Diffstat (limited to 'net-vpn/networkmanager-l2tp')
| -rw-r--r-- | net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch (renamed from net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0.patch) | 168 | ||||
| -rw-r--r-- | net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch | 170 | ||||
| -rw-r--r-- | net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r2.ebuild (renamed from net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r1.ebuild) | 2 |
3 files changed, 171 insertions, 169 deletions
diff --git a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0.patch b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch index 94613e0ce450..4ff829048c20 100644 --- a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0.patch +++ b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch @@ -1,6 +1,5 @@ https://bugs.gentoo.org/904843 https://github.com/nm-l2tp/NetworkManager-l2tp/commit/e6860eb957208a932fb565dd7b5e79fe5a4df662 -https://github.com/nm-l2tp/NetworkManager-l2tp/commit/36a427c316a8ccd3168606f6e7fd6c8ae2b9bebf From e6860eb957208a932fb565dd7b5e79fe5a4df662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com> @@ -160,170 +159,3 @@ Signed-off-by: Eivind Næss <eivnaes@yahoo.com> return 0; } -From 36a427c316a8ccd3168606f6e7fd6c8ae2b9bebf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com> -Date: Fri, 3 Mar 2023 05:22:13 +0000 -Subject: [PATCH] Adding support for compiling against pppd-2.5.0 (current - master) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Eivind Næss <eivnaes@yahoo.com> ---- a/Makefile.am -+++ b/Makefile.am -@@ -99,7 +99,7 @@ src_nm_l2tp_service_SOURCES = \ - shared/nm-l2tp-crypto-nss.c \ - shared/utils.h \ - shared/utils.c \ -- src/nm-ppp-status.h \ -+ src/nm-l2tp-pppd-status.h \ - src/nm-l2tp-service.h \ - src/nm-l2tp-service.c - src_nm_l2tp_service_CPPFLAGS = $(src_cppflags) $(NSS_CFLAGS) $(OPENSSL_CFLAGS) -@@ -118,7 +118,8 @@ pppd_plugin_LTLIBRARIES = src/nm-l2tp-pppd-plugin.la - src_nm_l2tp_pppd_plugin_la_SOURCES = \ - $(shared_sources) \ - src/nm-l2tp-pppd-plugin.c \ -- src/nm-ppp-status.h -+ src/nm-l2tp-pppd-compat.h \ -+ src/nm-l2tp-pppd-status.h - src_nm_l2tp_pppd_plugin_la_CPPFLAGS = $(src_cppflags) - src_nm_l2tp_pppd_plugin_la_LDFLAGS = \ - -module -avoid-version ---- /dev/null -+++ b/src/nm-l2tp-pppd-compat.h -@@ -0,0 +1,93 @@ -+/* SPDX-License-Identifier: GPL-2.0-or-later */ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* nm-sstp-service - sstp (and other pppd) integration with NetworkManager -+ * -+ * Copyright (C) 2023 Eivind Naess, eivnaes@yahoo.com -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#ifndef __NM_L2TP_PPPD_COMPAT_H__ -+#define __NM_L2TP_PPPD_COMPAT_H__ -+ -+// PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define. -+// this silly macro magic is to work around that. -+ -+#define INET6 1 -+ -+#undef VERSION -+#include <pppd/pppd.h> -+#ifndef PPPD_VERSION -+#define PPPD_VERSION VERSION -+#endif -+ -+#include <pppd/fsm.h> -+#include <pppd/ccp.h> -+#include <pppd/eui64.h> -+#include <pppd/ipcp.h> -+#include <pppd/ipv6cp.h> -+#include <pppd/eap.h> -+#include <pppd/upap.h> -+ -+#ifdef HAVE_PPPD_CHAP_H -+ #include <pppd/chap.h> -+#endif -+ -+#ifdef HAVE_PPPD_CHAP_NEW_H -+ #include <pppd/chap-new.h> -+#endif -+ -+#ifdef HAVE_PPPD_CHAP_MS_H -+ #include <pppd/chap_ms.h> -+#endif -+ -+#ifndef PPP_PROTO_CHAP -+#define PPP_PROTO_CHAP 0xc223 -+#endif -+ -+#ifndef PPP_PROTO_EAP -+#define PPP_PROTO_EAP 0xc227 -+#endif -+ -+#if WITH_PPP_VERSION < PPP_VERSION(2,5,0) -+ -+static inline bool debug_on(void) -+{ -+ return debug; -+} -+ -+static inline const char *ppp_ipparam(void) -+{ -+ return ipparam; -+} -+ -+static inline int ppp_ifunit(void) -+{ -+ return ifunit; -+} -+ -+static inline const char *ppp_ifname(void) -+{ -+ return ifname; -+} -+ -+static inline int ppp_get_mtu(int idx) -+{ -+ return netif_get_mtu(idx); -+} -+ -+#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) -+#endif // #ifdef __NM_L2TP_PPPD_COMPAT_H__ ---- a/src/nm-l2tp-pppd-plugin.c -+++ b/src/nm-l2tp-pppd-plugin.c -@@ -9,8 +9,6 @@ - #include <config.h> - #define ___CONFIG_H__ - --#include "nm-default.h" -- - #include <string.h> - #include <stdlib.h> - #include <sys/socket.h> -@@ -18,10 +16,11 @@ - #include <arpa/inet.h> - #include <dlfcn.h> - --#include "nm-l2tp-service.h" --#include "nm-ppp-status.h" -+#include "nm-l2tp-pppd-status.h" - #include "nm-l2tp-pppd-compat.h" - -+#include "nm-default.h" -+#include "nm-l2tp-service.h" - #include "nm-utils/nm-shared-utils.h" - #include "nm-utils/nm-vpn-plugin-macros.h" - -similarity index 100% -rename from src/nm-ppp-status.h -rename to src/nm-l2tp-pppd-status.h ---- a/src/nm-l2tp-service.c -+++ b/src/nm-l2tp-service.c -@@ -36,7 +36,7 @@ - #include <arpa/inet.h> - #include <netdb.h> - --#include "nm-ppp-status.h" -+#include "nm-l2tp-pppd-status.h" - #include "nm-l2tp-pppd-service-dbus.h" - #include "nm-utils/nm-shared-utils.h" - #include "nm-utils/nm-secret-utils.h" - diff --git a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch new file mode 100644 index 000000000000..1625c57a4bc8 --- /dev/null +++ b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch @@ -0,0 +1,170 @@ +https://bugs.gentoo.org/904843 +https://github.com/nm-l2tp/NetworkManager-l2tp/commit/36a427c316a8ccd3168606f6e7fd6c8ae2b9bebf + +From 36a427c316a8ccd3168606f6e7fd6c8ae2b9bebf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com> +Date: Fri, 3 Mar 2023 05:22:13 +0000 +Subject: [PATCH] Adding support for compiling against pppd-2.5.0 (current + master) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Eivind Næss <eivnaes@yahoo.com> +--- a/Makefile.am ++++ b/Makefile.am +@@ -99,7 +99,7 @@ src_nm_l2tp_service_SOURCES = \ + shared/nm-l2tp-crypto-nss.c \ + shared/utils.h \ + shared/utils.c \ +- src/nm-ppp-status.h \ ++ src/nm-l2tp-pppd-status.h \ + src/nm-l2tp-service.h \ + src/nm-l2tp-service.c + src_nm_l2tp_service_CPPFLAGS = $(src_cppflags) $(NSS_CFLAGS) $(OPENSSL_CFLAGS) +@@ -118,7 +118,8 @@ pppd_plugin_LTLIBRARIES = src/nm-l2tp-pppd-plugin.la + src_nm_l2tp_pppd_plugin_la_SOURCES = \ + $(shared_sources) \ + src/nm-l2tp-pppd-plugin.c \ +- src/nm-ppp-status.h ++ src/nm-l2tp-pppd-compat.h \ ++ src/nm-l2tp-pppd-status.h + src_nm_l2tp_pppd_plugin_la_CPPFLAGS = $(src_cppflags) + src_nm_l2tp_pppd_plugin_la_LDFLAGS = \ + -module -avoid-version +--- /dev/null ++++ b/src/nm-l2tp-pppd-compat.h +@@ -0,0 +1,93 @@ ++/* SPDX-License-Identifier: GPL-2.0-or-later */ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* nm-sstp-service - sstp (and other pppd) integration with NetworkManager ++ * ++ * Copyright (C) 2023 Eivind Naess, eivnaes@yahoo.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#ifndef __NM_L2TP_PPPD_COMPAT_H__ ++#define __NM_L2TP_PPPD_COMPAT_H__ ++ ++// PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define. ++// this silly macro magic is to work around that. ++ ++#define INET6 1 ++ ++#undef VERSION ++#include <pppd/pppd.h> ++#ifndef PPPD_VERSION ++#define PPPD_VERSION VERSION ++#endif ++ ++#include <pppd/fsm.h> ++#include <pppd/ccp.h> ++#include <pppd/eui64.h> ++#include <pppd/ipcp.h> ++#include <pppd/ipv6cp.h> ++#include <pppd/eap.h> ++#include <pppd/upap.h> ++ ++#ifdef HAVE_PPPD_CHAP_H ++ #include <pppd/chap.h> ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_NEW_H ++ #include <pppd/chap-new.h> ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_MS_H ++ #include <pppd/chap_ms.h> ++#endif ++ ++#ifndef PPP_PROTO_CHAP ++#define PPP_PROTO_CHAP 0xc223 ++#endif ++ ++#ifndef PPP_PROTO_EAP ++#define PPP_PROTO_EAP 0xc227 ++#endif ++ ++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0) ++ ++static inline bool debug_on(void) ++{ ++ return debug; ++} ++ ++static inline const char *ppp_ipparam(void) ++{ ++ return ipparam; ++} ++ ++static inline int ppp_ifunit(void) ++{ ++ return ifunit; ++} ++ ++static inline const char *ppp_ifname(void) ++{ ++ return ifname; ++} ++ ++static inline int ppp_get_mtu(int idx) ++{ ++ return netif_get_mtu(idx); ++} ++ ++#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) ++#endif // #ifdef __NM_L2TP_PPPD_COMPAT_H__ +--- a/src/nm-l2tp-pppd-plugin.c ++++ b/src/nm-l2tp-pppd-plugin.c +@@ -9,8 +9,6 @@ + #include <config.h> + #define ___CONFIG_H__ + +-#include "nm-default.h" +- + #include <string.h> + #include <stdlib.h> + #include <sys/socket.h> +@@ -18,10 +16,11 @@ + #include <arpa/inet.h> + #include <dlfcn.h> + +-#include "nm-l2tp-service.h" +-#include "nm-ppp-status.h" ++#include "nm-l2tp-pppd-status.h" + #include "nm-l2tp-pppd-compat.h" + ++#include "nm-default.h" ++#include "nm-l2tp-service.h" + #include "nm-utils/nm-shared-utils.h" + #include "nm-utils/nm-vpn-plugin-macros.h" + +similarity index 100% +rename from src/nm-ppp-status.h +rename to src/nm-l2tp-pppd-status.h +--- a/src/nm-l2tp-service.c ++++ b/src/nm-l2tp-service.c +@@ -36,7 +36,7 @@ + #include <arpa/inet.h> + #include <netdb.h> + +-#include "nm-ppp-status.h" ++#include "nm-l2tp-pppd-status.h" + #include "nm-l2tp-pppd-service-dbus.h" + #include "nm-utils/nm-shared-utils.h" + #include "nm-utils/nm-secret-utils.h" + diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r1.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r2.ebuild index d82863ed321b..b8c745b85590 100644 --- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r1.ebuild +++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r2.ebuild @@ -50,7 +50,7 @@ BDEPEND="dev-util/gdbus-codegen S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}"/${PN}-1.20.8-ppp-2.5.0.patch + "${FILESDIR}"/${PN}-1.20.8-ppp-2.5.0-{1,2}.patch ) src_configure() { |