gentoo auto-resync : 23:04:2023 - 12:07:24

3 files changed, 71 insertions, 2 deletions

diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index 95675f4d2769..aa9d0ec40950 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -3,7 +3,9 @@ AUX sstp-client-1.0.12-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919
 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
 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.ebuild 1384 BLAKE2B 83256b78ddd94528f435e3066ab2c800fbcb9d2ef61dd6df36d4fbe6146d79b7d9f39e26425fa4520d11f09aa68f8a69267321426528a8b8890a807c51066c25 SHA512 714b53ddfe3a55092c96fc7ba855b7088bf8bd021b65aa306721dcc021309f4d9cbbbae00479746659ad7ad8dc0819f1fd1d914fd290b24c43c14e54bdcdcc1f
-MISC metadata.xml 308 BLAKE2B 3a472844a5dc30193440521d7cba758d6c78b10528e9aee2d76491a526c94bc410376b9db50062de890819b553e5db25c6b596fa6e28432d1095153f3c498573 SHA512 75461a9b457611c5b72de5d80f75969cb63987c6b8e771d3c10b321c00c51fd1bbd06ad6e30c1d9e8a8867320191fd7213ee80cd5adbee35f44226e227a4109c
+MISC metadata.xml 313 BLAKE2B dd8f979f53d0aa9751a0a6b84f08925cb5ef75b0bdd6d886f92aca04bab3508ec3ba81dc5519e6dbcc5da6b8d76b58efeed4fc78d36dee1e31df19ece22735da SHA512 aaeb75acf8c8ac6e79e288da3ec75fda923b12cf0e1774d75aac63c4b24a1b581c7922fcfa9e5bb215518205084404be4aec9a2a4d9787ace432eca9c923374c
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
index c93fe2ce4d92..cc62457fcaa6 100644
--- a/net-misc/sstp-client/metadata.xml
+++ b/net-misc/sstp-client/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="gitlab">eivnaes/sstp-client</remote-id>
+		<remote-id type="gitlab">sstp-project/sstp-client</remote-id>
 		<remote-id type="sourceforge">sstp-client</remote-id>
 	</upstream>
 </pkgmetadata>
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
new file mode 100644
index 000000000000..d3fbceca2f8f
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="Client implementation of Secure Socket Tunneling Protocol (SSTP)"
+HOMEPAGE="https://sstp-client.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ppp-2.5.0-patches.tar.xz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static"
+
+DEPEND="dev-libs/libevent:=
+	dev-libs/openssl:=
+	net-dialup/ppp:="
+RDEPEND="${DEPEND}
+	acct-group/sstpc
+	acct-user/sstpc"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.12-remove-network-test.patch"
+	"${FILESDIR}/${PN}-1.0.12-fix-example.patch"
+
+	"${FILESDIR}/${PN}-1.0.18-includes.patch"
+	"${WORKDIR}/${P}-ppp-2.5.0-patches"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	# Reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER#*/*-}
+	# Main version without beta/pre/patch/revision
+	PPPD_VER=${PPPD_VER%%[_-]*}
+
+	local myeconfargs=(
+		--enable-ppp-plugin
+		--enable-group=sstpc
+		--enable-user=sstpc
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}"
+		--with-runtime-dir="/run/sstpc"
+		$(use_enable static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}