From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- net-misc/sslh/Manifest | 10 ++--- net-misc/sslh/sslh-1.20-r1.ebuild | 76 -------------------------------------- net-misc/sslh/sslh-1.20-r2.ebuild | 76 ++++++++++++++++++++++++++++++++++++++ net-misc/sslh/sslh-1.21-r1.ebuild | 75 ------------------------------------- net-misc/sslh/sslh-1.21-r2.ebuild | 75 +++++++++++++++++++++++++++++++++++++ net-misc/sslh/sslh-1.21b-r1.ebuild | 75 ------------------------------------- net-misc/sslh/sslh-1.21b-r2.ebuild | 75 +++++++++++++++++++++++++++++++++++++ net-misc/sslh/sslh-1.21c-r1.ebuild | 75 ------------------------------------- net-misc/sslh/sslh-1.21c-r2.ebuild | 75 +++++++++++++++++++++++++++++++++++++ net-misc/sslh/sslh-9999.ebuild | 9 ++--- 10 files changed, 310 insertions(+), 311 deletions(-) delete mode 100644 net-misc/sslh/sslh-1.20-r1.ebuild create mode 100644 net-misc/sslh/sslh-1.20-r2.ebuild delete mode 100644 net-misc/sslh/sslh-1.21-r1.ebuild create mode 100644 net-misc/sslh/sslh-1.21-r2.ebuild delete mode 100644 net-misc/sslh/sslh-1.21b-r1.ebuild create mode 100644 net-misc/sslh/sslh-1.21b-r2.ebuild delete mode 100644 net-misc/sslh/sslh-1.21c-r1.ebuild create mode 100644 net-misc/sslh/sslh-1.21c-r2.ebuild (limited to 'net-misc/sslh') diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index 93cfe04b8a07..e0deaa2c3ba7 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -4,9 +4,9 @@ DIST sslh-1.21.tar.gz 111298 BLAKE2B 46003021292436023c7f2e0d9cbfb283f4ca7497f5d DIST sslh-1.21b.tar.gz 111740 BLAKE2B 5d42eab551e05ac1367da9ae85eac945657e086672712c148ee07c78af5c2a546e696d77081c7282e77c8bef535c186f89d541489f07153bd7ca2d338b341a48 SHA512 59bd33b47b70f82ae1ba3d6ffac3d54897dc6b7343d0d9e3bb8384adc30ac8a44a64e71590a7eecc5a83c2f70712bd79c0eb4ea8eef15ae770633dead9888c5f DIST sslh-1.21c.tar.gz 111895 BLAKE2B 3ec7a4a4f8eb7ec3d22e9630070037ebef7df2cbe3657a38234573ecf4eb9f331914858f703690b094ddc1977cd80b3a5760b94004f35a2ec2c59761f6cd142e SHA512 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a -EBUILD sslh-1.20-r1.ebuild 1929 BLAKE2B eba93f9518e5dff10b6cf1e41922457f3527a8c2c8b00170125166fdfae56839a0a24c93c83c2e1a0a8b23f294c312d493a1bd821362a8f5ad535e277057c50c SHA512 1d1734e8b1dce6c26c619402a7194e3386130c48f5392b785f0eef43b80f24f344acb2eaab43fb4b495980e94383c1ced53f4d88027f09c6c3d35d32b95fb1f1 -EBUILD sslh-1.21-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829 -EBUILD sslh-1.21b-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829 -EBUILD sslh-1.21c-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829 -EBUILD sslh-9999.ebuild 1949 BLAKE2B 79a3ece7a5661b89708ac99bca1ad206bd5ca7e997551fd1393f4c75510fe7ce73e2196093fa25dfad3a324285925a2b32a26f34fc35cdad02789a5a92b823fa SHA512 55998165014dc2ce31124206fc9248bfbfdb1bc5ed0f4c66d78bad67fa51591780ac6c2face08bc0f3ef31bb628f945b69e714abee27ce9aed9ffee1f47a3834 +EBUILD sslh-1.20-r2.ebuild 1929 BLAKE2B 1cc0b4554e89aee8e7cde80da933824674a4ebf926bbc7fbf94186cb06e367ba4422949e20bb90f4dab2d85ad1ad59b613507b37b47df9d905254bdc0f80dea5 SHA512 4a9288d4dea17c0dd6ffab5ea1219b37f77c61675ca61a4baf443119c0543b3fae48c48923fc3b75653ffc01d340c302059d88abd96ae6aa89c3984fdb0d662f +EBUILD sslh-1.21-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf +EBUILD sslh-1.21b-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf +EBUILD sslh-1.21c-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf +EBUILD sslh-9999.ebuild 1907 BLAKE2B b162585a30d535683f62186a3347496908b8593afc64e97ccf2503cfa2f3683c6dbe7567e31285fd5696e70d72c1395d3ee949afbc199f8577b6df1a9ea6ea39 SHA512 822016551a1f66789e1d76e2f5b71f2fed705d03711251564568577791d24617a7fc852eb27d38ea674d38ff30d7bcdd5caa543a251d7d52029f509c85bab514 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da diff --git a/net-misc/sslh/sslh-1.20-r1.ebuild b/net-misc/sslh/sslh-1.20-r1.ebuild deleted file mode 100644 index 55f5f8809262..000000000000 --- a/net-misc/sslh/sslh-1.20-r1.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 ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl - pcre? ( dev-libs/libpcre:= )" - -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.20-r2.ebuild b/net-misc/sslh/sslh-1.20-r2.ebuild new file mode 100644 index 000000000000..f9a1e233c7eb --- /dev/null +++ b/net-misc/sslh/sslh-1.20-r2.ebuild @@ -0,0 +1,76 @@ +# 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-r1.ebuild b/net-misc/sslh/sslh-1.21-r1.ebuild deleted file mode 100644 index db0cf15ce9e6..000000000000 --- a/net-misc/sslh/sslh-1.21-r1.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 ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl - pcre? ( dev-libs/libpcre:= )" - -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 new file mode 100644 index 000000000000..fa5062502fa5 --- /dev/null +++ b/net-misc/sslh/sslh-1.21-r2.ebuild @@ -0,0 +1,75 @@ +# 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-r1.ebuild b/net-misc/sslh/sslh-1.21b-r1.ebuild deleted file mode 100644 index db0cf15ce9e6..000000000000 --- a/net-misc/sslh/sslh-1.21b-r1.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 ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl - pcre? ( dev-libs/libpcre:= )" - -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 new file mode 100644 index 000000000000..fa5062502fa5 --- /dev/null +++ b/net-misc/sslh/sslh-1.21b-r2.ebuild @@ -0,0 +1,75 @@ +# 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-r1.ebuild b/net-misc/sslh/sslh-1.21c-r1.ebuild deleted file mode 100644 index db0cf15ce9e6..000000000000 --- a/net-misc/sslh/sslh-1.21c-r1.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 ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl - pcre? ( dev-libs/libpcre:= )" - -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 new file mode 100644 index 000000000000..fa5062502fa5 --- /dev/null +++ b/net-misc/sslh/sslh-1.21c-r2.ebuild @@ -0,0 +1,75 @@ +# 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-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild index 81bb80b2588f..d0a8689cff13 100644 --- a/net-misc/sslh/sslh-9999.ebuild +++ b/net-misc/sslh/sslh-9999.ebuild @@ -18,16 +18,16 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="caps pcre systemd tcpd" +IUSE="caps systemd tcpd" RDEPEND="caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" + >=dev-libs/libconfig-1.5:= + dev-libs/libpcre2:=" DEPEND="${RDEPEND} dev-util/conf2struct - dev-lang/perl - pcre? ( dev-libs/libpcre:= )" + dev-lang/perl" RESTRICT="test" @@ -49,7 +49,6 @@ src_compile() { emake \ CC="$(tc-getCC)" \ - USELIBPCRE=$(usev pcre) \ USELIBCAP=$(usev caps) \ USELIBWRAP=$(usev tcpd) \ USESYSTEMD=$(usev systemd) -- cgit v1.2.3