Version bump wrt bug #424685. Take over maintainership of package.

(Portage version: 2.1.11.5/cvs/Linux x86_64)

5 files changed, 84 insertions, 5 deletions

diff --git a/net-misc/sslh/ChangeLog b/net-misc/sslh/ChangeLog
index ea5c84207fb7..7433dc1acb38 100644
--- a/net-misc/sslh/ChangeLog
+++ b/net-misc/sslh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/sslh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/ChangeLog,v 1.6 2012/07/04 13:59:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/ChangeLog,v 1.7 2012/07/06 18:16:19 kensington Exp $
+
+*sslh-1.13 (06 Jul 2012)
+
+  06 Jul 2012; Michael Palimaka <kensington@gentoo.org> +files/sslh.conf.d-2,
+  +files/sslh.init.d-2, +sslh-1.13.ebuild, metadata.xml:
+  Version bump wrt bug #424685. Take over maintainership of package.
 
   04 Jul 2012; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Set a maintainer.
@@ -27,4 +33,3 @@
   05 Mar 2010; Mike Frysinger <vapier@gentoo.org> +sslh-1.7a.ebuild,
   +files/sslh.conf.d, +files/sslh.init.d, +metadata.xml:
   Initial ebuild by Jiri Tyr #251296 and cleaned up by me.
-
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..719be7b8dd15
--- /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.
+#OPTIONS=""
+
+# Multiplexing example
+# Port 44 can be used for ssh, http, and https. Drop privileges after starting.
+#OPTIONS="-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 100755
index 000000000000..a00b0f26b778
--- /dev/null
+++ b/net-misc/sslh/files/sslh.init.d-2
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/files/sslh.init.d-2,v 1.1 2012/07/06 18:16:19 kensington Exp $
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--exec /usr/bin/sslh -- ${OPTIONS} \
+		--pidfile /var/run/sslh.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --retry 20 \
+		--pidfile /var/run/sslh.pid
+	eend $?
+}
diff --git a/net-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml
index d9cd2cad66c2..07339f6f0ce8 100644
--- a/net-misc/sslh/metadata.xml
+++ b/net-misc/sslh/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>kensington@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/sslh/sslh-1.13.ebuild b/net-misc/sslh/sslh-1.13.ebuild
new file mode 100644
index 000000000000..be49c0a625e4
--- /dev/null
+++ b/net-misc/sslh/sslh-1.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/sslh-1.13.ebuild,v 1.1 2012/07/06 18:16:19 kensington Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="SSLH lets one 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/${P}b.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tcpd"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libconfig"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e '/strip sslh/d' \
+		-e '/^LIBS=/s:$: $(LDFLAGS):' \
+		-e '/^CFLAGS=/d' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBWRAP=$(usev tcpd)
+}
+
+src_install() {
+	dobin sslh-{fork,select}
+	dosym sslh-fork /usr/bin/sslh
+	doman sslh.8.gz
+	dodoc ChangeLog README
+
+	newinitd "${FILESDIR}"/sslh.init.d-2 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+}