gentoo resync : 12.05.2022

4 files changed, 93 insertions, 1 deletions

diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index bf143424badb..a6c1854cef75 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1,5 +1,8 @@
 AUX sstp-client-1.0.12-fix-example.patch 417 BLAKE2B 5f91dd2ee3e3ccc089712a2efd26dd05c91aed7a787e4240a7e10a8e81f1f74d732299731500033551331e23d8927fa9519f52214c6e8949bbd3f8f6c558dfa7 SHA512 a7bef85e7be5a90a0820317d6aa87ab6e26f97caea9e47c6e678fdc8cd1c25b1a8f11c9e2ccb93f99950da39076253b435156edd4b7dfbb606db2fe58eef66e2
 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
 DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B 4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736 SHA512 d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f
+DIST sstp-client-1.0.17.tar.gz 482831 BLAKE2B d19c752b3f061401f89eb46bd52091e3ab0a3c931c6646a55c1ee0e6dd7e9c501fba14b7c870a2514cb72fb0fd1d8bc89538562d4d99b9d58a081e0917734f5d SHA512 eff18eb894b2c96d46315b5ac7530fe50e8dd6e6c29ea946cd0e7c05c56416e85088fc65650fb77c05e3a747cb0b4e3575af5457515d240161027910abae9775
 EBUILD sstp-client-1.0.12-r1.ebuild 1325 BLAKE2B 0965f2f89c3905ba02070d0a9fdec51b154e54a37d8c520067ae6f646af38a0ce534437aad6e11a2432ee6d4b5623d53272c4e4521adcd8cd8232cf197d055fe SHA512 e953a85ad8a62922b246bae364095c2894fad0d4355f5bcf14c8c84812d054317ece4c67af445d065f9bc1f288a6f62da66b4a845aad81d602b5c88fc635c2fc
-MISC metadata.xml 249 BLAKE2B abffff2d7e7577e3fcc40c67d5934d9a8288da07bf7b3d877b6333631b60f27dd3fa33f84b9a385b9db3fdbdafc7e89efac540f7d0e53fa8634827a07304726e SHA512 7f48ec7b7fd90db599c0e89370d01de8fe623c5d92f48cec2e1ca3c92c3439a40f2727098d4fd6fcf662fe815148bb7909fb23d5b7fb1535101f425a4d10a9ff
+EBUILD sstp-client-1.0.17.ebuild 1401 BLAKE2B e9c6b3a8da998d3cc9d2aa79c9902137665db12aa186ee179bec82ab2ecaaf690ef02da383419ac462eb0a2cb94711d5d718e4a73afc9267fa1b09900069031d SHA512 621c57bf85dd0c4d93fba79b143af39b031e1d82e6da0416379ab59e8c576bac35aa149f77480a7cf77b6a4fdf332e88e9e50d685461829cd92ea72b79f2e488
+MISC metadata.xml 308 BLAKE2B 3a472844a5dc30193440521d7cba758d6c78b10528e9aee2d76491a526c94bc410376b9db50062de890819b553e5db25c6b596fa6e28432d1095153f3c498573 SHA512 75461a9b457611c5b72de5d80f75969cb63987c6b8e771d3c10b321c00c51fd1bbd06ad6e30c1d9e8a8867320191fd7213ee80cd5adbee35f44226e227a4109c
diff --git a/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch b/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch
new file mode 100644
index 000000000000..a3a41fb206a9
--- /dev/null
+++ b/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch
@@ -0,0 +1,23 @@
+https://gitlab.com/eivnaes/sstp-client/-/merge_requests/2
+
+From 3cae209750549b17c547c3025859c0468cd5fcf6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 10 May 2022 18:04:20 +0000
+Subject: [PATCH] configure.ac: fix bashism
+
+configure scripts are expected to work with POSIX compliant shells providing
+/bin/sh so use = instead of == to work with both Bash and other shells.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -129,7 +129,7 @@ PKG_CHECK_EXISTS([pppd],
+ AM_CONDITIONAL(WITH_PPP_PLUGIN, test "${enable_ppp_plugin}" = "yes")
+ AC_ARG_WITH([pppd-auth-notify-support],
+     AS_HELP_STRING([--with-pppd-auth-notify-support], [is the auth-notifier supported in this pppd version]))
+-AS_IF([test "x$with_pppd_auth_notify_support" == "xyes" ],
++AS_IF([test "x$with_pppd_auth_notify_support" = "xyes" ],
+     [AC_DEFINE(USE_PPPD_AUTH_HOOK,1,[Define if pppd has support for client side authentication complete notification])
+      PPPD_AUTH_NOTIFIER="yes"], 
+     [PPPD_AUTH_NOTIFIER="no"])
+GitLab
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
index 8c9ceb44c429..c93fe2ce4d92 100644
--- a/net-misc/sstp-client/metadata.xml
+++ b/net-misc/sstp-client/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="gitlab">eivnaes/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.17.ebuild b/net-misc/sstp-client/sstp-client-1.0.17.ebuild
new file mode 100644
index 000000000000..57f15cf30687
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.17.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
+HOMEPAGE="http://sstp-client.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+
+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"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.12-remove-network-test.patch"
+	"${FILESDIR}/${PN}-1.0.12-fix-example.patch"
+
+	"${FILESDIR}/${PN}-1.0.17-fix-bashism-configure.ac.patch"
+)
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
+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
+}