commit: 44281f12d6e8cd62c1919b5a4fe8274346fc2cd9 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Jun 1 18:50:21 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Jun 1 18:50:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44281f12
net-vpn/openfortivpn: fix for ppp-2.5.0 Closes: https://bugs.gentoo.org/907404 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> ...enfortivpn-1.20.3-pppd-ipcp-accept-remote.patch | 33 ++++++++++++++++++++++ ...1.20.3.ebuild => openfortivpn-1.20.3-r1.ebuild} | 1 + 2 files changed, 34 insertions(+) diff --git a/net-vpn/openfortivpn/files/openfortivpn-1.20.3-pppd-ipcp-accept-remote.patch b/net-vpn/openfortivpn/files/openfortivpn-1.20.3-pppd-ipcp-accept-remote.patch new file mode 100644 index 000000000000..d7bffeb28971 --- /dev/null +++ b/net-vpn/openfortivpn/files/openfortivpn-1.20.3-pppd-ipcp-accept-remote.patch @@ -0,0 +1,33 @@ +https://github.com/adrienverge/openfortivpn/pull/1111 +https://bugs.gentoo.org/907404 + +From 3b54df0a84b755fc8d35e8081b2fc6152b006a5b Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Tue, 30 May 2023 16:28:52 -0400 +Subject: [PATCH] Pass ipcp-accept-remote to pppd + +Since https://github.com/ppp-project/ppp/commit/9fe8923419a954fedf8b6d1a6cc07b45f165c1ab, +pppd refuses to accept a different remote IP if we explictly pass one on +the command line. This results in an error like: + +pppd: Peer refused to agree to his IP address + +Passing ipcp-accept-remote disables this behavior. + +Bug: https://bugs.gentoo.org/907404 +--- + src/tunnel.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tunnel.c b/src/tunnel.c +index 2b063edd..30a09597 100644 +--- a/src/tunnel.c ++++ b/src/tunnel.c +@@ -236,6 +236,7 @@ static int pppd_run(struct tunnel *tunnel) + ":169.254.2.1", // <local_IP_address>:<remote_IP_address> + "noipdefault", + "ipcp-accept-local", ++ "ipcp-accept-remote", + "noaccomp", + "noauth", + "default-asyncmap", diff --git a/net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild b/net-vpn/openfortivpn/openfortivpn-1.20.3-r1.ebuild similarity index 92% rename from net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild rename to net-vpn/openfortivpn/openfortivpn-1.20.3-r1.ebuild index 2a6111254e1e..c919f3965460 100644 --- a/net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild +++ b/net-vpn/openfortivpn/openfortivpn-1.20.3-r1.ebuild @@ -23,6 +23,7 @@ CONFIG_CHECK="~PPP ~PPP_ASYNC" PATCHES=( "${FILESDIR}"/${PN}-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch + "${FILESDIR}"/openfortivpn-1.20.3-pppd-ipcp-accept-remote.patch ) src_prepare() {
