reinit the tree, so we can have metadata

7 files changed, 153 insertions, 0 deletions

diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
new file mode 100644
index 000000000000..8521ed2721b4
--- /dev/null
+++ b/net-misc/sslh/Manifest
@@ -0,0 +1,9 @@
+AUX sslh-1.18-systemd-generator.patch 603 SHA256 ae201388a020857df2ff4940847823ed1195fec8b282bdbc81e74e73da36c91d SHA512 71bfc4fe78d7b2b1c6a131533029c1ad9a676989ca9821e1c798109c9f9ce43809ad504aac262a20ed7babd3349485887947f9ccb26cba1803fe3fbd0afe79b9 WHIRLPOOL 9e7928c21caf655c5c2314bf8eb3d6e6b8f5711cfa40580731fb193681d782ef66dec6139aa3a60531feb4305727f6f3a5563341833f8224e27095f805c2fbc4
+AUX sslh-1.18-version-deps.patch 256 SHA256 28929f54167321a79633a941a5dd0fdbb3e8a1afb4c6c471684ec0193ef15b16 SHA512 2f438df2777cf4811f7d33769a403f90d3cb7fc0b4e9eeeafe0cf2b29f203b3a0a0503729894103c0efde3ac1ff0d9253c7fd4b09627fedd3fefd18b595df87a WHIRLPOOL 72247c30fde1eb2b4a1e950caf5018714d7be06dbfc242c813a5cf6aaf12e6703ed0c0e58693c51cbc83dafcf7fe512b3a626d5395f3abd1f1c909751df9fc40
+AUX sslh.conf.d-2 297 SHA256 c7308d651779d45496f06945c6f82a0dfda7afae87e891d23b7b5ff8788d1b5d SHA512 580114cef9356d66ec1e6c306837d44dc3098e8f3f805eda20c5d8f81f087bf295b25801ee64ee2bc667ce7324f510ff6f4fc7e222d1431ec3d4e82bbcfb160f WHIRLPOOL e2e918f19143285cd6d99e009586cc0ef55406e2f732a415db30ce20715e469a660916717832f4ee73446a47556e30026dee28c1adcbd2c8100e1eeb871d8129
+AUX sslh.init.d-2 465 SHA256 bad892b6670bf5845efce0c6fc66c8086ae723b3ef05eb4eaf1025db0fa200fe SHA512 73b38af0142f6d591d71531e03aca3ddf625faa7825a9951dc31112fa1bca5b28f8074a3f9ca565b2cd3995b635cc7818d899ce099d64d2eb97ff9cab2e617ba WHIRLPOOL 0a1ae96c4b3189b32dccf1f6db547890f6ef236c99e7a851bd40fae39a4d75293eb227871ed9c2daf3569ea6fe2556f68fe896db0bbad5ba731ea0a41092545c
+DIST sslh-v1.18.tar.gz 53170 SHA256 1601a5b377dcafc6b47d2fbb8d4d25cceb83053a4adcc5874d501a2d5a7745ad SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea WHIRLPOOL 31ab991527072c6304770b40ad07ce62ad8642e4697ac1cbeadd9f6226522f40b858d0dc6657578df3adba0f92d8f85fd38ece199f347eec352f3a831c131b35
+EBUILD sslh-1.18-r2.ebuild 1753 SHA256 975af1b94e956dc44502a20f472bd9c57dc5c7d2bfccba877964ddbf61bba27e SHA512 a4a96c61476381f0870b0cef1278219d555e7b6c8760c078a4772ab26550163ec991b57797362bf885d07331d4ceac5294180e868dbf65af9e9122da7e467ef7 WHIRLPOOL 5c5d6c0440f76a18256356c210fa869383931babc89234c71ab404360423a562bad073bb98f488a59ed95661dba7efdb395461c64b8494d115e0ee7a87d8b688
+MISC ChangeLog 4975 SHA256 599cf7248907b2777ce6aada40eca92996224f3fb9c152dd0ceffec7c869e9d8 SHA512 85ea146e9f6b54e0481fbcd8fbd1697d5f39a8f570350ff0d3d66de47261d9ed6d5e6e54914f4d6ad4432c6a044abfe63e63109ab3e22c8278d2f2acb0c62936 WHIRLPOOL 1240ae36c1448daec29c3cc545db347e18fe3d14cd14ff61f871244e98e28dab37d14c707653506aa76cc96c5a5fa6744e002dc40804c3a497f29fe77c8b678d
+MISC ChangeLog-2015 3320 SHA256 067a519e67e6bd2e27b65d2f5a73d02e0b3123826f305bdc95bd2f440ee336ad SHA512 48e5cd5472f692709b4c96ae1ef8bb130b540f0f48f85f64328d93fa5cd774e15ac1fff0c913bb83cad604ba2a599f0706133748fd909a2146c2e041f59a6207 WHIRLPOOL 78b3969b488b1a89853b3458bee2954b18915b569159a8e8b3a66cf16ed11a7317172b387fb06ec10ddc72d7fbcde7d718e1f99e643573c71c899c9cf246993c
+MISC metadata.xml 221 SHA256 c73636a70f6ee6e176f71ac32048a002355627ef4f1181fb245c6c0eb39be8b8 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353 WHIRLPOOL 8e35f4dca402d63d64baae4aba21722f8daccb3a61861a0b453cb355305fb29dc8e9d1e1760eb2f13d264502aaaafc37d15258338e97dbb4aea15239944f25d6
diff --git a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
new file mode 100644
index 000000000000..476de2a4c1e1
--- /dev/null
+++ b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
@@ -0,0 +1,26 @@
+https://patch-diff.githubusercontent.com/raw/yrutschle/sslh/pull/98
+--- a/Makefile
++++ b/Makefile
+@@ -27,6 +27,8 @@ CFLAGS ?=-Wall -g $(CFLAGS_COV)
+ LIBS=
+ OBJS=common.o sslh-main.o probe.o tls.o
+ 
++CONDITIONAL_TARGETS=
++
+ ifneq ($(strip $(USELIBWRAP)),)
+ 	LIBS:=$(LIBS) -lwrap
+ 	CPPFLAGS+=-DLIBWRAP
+@@ -54,10 +56,11 @@ endif
+ ifneq ($(strip $(USESYSTEMD)),)
+         LIBS:=$(LIBS) -lsystemd
+         CPPFLAGS+=-DSYSTEMD
++	CONDITIONAL_TARGETS+=systemd-sslh-generator
+ endif
+ 
+ 
+-all: sslh $(MAN) echosrv
++all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS)
+ 
+ .c.o: *.h
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
diff --git a/net-misc/sslh/files/sslh-1.18-version-deps.patch b/net-misc/sslh/files/sslh-1.18-version-deps.patch
new file mode 100644
index 000000000000..c6108ffb1e9c
--- /dev/null
+++ b/net-misc/sslh/files/sslh-1.18-version-deps.patch
@@ -0,0 +1,15 @@
+Make sure the files using version.h depend on it being generated first.
+
+Gentoo-bug: 594586
+
+--- a/Makefile
++++ b/Makefile
+@@ -59,7 +59,7 @@
+ 
+ all: sslh $(MAN) echosrv
+ 
+-.c.o: *.h
++%.o: %.c *.h version.h
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ version.h:
diff --git a/net-misc/sslh/files/sslh.conf.d-2 b/net-misc/sslh/files/sslh.conf.d-2
new file mode 100644
index 000000000000..73d08d5f4484
--- /dev/null
+++ b/net-misc/sslh/files/sslh.conf.d-2
@@ -0,0 +1,8 @@
+# /etc/conf.d/sslh
+
+# Options to sslh itself.  See the sslh(1) man page.
+#DAEMON_OPTS=""
+
+# Multiplexing example
+# Port 44 can be used for ssh, http, and https. Drop privileges after starting.
+#DAEMON_OPTS="-p localhost:44 --ssh 127.0.0.1:22 --http 127.0.0.1:80 --ssl 127.0.0.1:443 --user nobody"
diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2
new file mode 100644
index 000000000000..7e4b2cb578a4
--- /dev/null
+++ b/net-misc/sslh/files/sslh.init.d-2
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--pidfile /var/run/${SVCNAME}.pid \
+		--exec /usr/sbin/sslh -- \
+			${DAEMON_OPTS} \
+			--pidfile /var/run/${SVCNAME}.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --retry 20 \
+		--pidfile /var/run/${SVCNAME}.pid
+	eend $?
+}
diff --git a/net-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml
new file mode 100644
index 000000000000..69570e849328
--- /dev/null
+++ b/net-misc/sslh/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/sslh/sslh-1.18-r2.ebuild b/net-misc/sslh/sslh-1.18-r2.ebuild
new file mode 100644
index 000000000000..4779d7c31e0b
--- /dev/null
+++ b/net-misc/sslh/sslh-1.18-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-v${PV}"
+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"
+SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
+IUSE="caps 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"
+
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.18-version-deps.patch"
+	"${FILESDIR}/${PN}-1.18-systemd-generator.patch"
+)
+
+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
+
+	gunzip ${PN}.8.gz
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-2 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
+}