From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 26 Jan 2018 15:48:02 +0000
Subject: gentoo resync : 25.01.2018
---
net-misc/sslh/Manifest | 5 ++-
net-misc/sslh/files/sslh.init.d-3 | 8 +++++
net-misc/sslh/sslh-1.19.ebuild | 76 +++++++++++++++++++++++++++++++++++++++
net-misc/sslh/sslh-9999.ebuild | 17 ++++++---
4 files changed, 100 insertions(+), 6 deletions(-)
create mode 100755 net-misc/sslh/files/sslh.init.d-3
create mode 100644 net-misc/sslh/sslh-1.19.ebuild
(limited to 'net-misc/sslh')
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 091d9086ed9a..8c214ef443c6 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -2,7 +2,10 @@ AUX sslh-1.18-systemd-generator.patch 603 BLAKE2B 87116f0332cc6d4076c8d6b4b14c89
AUX sslh-1.18-version-deps.patch 256 BLAKE2B edca1e2490081b845efc08867d5368e52bd72c7414db4fecd8b081e952f558f975cb9d0b1e5b9ca72875cc0abf216a2d0351c40e1e887bc1d983ce3652a9b71b SHA512 2f438df2777cf4811f7d33769a403f90d3cb7fc0b4e9eeeafe0cf2b29f203b3a0a0503729894103c0efde3ac1ff0d9253c7fd4b09627fedd3fefd18b595df87a
AUX sslh.conf.d-2 297 BLAKE2B c59d4eb8dfd4c2ed6f3a952cd2764c11aea21c1c62e5a4ffc584500cc29d62867d6852e700eb3e6c339f3456d39bcdff16a476dfdbe5705dea5934460769fa22 SHA512 580114cef9356d66ec1e6c306837d44dc3098e8f3f805eda20c5d8f81f087bf295b25801ee64ee2bc667ce7324f510ff6f4fc7e222d1431ec3d4e82bbcfb160f
AUX sslh.init.d-2 465 BLAKE2B eb34383ade0d3fe778d11d098129f5466df15816ca8eb8eb7c5b2cb8eebee91195b0e3e9f9be4fa5f941f8aacbfbb4d718876a8e8af0c9a13c6dcdf2dc6d104b SHA512 73b38af0142f6d591d71531e03aca3ddf625faa7825a9951dc31112fa1bca5b28f8074a3f9ca565b2cd3995b635cc7818d899ce099d64d2eb97ff9cab2e617ba
+AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a
DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea
+DIST sslh-v1.19.tar.gz 57352 BLAKE2B 004084ac726c2b0a12add00da017934aa46420370bdf0e56c19443aff0a25f232324f0140cae7a09b15e885d73fae498b8c51b4c7a3f4da219bddf4abb99b412 SHA512 851a9e89098baeeb8279298b1a04527fde80e5efb4bb64006e165479ff2d7ba24b5621a99754ff906fca8c167fc1fd0bcd4b80860c999f5b9cafa408769aa18c
EBUILD sslh-1.18-r2.ebuild 1753 BLAKE2B be4845b0cfa8e7360cee513a1c570e1f86c061d578344929fceaffc1f1006b358dd21ba2c4ced28b68934d3c868c36e8e3d471cecc91fc6306ebf20610aec4fa SHA512 a4a96c61476381f0870b0cef1278219d555e7b6c8760c078a4772ab26550163ec991b57797362bf885d07331d4ceac5294180e868dbf65af9e9122da7e467ef7
-EBUILD sslh-9999.ebuild 1822 BLAKE2B fff4484d47001abe61a2b8b2644f1a22d110c819b90910d4a96ba4bad9a78d858fdf32c3b5b84671171c975350fa4cc0bd436016a6540f4a105bff8811722b27 SHA512 027e715859cc789dbc180ea7a4dbd21580e54b05ffbb1c7b3372c3c05647c1e98f21cec1e88393908d342bfbd085cd7c5c5bded59e99ab376be89cdd3e98af04
+EBUILD sslh-1.19.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
+EBUILD sslh-9999.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/files/sslh.init.d-3 b/net-misc/sslh/files/sslh.init.d-3
new file mode 100755
index 000000000000..7f9d61795b73
--- /dev/null
+++ b/net-misc/sslh/files/sslh.init.d-3
@@ -0,0 +1,8 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Port multiplexer for ssh/ssl/etc..."
+command="sslh"
+pidfile="/run/${SVCNAME}.pid"
+command_args="${DAEMON_OPTS} --pidfile ${pidfile}"
diff --git a/net-misc/sslh/sslh-1.19.ebuild b/net-misc/sslh/sslh-1.19.ebuild
new file mode 100644
index 000000000000..3c1ac5f9f7f7
--- /dev/null
+++ b/net-misc/sslh/sslh-1.19.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="http://www.rutschle.net/tech/sslh.shtml"
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
+ MY_P="${PN}-v${PV}"
+ SRC_URI="http://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-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 8f3831fefa9b..3c1ac5f9f7f7 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="6"
inherit flag-o-matic systemd toolchain-funcs
@@ -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 ~sh x86"
+ KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
MY_P="${PN}-v${PV}"
SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
S=${WORKDIR}/${MY_P}
@@ -31,6 +31,14 @@ DEPEND="${RDEPEND}
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
@@ -51,12 +59,11 @@ src_install() {
dosbin sslh-{fork,select}
dosym sslh-fork /usr/sbin/sslh
- gunzip ${PN}.8.gz
doman ${PN}.8
dodoc ChangeLog README.md
- newinitd "${FILESDIR}"/sslh.init.d-2 sslh
+ newinitd "${FILESDIR}"/sslh.init.d-3 sslh
newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
if use systemd; then
--
cgit v1.2.3