commit: 842a4c971269f100e28fb23b199e9ff6b7708a1b
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 21:05:10 2024 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 21:05:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842a4c97
net-misc/sslh: add 2.1.0
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
net-misc/sslh/Manifest | 1 +
net-misc/sslh/metadata.xml | 3 +++
.../sslh/{sslh-9999.ebuild => sslh-2.1.0.ebuild} | 20 ++++++++++++++------
net-misc/sslh/sslh-9999.ebuild | 20 ++++++++++++++------
4 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index a531724b8ac9..1e47e5b91c25 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1 +1,2 @@
DIST sslh-1.22c.tar.gz 146954 BLAKE2B
1870623634b625bb98787be27444403555262f8a9782573c9ed116e65df9e4518c062ef2e2a40fe7bb550f811518ccc2149a23c36deef6c156911b4c42e27473
SHA512
f13560fbe74b5b08e9b360985d6afd27f2c7e157d220919162e354f3711b90f43bb81f9bda341fb21fef2651acd488f52e9a04dc2da28861540f579e7ca798c4
+DIST sslh-2.1.0.tar.gz 212289 BLAKE2B
e85e330e1769cca54deb0dec601402c3d7d578722a2f5addd3ce3d178663d85a5dad9a1fa2e06e11758333f59b96e5cbf4886147ad1497de1f0fcfbe7b71fde2
SHA512
3fe2590c858132c536ce4142097b0c22d37a60f473a2247d2f2fdff5b4f511e1cffb57d8dc5ebddd36ab2a566ac0674172c4e96867b4c738d9ca463aa02ea11d
diff --git a/net-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml
index 80b7211a3ce1..5b1919ad8dd6 100644
--- a/net-misc/sslh/metadata.xml
+++ b/net-misc/sslh/metadata.xml
@@ -5,6 +5,9 @@
<email>[email protected]</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-9999.ebuild b/net-misc/sslh/sslh-2.1.0.ebuild
similarity index 84%
copy from net-misc/sslh/sslh-9999.ebuild
copy to net-misc/sslh/sslh-2.1.0.ebuild
index d00e3490d2df..1a3dc9b9f8e3 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-2.1.0.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
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
