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

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

[Mike Gilbert]

commit:     37bf0bcab2e03c52555f54c4a9faffc7fda19d03
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 16:39:55 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat May 13 16:41:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37bf0bca

net-vpn/networkmanager-sstp: fix for ppp-2.4.9

Closes: https://bugs.gentoo.org/906254
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../networkmanager-sstp-1.3.1-ppp-2.4.9.patch      | 30 ++++++++++++++++++++++
 ....ebuild => networkmanager-sstp-1.3.1-r2.ebuild} |  1 +
 2 files changed, 31 insertions(+)

diff --git a/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.1-ppp-2.4.9.patch b/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.1-ppp-2.4.9.patch
new file mode 100644
index 000000000000..a504b60ce008
--- /dev/null
+++ b/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.1-ppp-2.4.9.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/906254
+https://gitlab.gnome.org/GNOME/network-manager-sstp/-/merge_requests/54
+
+From f4feed7431b1cf884bd3c1c10df795efaf8d149d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 13 May 2023 12:19:44 -0400
+Subject: [PATCH] Compile nm-sstp-pppd-mppe.c when !WITH_PPP_MPPE_KEYS
+
+Bug: https://bugs.gentoo.org/906254
+Fixes: 4cd0ec66174011925c93aa04edccca92b4d1387f
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3be01b6..770fc59 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -120,7 +120,7 @@ src_nm_sstp_pppd_plugin_la_SOURCES = \
+ 	src/nm-sstp-pppd-status.h
+ if !WITH_PPP_MPPE_KEYS
+ src_nm_sstp_pppd_plugin_la_SOURCES += \
+-	src/nm-sstp-pppd-mppe.h
++	src/nm-sstp-pppd-mppe.c
+ endif
+ src_nm_sstp_pppd_plugin_la_CPPFLAGS = \
+ 	$(src_cppflags)
+-- 
+GitLab
+

diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r2.ebuild
similarity index 97%
rename from net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild
rename to net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r2.ebuild
index 378579b00d87..f6a37a57f8f8 100644
--- a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild
+++ b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r2.ebuild
@@ -54,6 +54,7 @@ BDEPEND="
 
 PATCHES=(
 	"${WORKDIR}"/${P}-ppp-2.5.0-patches
+	"${FILESDIR}"/networkmanager-sstp-1.3.1-ppp-2.4.9.patch
 )
 
 src_prepare() {