gentoo auto-resync : 01:06:2023 - 21:27:08

4 files changed, 37 insertions, 2 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index dff142d6cb51..44f6b4e4d28f 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 0ea1c47c2bce..0d9332a509c3 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,9 +1,10 @@
 AUX openfortivpn-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch 395 BLAKE2B 2d3360b5ed67228a63309ced0a0bccf0f23162a64c70ccd5364ab5d22e27217fbc5efab1a656cbadb83f7e029702e82c7ea647b0663823d5b06d4be369056b2e SHA512 e9a54af6737e3d97aa4e9e0cf974e5324fe22b8851261ce51fd49b97a53924d7d34bde2d1102ca2338930bd46739f765312187f43bba36317fe3ad0956fbe20f
+AUX openfortivpn-1.20.3-pppd-ipcp-accept-remote.patch 1057 BLAKE2B 86d6e7d473201e21736b63420c151889112733b8b75415e727838c08aa62ecd1ad8fe2ce28c436b622b038c5dd2cbd39663a12cc1d42ae8c2f87ca269d539a7c SHA512 3a835b6df2937de8ae825717639da2b6bf143af470394f574fd3f2b85639898097bef2a8b04c8aeef1190298ca1c908111012baa49ff08d860b0020787bae04c
 AUX systemd_substitute_bin_and_sysconfig_dirs.patch 490 BLAKE2B 071747a713f2b155959768d827b9b256842a6f587d23992a06be9ab7a701a6b4bc6b86b56fe0853f04ff81dc43f739d07f8cf60ba37c0bc9da2712a23d8a7f5a SHA512 511e8179a7f36a5e5bd2b4a07e62812aac8065b34b767992b823b5f4135addaf662f8a6061215898281dc128b8386b166f614307680416aaeba183db3ef5e2cb
 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
 EBUILD openfortivpn-1.19.0.ebuild 770 BLAKE2B 0f33dcaffec9c6bae497dcc1dbbf5df3aa351d710fee6cfc063ee0c54e050ee65b40241eca6a59fcb73be855219f72d0969cee7044796c036a90df6993956af9 SHA512 2ec2a815ce97035a001f8d515936e596da08bafc029b09cd1490aa4d05c7f80de43ec5e6e67a19d1ae9d296eda4f8ce86677ecfeeb18d5f5ecd8f339c99fe303
 EBUILD openfortivpn-1.20.2.ebuild 777 BLAKE2B d59b17999d0c02bb8d47962891f42f6b1985644d169cbd794c6c48f322a28d0e0496d1796cbe29fe4e7b09a080b0a5a0eef9c2f695860066b21abc891e1c3de3 SHA512 1b106073cb3b85fdfc017c33b97d260cc3750cf7bac14e4bfb78b2cf04b30cb6ae97b14084a30a4e8433b8d23dc960e0e2b888bec6e9fad7194616fe46759f09
-EBUILD openfortivpn-1.20.3.ebuild 790 BLAKE2B f576c361121becd83ddd19ef46450488d601e5509c34768747063ae710e7677c3406dd0bb7d0080ffa9d2d63fdde9923f8999e22b452f646f458e57a7a72216f SHA512 0b617b7443b8282183b2a209adc3f61a031a350f6834b41c54f9db51447f59abbe13183797c360e8c03935aa3bbf7caea9175e9a0467e4b78fc089f041b1b932
+EBUILD openfortivpn-1.20.3-r2.ebuild 848 BLAKE2B 8ca3c98de705e88c522e66906a57d459ef681afa702ec1bcee1747584947ac25b4e19d7174a96cf42aa5ccce298a9260bd784259a0f6ef7f44a619346f85bc0b SHA512 0fb6be2c6518e08aa6d2491e838a9d868b7026d4640c9d2c3b22dba746d9afac0d2da8d5cbead9d598ac4147130907b16ac46aab8c9278b73807a454f0a07805
 MISC metadata.xml 257 BLAKE2B f87135c9aedf98ef822404eb43e8214ed1e6d3cfc71db8d1aece9c3f8c30fda5b63f1de77b8d8d98b9b6b8d671e164199bcd810a34fe71939b836b164261ec2e SHA512 7719a7bd4abd3115b6279c4446e87c0c552f8b7dadd7429cbd8844ee2fe2509b712287f2d2e5926d6711dbe21efaebb289d187ebc297be770bb538f8bf799d31
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-r2.ebuild
index 2a6111254e1e..eeb2045ffa4f 100644
--- a/net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.20.3-r2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 
 DEPEND="
 	dev-libs/openssl:=
-	<net-dialup/ppp-2.5.0
+	net-dialup/ppp
 "
 RDEPEND="${DEPEND}"
 
@@ -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() {