summaryrefslogtreecommitdiff
path: root/net-misc/sslh
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/sslh')
-rw-r--r--net-misc/sslh/Manifest6
-rw-r--r--net-misc/sslh/metadata.xml3
-rw-r--r--net-misc/sslh/sslh-2.1.0.ebuild84
-rw-r--r--net-misc/sslh/sslh-9999.ebuild20
4 files changed, 105 insertions, 8 deletions
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 7a2fbd6150e0..cb49fd21975f 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,6 +1,8 @@
AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0830bbfaa1c2e4018ff480b625349372cc35ec47a1b10069cb5fd6a3c22d7e957e782c888c70b55 SHA512 31d482af0b3626f4b2f669f74a08fa6b6dfc310a40ab332cc3907306bd2fa5321f92e0e76af72c2ea185142f0d485578817e738737917b9c1764079070297e67
AUX sslh.init.d-3 270 BLAKE2B 98cc6c6ccc37a6e8af6d0e84356779e0f304e3d6f45f9fff53c3d1c870ff6b03ac780c04c29e4dce7d6aa3e4cdce365fb54228600e7ce70d9d32691202a5ffb5 SHA512 b919ae318c789ba3e5dd0f5df665a7421be791e89074b07ee00c47b3fe12475562eb5675bbb168c86388902bf50069e0d6f3e804a14666563de07a0a71075ee0
DIST sslh-1.22c.tar.gz 146954 BLAKE2B 1870623634b625bb98787be27444403555262f8a9782573c9ed116e65df9e4518c062ef2e2a40fe7bb550f811518ccc2149a23c36deef6c156911b4c42e27473 SHA512 f13560fbe74b5b08e9b360985d6afd27f2c7e157d220919162e354f3711b90f43bb81f9bda341fb21fef2651acd488f52e9a04dc2da28861540f579e7ca798c4
+DIST sslh-2.1.0.tar.gz 212289 BLAKE2B e85e330e1769cca54deb0dec601402c3d7d578722a2f5addd3ce3d178663d85a5dad9a1fa2e06e11758333f59b96e5cbf4886147ad1497de1f0fcfbe7b71fde2 SHA512 3fe2590c858132c536ce4142097b0c22d37a60f473a2247d2f2fdff5b4f511e1cffb57d8dc5ebddd36ab2a566ac0674172c4e96867b4c738d9ca463aa02ea11d
EBUILD sslh-1.22c-r1.ebuild 1902 BLAKE2B e99872913344bd8ded6857a29d3c9f9e182a17ef52876a1e7b239ffe734bc492ef5eb66dc55d49a6c4affd35cb664a9bddc94fcdbc8a8466c59e0d9bb844e79b SHA512 91e768617210ace3354b3a6a9c4da9a4c5a5e20d6d875556dfbe406a72465d8a4e951e73e5c7711a90bdfb79ae82faa724d808be94af16cf204e3b2a40302973
-EBUILD sslh-9999.ebuild 1904 BLAKE2B c4eec8bb9130f1228c6b17950ba315af9889ac2b256830cdfbc8aa19347a1a6a6592cf8caa935a2d201a959a1775dc05daed031621fc389c7ac3991b7062862d SHA512 eb02974691ff05c6ae81a47e633513a01d2f412e58d42a3d9938da6109d5c2e97870e509850f72a2da051207d7628cd205ec6f8f9f6af1a20d7faa13ac694c50
-MISC metadata.xml 389 BLAKE2B 4c59fa5cb419939b2acccf0107a7d0291ecd8f4f53327f59d060a8d1df3e0fec6bf766dd93f51053234f6b260d97c4005d8e71ef0b39aed7b7e5000c03ce004b SHA512 f75eb0261f6c5cf2d9624d687f069c3b2bcbdfdda33c240c2f963a143d62e6a540798500aa47ad4b51dee4256c5c3ced1edd4e17e8f42c325b03cf4ad5beb73b
+EBUILD sslh-2.1.0.ebuild 2068 BLAKE2B 6b5024971d2d6af50c2762c3a0decbc926ca4741db4cfa773c699430287d8417950675cfb6f6d6adc958885785578da9eb9e4014696c87283a73cb940e9485c9 SHA512 daefbbc40e2c6c637647800fa2a6213e0c89c08d9d3cdbdf8cc27d3da691f9b55e209e0e06255a12f371a11a16b0b95e6e45834b8faa563bbc2bfa12dffd7c6c
+EBUILD sslh-9999.ebuild 2068 BLAKE2B 6b5024971d2d6af50c2762c3a0decbc926ca4741db4cfa773c699430287d8417950675cfb6f6d6adc958885785578da9eb9e4014696c87283a73cb940e9485c9 SHA512 daefbbc40e2c6c637647800fa2a6213e0c89c08d9d3cdbdf8cc27d3da691f9b55e209e0e06255a12f371a11a16b0b95e6e45834b8faa563bbc2bfa12dffd7c6c
+MISC metadata.xml 482 BLAKE2B d2c26b25b184b90e3a7d85e81ceb0a0631fca8c267823a87f9302e91d40e80a31c23b184c572af1a32c5b02f86e62ec86efb7a39d5d2c01187e16dd6dc4e2f6c SHA512 3ba2f78c8498d79c318619ddf6e2b3ccd35821ead01dfd65bd2dbae95b1c7d66d7f16751221cceb1439db9629add3bb0538057feeacccc8caea3a0e5041e9184
diff --git a/net-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml
index 80b7211a3ce1..d8997e1a4379 100644
--- a/net-misc/sslh/metadata.xml
+++ b/net-misc/sslh/metadata.xml
@@ -5,6 +5,9 @@
<email>candrews@gentoo.org</email>
<name>Craig Andrews</name>
</maintainer>
+ <use>
+ <flag name="libev">Support event loops via <pkg>dev-libs/libev</pkg></flag>
+ </use>
<upstream>
<remote-id type="github">yrutschle/sslh</remote-id>
<remote-id type="cpe">cpe:/a:sslh_project:sslh</remote-id>
diff --git a/net-misc/sslh/sslh-2.1.0.ebuild b/net-misc/sslh/sslh-2.1.0.ebuild
new file mode 100644
index 000000000000..1a3dc9b9f8e3
--- /dev/null
+++ b/net-misc/sslh/sslh-2.1.0.ebuild
@@ -0,0 +1,84 @@
+# 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
+
+ # On older versions of GCC, the default gnu89 variant
+ # will reject within-for-loop initializers, bug #595426
+ # Furthermore, we need to use the gnu variant (gnu99) instead
+ # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+ # to be defined.
+ append-cflags -std=gnu99
+
+ 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
+ sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+ systemd_newunit scripts/systemd.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 d00e3490d2df..1a3dc9b9f8e3 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,19 +11,21 @@ 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
LICENSE="GPL-2"
SLOT="0"
-IUSE="caps systemd tcpd"
+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"
@@ -31,11 +33,11 @@ DEPEND="${RDEPEND}
RESTRICT="test"
src_prepare() {
- default
sed -i \
-e '/MAN/s:| gzip -9 - >:>:' \
-e '/MAN=sslh.8.gz/s:.gz::' \
- Makefile || die
+ Makefile.in || die
+ default
}
src_compile() {
@@ -51,13 +53,19 @@ src_compile() {
emake \
CC="$(tc-getCC)" \
USELIBCAP=$(usev caps) \
+ USELIBEV=$(usev libev) \
USELIBWRAP=$(usev tcpd) \
USESYSTEMD=$(usev systemd)
}
src_install() {
dosbin sslh-{fork,select}
- dosym sslh-fork /usr/sbin/sslh
+ if use libev; then
+ dosbin sslh-ev
+ dosym sslh-fork /usr/sbin/sslh
+ else
+ dosym sslh-fork /usr/sbin/sslh
+ fi
doman ${PN}.8
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 15:13:04 +0000