gentoo auto-resync : 09:12:2024 - 02:07:41

3 files changed, 80 insertions, 2 deletions

diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index abc72d4636c9..56cbcf3f94bb 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -2,6 +2,8 @@ AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0
 AUX sslh.init.d-3 270 BLAKE2B 98cc6c6ccc37a6e8af6d0e84356779e0f304e3d6f45f9fff53c3d1c870ff6b03ac780c04c29e4dce7d6aa3e4cdce365fb54228600e7ce70d9d32691202a5ffb5 SHA512 b919ae318c789ba3e5dd0f5df665a7421be791e89074b07ee00c47b3fe12475562eb5675bbb168c86388902bf50069e0d6f3e804a14666563de07a0a71075ee0
 AUX sslh.service 661 BLAKE2B d6a94b992745a1282a6ac9ba3d95395f708f703b1a22a591c03092243d5e73f87c177685d4d469ed96ef439aead22e505ba2f479107e640c3434af6536c2b866 SHA512 4fa63d43159c3f3f66bdecd087caf6a2677619dcd8baa65e97593f70c334efa5d5835e98ecf9771ad28e624c2b69b3798f1025014f4a70de65610caff8917694
 DIST sslh-2.1.2.tar.gz 214091 BLAKE2B 220841c7105032b02351b6073ffd994a22efb0241ebec96704bd2ec534197a19c366d925ebf07a494773e89d83df5f284567e34d419b887edb73545523abb71e SHA512 4f0b3c61e6153b912b11c49baba2df1a9df6732ea9fcdee628bf02043efc1b6505ac97eec97740c67d09f7d58a1bb79e0e06d949cb7fabcffa1fb91733372631
+DIST sslh-2.1.3.tar.gz 461954 BLAKE2B 93b84130077933fe05f825d19972b85bfb03abe09b6ee63a8dc31ba90076e55d9851155e2a9e4c1ed86a2350eb890e0daf7105a450f568b4f3db786b5f7abac3 SHA512 680ad2ac8c6e5fbbbee3973c7862533c12722f0633c7dc545cfea7873031a918d6a8529c707d2fa1ec097b7abe5420d9a11f9eb15c9d84e12a9a954fdb987dab
 EBUILD sslh-2.1.2-r1.ebuild 1707 BLAKE2B d35fd9bc8b3e785ba1e833c079306335f8d4d2119fc930e7f937a060e271023b620386ef3d3e87b8df07de262620f2fda6a9bef1e6c377561783a23613bcaf6f SHA512 4ecb6c54657eb23c236d7cb483b5d5a9b85f94d336c131ed5409876633790c04c901f42c50869ea8d40a6b943dcde6ca86f7dba8df4c6101b9f0234e5e75e912
-EBUILD sslh-9999.ebuild 1707 BLAKE2B d35fd9bc8b3e785ba1e833c079306335f8d4d2119fc930e7f937a060e271023b620386ef3d3e87b8df07de262620f2fda6a9bef1e6c377561783a23613bcaf6f SHA512 4ecb6c54657eb23c236d7cb483b5d5a9b85f94d336c131ed5409876633790c04c901f42c50869ea8d40a6b943dcde6ca86f7dba8df4c6101b9f0234e5e75e912
+EBUILD sslh-2.1.3.ebuild 1709 BLAKE2B 4871e72eb1802e9f03a2fbc0743f0f6e7005cd78f95fb9d33dccf396feb9f48ecbf073ca38e6292ad65ff22aea2ada0d90402c6969d93ff4faf00e814e172fab SHA512 27cf41bea808ddebc882a3005f57b076b58d8b505aa218927abebb7f256ad53f3c7a8a9f2f7f7b0597b668c73821809134089bfd5d166b3decc994b9f4c67acd
+EBUILD sslh-9999.ebuild 1709 BLAKE2B 4871e72eb1802e9f03a2fbc0743f0f6e7005cd78f95fb9d33dccf396feb9f48ecbf073ca38e6292ad65ff22aea2ada0d90402c6969d93ff4faf00e814e172fab SHA512 27cf41bea808ddebc882a3005f57b076b58d8b505aa218927abebb7f256ad53f3c7a8a9f2f7f7b0597b668c73821809134089bfd5d166b3decc994b9f4c67acd
 MISC metadata.xml 482 BLAKE2B d2c26b25b184b90e3a7d85e81ceb0a0631fca8c267823a87f9302e91d40e80a31c23b184c572af1a32c5b02f86e62ec86efb7a39d5d2c01187e16dd6dc4e2f6c SHA512 3ba2f78c8498d79c318619ddf6e2b3ccd35821ead01dfd65bd2dbae95b1c7d66d7f16751221cceb1439db9629add3bb0538057feeacccc8caea3a0e5041e9184
diff --git a/net-misc/sslh/sslh-2.1.3.ebuild b/net-misc/sslh/sslh-2.1.3.ebuild
new file mode 100644
index 000000000000..9e89e052625b
--- /dev/null
+++ b/net-misc/sslh/sslh-2.1.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
+	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S=${WORKDIR}/${P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps libev systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	dev-libs/libpcre2:=
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libconfig:=
+	libev? ( dev-libs/libev )
+	>=dev-libs/libconfig-1.5:="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile.in || die
+	default
+}
+
+src_compile() {
+	append-lfs-flags
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBCAP=$(usev caps) \
+		USELIBEV=$(usev libev) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	if use libev; then
+		dosbin sslh-ev
+		dosym sslh-fork /usr/sbin/sslh
+	else
+		dosym sslh-fork /usr/sbin/sslh
+	fi
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		systemd_newunit "${FILESDIR}/sslh.service" sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 453e5f7b10ac..9e89e052625b 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86"
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
 	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S=${WORKDIR}/${P}
 fi