summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-09-15 16:32:15 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-09-15 17:10:27 +0200
commit26cee72e7c3639c5215bb6721991b6e891792ebf (patch)
treeddcf265aa44ee68842cc5edf9f71ca0ce3f99420 /net-misc
parentdev-vcs/vcsh: drop 1.20151229.1 (diff)
downloadgentoo-26cee72e7c3639c5215bb6721991b6e891792ebf.tar.gz
gentoo-26cee72e7c3639c5215bb6721991b6e891792ebf.tar.bz2
gentoo-26cee72e7c3639c5215bb6721991b6e891792ebf.zip
net-misc/sslh: drop versions
Closes: https://bugs.gentoo.org/867208 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/sslh/Manifest6
-rw-r--r--net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch92
-rw-r--r--net-misc/sslh/sslh-1.20-r2.ebuild76
-rw-r--r--net-misc/sslh/sslh-1.21-r2.ebuild75
-rw-r--r--net-misc/sslh/sslh-1.21b-r2.ebuild75
-rw-r--r--net-misc/sslh/sslh-1.21c-r2.ebuild75
-rw-r--r--net-misc/sslh/sslh-1.21c-r3.ebuild77
-rw-r--r--net-misc/sslh/sslh-1.22.ebuild74
-rw-r--r--net-misc/sslh/sslh-1.22b.ebuild74
9 files changed, 0 insertions, 624 deletions
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 66c7bd553da1..a531724b8ac9 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,7 +1 @@
-DIST sslh-1.21.tar.gz 111298 BLAKE2B 46003021292436023c7f2e0d9cbfb283f4ca7497f5da1562cb893a6f20df4ccaa1e6618fa2cdcc28f311518001396d861a5b50e36707327087192b0454f04287 SHA512 e758efc548b68ea4c50a56b6a6169f5c5bcfeb40163ff9968489ef6a3cdf2a69fa46869d1f53e24c6e31de4d44233005608dcf240968de6245653ccb068f692c
-DIST sslh-1.21b.tar.gz 111740 BLAKE2B 5d42eab551e05ac1367da9ae85eac945657e086672712c148ee07c78af5c2a546e696d77081c7282e77c8bef535c186f89d541489f07153bd7ca2d338b341a48 SHA512 59bd33b47b70f82ae1ba3d6ffac3d54897dc6b7343d0d9e3bb8384adc30ac8a44a64e71590a7eecc5a83c2f70712bd79c0eb4ea8eef15ae770633dead9888c5f
-DIST sslh-1.21c.tar.gz 111895 BLAKE2B 3ec7a4a4f8eb7ec3d22e9630070037ebef7df2cbe3657a38234573ecf4eb9f331914858f703690b094ddc1977cd80b3a5760b94004f35a2ec2c59761f6cd142e SHA512 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22
-DIST sslh-1.22.tar.gz 147013 BLAKE2B b23f0a9601a7ba5121a6407872aee2d4c26eab934187070ab7ea3f360e815db9681db46b4f9c7f3ad5efe5446a44e0213c1bd791ad38505668b1cb3fa981bdcd SHA512 59bc40778350efbd21f22b66ecf2926ee04987784b1772450f8ce52b8d4a4270cfa307e3c978db70d420a7c3909a2c26df0b2b6127671be90537e40240a42652
-DIST sslh-1.22b.tar.gz 146854 BLAKE2B abeafeb35274b7d7d2b8e86206c3922deb98390da2fe023045c90ef68fe5720294c873ccdf2aa8443cd1521138e0b7dfe44a505a86d50291b4f7e84347499fee SHA512 de5ba0d5f241fb4742813b5ae1a2fcc4b872aa7d9c6acf7105e6c153b3a0b19482cfe28c96aa33a2561b5bfe7da3490a9c0b59d35dbd102f80f7f3b5ab68d52e
DIST sslh-1.22c.tar.gz 146954 BLAKE2B 1870623634b625bb98787be27444403555262f8a9782573c9ed116e65df9e4518c062ef2e2a40fe7bb550f811518ccc2149a23c36deef6c156911b4c42e27473 SHA512 f13560fbe74b5b08e9b360985d6afd27f2c7e157d220919162e354f3711b90f43bb81f9bda341fb21fef2651acd488f52e9a04dc2da28861540f579e7ca798c4
-DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
diff --git a/net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch b/net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch
deleted file mode 100644
index ea2a625a1850..000000000000
--- a/net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 24e7f46a431b59043bf534eb7cdab76c4ffd595a Mon Sep 17 00:00:00 2001
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: [PATCH] fix for libconfig 1.7.3 (#292)
-
----
- sslh-conf.c | 50 +++++++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 88 insertions(+), 16 deletions(-)
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 5f55656..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -126,6 +126,14 @@ typedef int config_t;
- return 0; \
- }
-
-+enum {
-+ CONFIG_TYPE_INT,
-+ CONFIG_TYPE_BOOL,
-+ CONFIG_TYPE_INT64,
-+ CONFIG_TYPE_FLOAT,
-+ CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -134,10 +142,14 @@ make_config_setting_lookup(string);
-
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
-
-+config_setting_t* config_root_setting(config_t* c) {
-+ return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
- return NULL;
- }
-@@ -146,10 +158,38 @@ void config_init(config_t* c) {
- return;
- }
-
-+char* config_setting_name(config_setting_t* c) {
-+ return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+ return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+ return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+ return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+ return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
- return NULL;
- }
-
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+ return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+ return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
- return 0;
- }
-@@ -1792,7 +1832,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- }
- }
-
-- s = config_lookup(&c, "/");
-+ s = config_root_setting(&c);
-
- res = read_block(s, cfg, table_sslhcfg, &errmsg);
- if (!res) {
diff --git a/net-misc/sslh/sslh-1.20-r2.ebuild b/net-misc/sslh/sslh-1.20-r2.ebuild
deleted file mode 100644
index f9a1e233c7eb..000000000000
--- a/net-misc/sslh/sslh-1.20-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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"
- MY_P="${PN}-v${PV}"
- SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
- S=${WORKDIR}/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
- pcre? ( dev-libs/libpcre:= )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- >=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-RESTRICT="test"
-
-src_prepare() {
- default
- sed -i \
- -e '/MAN/s:| gzip -9 - >:>:' \
- -e '/MAN=sslh.8.gz/s:.gz::' \
- Makefile || die
-}
-
-src_compile() {
- # 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)" \
- USELIBPCRE=$(usev pcre) \
- USELIBCAP=$(usev caps) \
- USELIBWRAP=$(usev tcpd) \
- USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
- dosbin sslh-{fork,select}
- dosym sslh-fork /usr/sbin/sslh
-
- 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-1.21-r2.ebuild b/net-misc/sslh/sslh-1.21-r2.ebuild
deleted file mode 100644
index fa5062502fa5..000000000000
--- a/net-misc/sslh/sslh-1.21-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 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 pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
- pcre? ( dev-libs/libpcre:= )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- >=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-RESTRICT="test"
-
-src_prepare() {
- default
- sed -i \
- -e '/MAN/s:| gzip -9 - >:>:' \
- -e '/MAN=sslh.8.gz/s:.gz::' \
- Makefile || die
-}
-
-src_compile() {
- # 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)" \
- USELIBPCRE=$(usev pcre) \
- USELIBCAP=$(usev caps) \
- USELIBWRAP=$(usev tcpd) \
- USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
- dosbin sslh-{fork,select}
- dosym sslh-fork /usr/sbin/sslh
-
- 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-1.21b-r2.ebuild b/net-misc/sslh/sslh-1.21b-r2.ebuild
deleted file mode 100644
index fa5062502fa5..000000000000
--- a/net-misc/sslh/sslh-1.21b-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 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 pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
- pcre? ( dev-libs/libpcre:= )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- >=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-RESTRICT="test"
-
-src_prepare() {
- default
- sed -i \
- -e '/MAN/s:| gzip -9 - >:>:' \
- -e '/MAN=sslh.8.gz/s:.gz::' \
- Makefile || die
-}
-
-src_compile() {
- # 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)" \
- USELIBPCRE=$(usev pcre) \
- USELIBCAP=$(usev caps) \
- USELIBWRAP=$(usev tcpd) \
- USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
- dosbin sslh-{fork,select}
- dosym sslh-fork /usr/sbin/sslh
-
- 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-1.21c-r2.ebuild b/net-misc/sslh/sslh-1.21c-r2.ebuild
deleted file mode 100644
index fa5062502fa5..000000000000
--- a/net-misc/sslh/sslh-1.21c-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 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 pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
- pcre? ( dev-libs/libpcre:= )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- >=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-RESTRICT="test"
-
-src_prepare() {
- default
- sed -i \
- -e '/MAN/s:| gzip -9 - >:>:' \
- -e '/MAN=sslh.8.gz/s:.gz::' \
- Makefile || die
-}
-
-src_compile() {
- # 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)" \
- USELIBPCRE=$(usev pcre) \
- USELIBCAP=$(usev caps) \
- USELIBWRAP=$(usev tcpd) \
- USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
- dosbin sslh-{fork,select}
- dosym sslh-fork /usr/sbin/sslh
-
- 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-1.21c-r3.ebuild b/net-misc/sslh/sslh-1.21c-r3.ebuild
deleted file mode 100644
index e062ddf36cad..000000000000
--- a/net-misc/sslh/sslh-1.21c-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 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 pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
- pcre? ( dev-libs/libpcre:= )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- >=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-PATCHES=(
- "${FILESDIR}/${P}-libconfig-1.7.3.patch"
-)
-RESTRICT="test"
-
-src_prepare() {
- default
- sed -i \
- -e '/MAN/s:| gzip -9 - >:>:' \
- -e '/MAN=sslh.8.gz/s:.gz::' \
- Makefile || die
-}
-
-src_compile() {
- # 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)" \
- USELIBPCRE=$(usev pcre) \
- USELIBCAP=$(usev caps) \
- USELIBWRAP=$(usev tcpd) \
- USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
- dosbin sslh-{fork,select}
- dosym sslh-fork /usr/sbin/sslh
-
- 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-1.22.ebuild b/net-misc/sslh/sslh-1.22.ebuild
deleted file mode 100644
index 9ecf187a6416..000000000000
--- a/net-misc/sslh/sslh-1.22.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 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 systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
- dev-libs/libpcre2:=
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- >=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-RESTRICT="test"
-
-src_prepare() {
- default
- sed -i \
- -e '/MAN/s:| gzip -9 - >:>:' \
- -e '/MAN=sslh.8.gz/s:.gz::' \
- Makefile || die
-}
-
-src_compile() {
- # 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) \
- USELIBWRAP=$(usev tcpd) \
- USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
- dosbin sslh-{fork,select}
- dosym sslh-fork /usr/sbin/sslh
-
- 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-1.22b.ebuild b/net-misc/sslh/sslh-1.22b.ebuild
deleted file mode 100644
index 9ecf187a6416..000000000000
--- a/net-misc/sslh/sslh-1.22b.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 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 systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
- dev-libs/libpcre2:=
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- >=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-RESTRICT="test"
-
-src_prepare() {
- default
- sed -i \
- -e '/MAN/s:| gzip -9 - >:>:' \
- -e '/MAN=sslh.8.gz/s:.gz::' \
- Makefile || die
-}
-
-src_compile() {
- # 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) \
- USELIBWRAP=$(usev tcpd) \
- USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
- dosbin sslh-{fork,select}
- dosym sslh-fork /usr/sbin/sslh
-
- 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
-}