gentoo auto-resync : 23:04:2023 - 18:08:08

3 files changed, 33 insertions, 1 deletions

diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index aa9d0ec40950..199d90ad2fcb 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -2,10 +2,11 @@ AUX sstp-client-1.0.12-fix-example.patch 417 BLAKE2B 5f91dd2ee3e3ccc089712a2efd2
 AUX sstp-client-1.0.12-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919729d5316ec78a9d6d4de4092afb615bbd731557e033b55d400a3fa8c0fac83a2732e3cc8212c0c16a067bfb01041d2ab2f0fc3c233847 SHA512 00d1b0ad75aa75417cf87210802c48164a715eddd7a1f53e8956e524387eb170078471d67fab32e3b25990b1b44fa415b153bf22fdf8b3c90385627c8f0075e4
 AUX sstp-client-1.0.17-fix-bashism-configure.ac.patch 1054 BLAKE2B 6c73460707247ec49d639d993b45f9dc6fc96df9cf2c8946bd222a305f4e818016ccfaf3d13985eccd0020bebcf8a22f2fff22964d97aadd8018c5b9b5d234fa SHA512 8aa8417ef1ae6df46fcf7328a979d75983ecf6c279dd972651bd0faec372a3ee952e4c6b3dd3318ea463a2a080a17f60303d637cf2e5c7d8b31069051eef35c7
 AUX sstp-client-1.0.18-includes.patch 1286 BLAKE2B 51d8ba85abbef0ac8d3b9eb8e2b76db8111f3f57eaee1fbcec1c736e3f00717929c57c74ae99f911607b5cf929d129c38e283a4ea57df748a941ab36a65e7393 SHA512 782eff5caed5cdbd88c74d0ce53dae76f57726c0f9da5c09e446e3ac5669c60688b98d79d1884a57205af819528f0d5c6c7b13b73f8b9fec5c34d2574c7e1cea
+AUX sstp-client-1.0.18-sstp-mppe.patch 850 BLAKE2B 157ddf96d505c1f1cecfb7bcf6022ff4bc2d5eaeb0b54b6dbd6e2a46159f201688d058d50a8a7906cd057e374c07d4d8f9bf78b4670eb971ecc98cf432d92119 SHA512 452a99ca6271231dcfee1c476cc9c1ab931a144aa36c0908c71b6f727de6e1d611d7d60e992f155b083f772c6e914badf526edb8064a2487af4e2a60da776729
 DIST sstp-client-1.0.17.tar.gz 482831 BLAKE2B d19c752b3f061401f89eb46bd52091e3ab0a3c931c6646a55c1ee0e6dd7e9c501fba14b7c870a2514cb72fb0fd1d8bc89538562d4d99b9d58a081e0917734f5d SHA512 eff18eb894b2c96d46315b5ac7530fe50e8dd6e6c29ea946cd0e7c05c56416e85088fc65650fb77c05e3a747cb0b4e3575af5457515d240161027910abae9775
 DIST sstp-client-1.0.18-ppp-2.5.0-patches.tar.xz 7244 BLAKE2B 4249787feb98d71f81d50ac4f02cf38f8cd21501bfffc0ec65ba262db5c5ccf3bc3ba728f676e7156e6105181c2706c5bfc242b66c6db63cc39e82a6e4add56a SHA512 ed99b6de0ea57ff80ca175b329b00334cad7ca535fd6465f318bf5db0994a1a9aec6f7026bebcf9087a1d21ecac8a8a3a027e346ca541582470b0570273d4cd7
 DIST sstp-client-1.0.18.tar.gz 477886 BLAKE2B 3a2929a5245a703c36b9bf6c17b7f65d911446a8a44b95894fd990ccf5ad01a98e4b5e843681e4643ff4b28a57de359a98ef42f9bb378d52c6829297970399b6 SHA512 e0dd0fe57b65c2001737222159e58b11177a8f1cb64564e520fad2199c0581d0550a00f49c921be74039dec59062233b4716f8b624a0e4cb48bdf8df9272f93c
 EBUILD sstp-client-1.0.17.ebuild 1398 BLAKE2B a848990445c2fd440856b77c92af0319c180de495635b0a372bf3298ef49b15b68c59070bbf9db1df2c1c1c18ba4f91ccd7b0e54eb99e2362df815918dc75b42 SHA512 1590b4788a05099d7d0193d8b86550acc41658ba6a7e95ad70a0b44206af25c82c087521dcbd9fe2f134665ca10e93467bb85d4ec0329a7a758a05fc18b5fa06
-EBUILD sstp-client-1.0.18-r2.ebuild 1519 BLAKE2B 5b1332ca8c8ad23e78663bcf2f79d0e90219fd7085bb65caf306655673bd16f71d213c6f89078553a7ea716bb3cde05cd585832903fc5fefe8aa7bac3d3a7653 SHA512 a4af80eb124e11e9362a994420c90d99d76ae52162b56be147e67603e39dd136d3f61ad1311401ae7f223fb7376c52c47161f55caeff46ba8b73b2d08c322f4c
+EBUILD sstp-client-1.0.18-r2.ebuild 1569 BLAKE2B 533dab06a8d5d43860e0bd2e9e8e994e14aa148c64a02693efd139251c6b17b9f81ffd2a1fc02547f30cc92b689eca1abd9557a5f9a11517bf12894c4dadd4f8 SHA512 5c7de2c8dc42bcadee9049a4652946232146937f72af50e84cc2ed41d4110d4dd6ca472f96c4ef3f2b1020300415e05e7d0fad49e7230dfb375b1ab5332030d8
 EBUILD sstp-client-1.0.18.ebuild 1384 BLAKE2B 83256b78ddd94528f435e3066ab2c800fbcb9d2ef61dd6df36d4fbe6146d79b7d9f39e26425fa4520d11f09aa68f8a69267321426528a8b8890a807c51066c25 SHA512 714b53ddfe3a55092c96fc7ba855b7088bf8bd021b65aa306721dcc021309f4d9cbbbae00479746659ad7ad8dc0819f1fd1d914fd290b24c43c14e54bdcdcc1f
 MISC metadata.xml 313 BLAKE2B dd8f979f53d0aa9751a0a6b84f08925cb5ef75b0bdd6d886f92aca04bab3508ec3ba81dc5519e6dbcc5da6b8d76b58efeed4fc78d36dee1e31df19ece22735da SHA512 aaeb75acf8c8ac6e79e288da3ec75fda923b12cf0e1774d75aac63c4b24a1b581c7922fcfa9e5bb215518205084404be4aec9a2a4d9787ace432eca9c923374c
diff --git a/net-misc/sstp-client/files/sstp-client-1.0.18-sstp-mppe.patch b/net-misc/sstp-client/files/sstp-client-1.0.18-sstp-mppe.patch
new file mode 100644
index 000000000000..a9842f6f23dd
--- /dev/null
+++ b/net-misc/sstp-client/files/sstp-client-1.0.18-sstp-mppe.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/904874
+https://gitlab.com/sstp-project/sstp-client/-/merge_requests/11
+
+From e902ce947eaccdbd0399c42371934e16d3737f35 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 23 Apr 2023 12:14:21 -0400
+Subject: [PATCH] Replace sstp-mppe.h with sstp-pppd-compat.h
+
+Fixes: 3f7835df9ac5e84729903ca536cf65e4a7b04c6c
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ src/pppd-plugin/sstp-mppe.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pppd-plugin/sstp-mppe.c b/src/pppd-plugin/sstp-mppe.c
+index 7c7c7c2..207e283 100644
+--- a/src/pppd-plugin/sstp-mppe.c
++++ b/src/pppd-plugin/sstp-mppe.c
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <pppd/pppd.h>
+-#include <sstp-mppe.h>
++#include <sstp-pppd-compat.h>
+ 
+ #ifndef HAVE_MPPE_KEYS_FUNCTIONS
+ 
+-- 
+GitLab
+
diff --git a/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
index d3fbceca2f8f..3c2af86605a0 100644
--- a/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
+++ b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 
 	"${FILESDIR}/${PN}-1.0.18-includes.patch"
 	"${WORKDIR}/${P}-ppp-2.5.0-patches"
+	"${FILESDIR}/sstp-client-1.0.18-sstp-mppe.patch"
 )
 
 src_prepare() {