[gentoo-commits] repo/gentoo:master commit in: net-vpn/openfortivpn/, net-vpn/openfortivpn/files/

[gentoo-commits] repo/gentoo:master commit in: net-vpn/openfortivpn/, net-vpn/openfortivpn/files/

[Sam James]

commit:     f14ba0909e5de39ca3e0050d9932f41cead849f9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 19:52:56 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 30 19:53:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14ba090

net-vpn/openfortivpn: add 1.20.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/openfortivpn/Manifest                      |  1 +
 ...systemd_substitute_bin_and_sysconfig_dirs.patch | 11 ++++++
 net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild    | 40 ++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 96053ddc300f..b88e7b43c9a1 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,2 +1,3 @@
 DIST openfortivpn-1.19.0.tar.gz 168962 BLAKE2B f2cff6f89a0662aca5911f6c3ef5953181383d4a66a41df83916c551338f07364436a174de39874cb654d6538955ac5d0a57a875facf2cc9b8c8a27a48df7fbf SHA512 4f4179178cbf2fc03ddebdfd4197c03a7108ecfa5216d5f11d80b2e3b840816f0a9a59714f58ecdcf966b76eb9b459e0bf78901940120ed1aa1cf69021385a53
 DIST openfortivpn-1.20.2.tar.gz 167680 BLAKE2B fec9ef5f38af6cf32283cb281d0871115c3ddface35bbbe5fb96cd132cf2f586bd21ddaf55424bc902ea3984472109ec40ee4fd16706d10cc1795b4d68216b1d SHA512 e3ad8e74f7ba05f61df464af8a6ff6ba41e0c73ad52fbb9eaa9485814788a4636800b91cdd88f88caecbc9e305b2759a628b02fbe2eaf12d33c7912bb3ce065b
+DIST openfortivpn-1.20.3.tar.gz 168568 BLAKE2B ef6132c354c0348d09584675d7fe0213bf67f78df6ef36434f7e7d5166e6a7ec2dd4352613271f208a72b7666a6259642156bd297485714f9bc53f09fd2dce17 SHA512 38a1b208c2cbba1b1f723d6f8a2e178970b8fd384dbb424c38654821d56fc1652bae27b7593cd6af3c08d7c9b8cf97550185905b690e6eae7222b31aea266f01

diff --git a/net-vpn/openfortivpn/files/openfortivpn-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch b/net-vpn/openfortivpn/files/openfortivpn-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch
new file mode 100644
index 000000000000..e9435f3054ed
--- /dev/null
+++ b/net-vpn/openfortivpn/files/openfortivpn-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch
@@ -0,0 +1,11 @@
+--- a/lib/systemd/system/openfortivpn@.service.in
++++ b/lib/systemd/system/openfortivpn@.service.in
+@@ -9,7 +9,7 @@ Documentation=https://github.com/adrienverge/openfortivpn/wiki
+ [Service]
+ Type=notify
+ PrivateTmp=true
+-ExecStart=@BINDIR@/openfortivpn -c @SYSCONFDIR@/openfortivpn/%I.conf
++ExecStart=/usr/bin/openfortivpn -c /etc/openfortivpn/%I.conf
+ Restart=on-failure
+ OOMScoreAdjust=-100
+ 

diff --git a/net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild b/net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild
new file mode 100644
index 000000000000..2a6111254e1e
--- /dev/null
+++ b/net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="Fortinet compatible VPN client"
+HOMEPAGE="https://github.com/adrienverge/openfortivpn"
+SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/openssl:=
+	<net-dialup/ppp-2.5.0
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~PPP ~PPP_ASYNC"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	keepdir /etc/openfortivpn
+}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/openfortivpn/, net-vpn/openfortivpn/files/

[Mike Gilbert]

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 <floppym@gentoo.org>
+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() {