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

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

6 files changed, 103 insertions, 16 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/Manifest b/net-misc/sslh/Manifest
index 868c0841e779..608161836b00 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX sslh.conf.d 98 RMD160 ff293afae15d1e1b63a9a0b3d1144031d9ebe1c4 SHA1 2c1d277974553def905023936d76c0c2f11d9c13 SHA256 5677dcb1adec893f62da723ce25bae903724d8ece5ff6117872c1dbdb361f290
-AUX sslh.init.d 465 RMD160 5013d3022b67c95415b006f7d5c881deffca7ec9 SHA1 74c75e3e521c9e0cbe0b3e790ab4b62679bc24da SHA256 5b8608078fd436e414c77622582485246a29cba4a54ee3c036d0c369be2b1627
-DIST sslh-1.10.tar.gz 25293 RMD160 9c2ab178ca64e865f79168279a1e54d8a56f2773 SHA1 73ec530abba29af6bb48dd56e3da1a9076085af1 SHA256 5554e42969a00955048b45d3d269785bbd0211d4fb2b4cf5e79503b592695771
-DIST sslh-1.9.tar.gz 21255 RMD160 e23b0a7cc2756f1425642f045816224ced0b6a02 SHA1 7c2fd8bab7d627b2481d1fafde0e9b15e143dd86 SHA256 c3546bd91ae420a78dad01418250effb56851adb5ff5a253574ffa2be1970930
-EBUILD sslh-1.10.ebuild 992 RMD160 58885866a734c6ce8a0bfded3e28de12c4594d48 SHA1 00cf6054b764c184a4ca9153e6804b626f0ffe75 SHA256 ff145bdad81b0827869283e46b8304f4ee2e2c0473bbcfc1e2c669139fd13182
-EBUILD sslh-1.9.ebuild 986 RMD160 b2ffe059f9f2306e276cf72132684f1f25617fcd SHA1 3c03081cc1c1ad26464e41b0c01dd5f10163d0aa SHA256 9a5e835f8ddd87edc55c45d739ded8dc8329c5a09e2a1e0f625a84d6c78c0a65
-MISC ChangeLog 961 RMD160 411b55da2734d64398eae9479793bfca7d72cefe SHA1 db3409f04063dd53876da126cc8697f117f9a91d SHA256 1071b18bb902212cfc2fe280f25d1293b3627af1061d9ef8126916bd495109db
-MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
+AUX sslh.conf.d 98 SHA256 5677dcb1adec893f62da723ce25bae903724d8ece5ff6117872c1dbdb361f290 SHA512 e602f18b39b4f1c9ccf11b056f849d5e8677fe3803bfc1e1a9e47e7c49c2f8593a00a07d0d6e26014f2ad8aef43e81a64d9bb56c5648bdd69c61c069c25fe7ba WHIRLPOOL 5b1c7d5b85c791ec1e5522f057a76311aecdf210da688fc8fd0e3bf6cde95595b8015aad5660035de3a4002a678919ebbac5221ff95ef051a14355d4e98780be
+AUX sslh.conf.d-2 289 SHA256 6893bb466a07b26b0acf830d26a4a5a2ac303969791817c81ccffbe33f75b17c SHA512 980ba0db1759d99156c7bbf750d66d322a9af5d20b1cd398c35f00fbc7ae29a58790dd3c561838f88c54b4611855b494aceb72f0a78c0c00590592e52c329ff6 WHIRLPOOL c10ffd788bbda9d423d2681e260e66e3b46e2459a06b7eb2d7b262998994d65011ac27c621269a0d4dcd933e2bfcb940f512c5c8794cce02e56286bc1a3e521a
+AUX sslh.init.d 465 SHA256 5b8608078fd436e414c77622582485246a29cba4a54ee3c036d0c369be2b1627 SHA512 fe64f4c06a5dcac7ea45e35e7b0af32e9be89af9ac9313756e8627fef7b3bd025111e75b696ac1664d2f62117d89a558d709e2248d19b9df742d151c206ddbe1 WHIRLPOOL d9505125c5bc9222b0dfe40a6026b4634a79e99011ef006c7d6976286838b9d5030eb2149ae4f401cfb41ddc9f5f8de96b74b8c466eedd30d403cbeb1e941467
+AUX sslh.init.d-2 515 SHA256 940d180db97a542ea3e4acb457496d4f06c460411dc4fc18fcfc3ff6d4dbf58a SHA512 3ce6603e165c214a781ac7402a36b56a16cd8cd44dd3713dad354d778e4cc402b03b112f97347f8446f5dbbba8841dc58c481b7fbcba80e4fd65bba3f1f4eb7b WHIRLPOOL 42d12b980743cc5e8b05ea4c8ede57414f7882c7f457f00777c8866c9cd1455895544c2c8b7adc84861e41f5f4893e715869cb7752de8929a98786804ed5a49e
+DIST sslh-1.10.tar.gz 25293 SHA256 5554e42969a00955048b45d3d269785bbd0211d4fb2b4cf5e79503b592695771
+DIST sslh-1.13b.tar.gz 30986 SHA256 e6493b53767b542652e99e64a1bceeded1d01a5e7a083fde9d67e7550f9c0eec SHA512 516d0e53875494137a44b30bb70985c505f44a73d19800a4fb64da9a7e9ec3ed13657310ad8848eb5f671b7e5e6a3703883b3b4f0d398e42491d618c7ead0504 WHIRLPOOL a025eccbdae638add41854df4dacf5cdde565b4160133bd3377f8af9ceeb0349d08de4426574fc1781ab9fb816076d62721bf707c1b6a097796f513fed42ab95
+DIST sslh-1.9.tar.gz 21255 SHA256 c3546bd91ae420a78dad01418250effb56851adb5ff5a253574ffa2be1970930
+EBUILD sslh-1.10.ebuild 992 SHA256 ff145bdad81b0827869283e46b8304f4ee2e2c0473bbcfc1e2c669139fd13182 SHA512 2c4d47df218e9f039a72d3bd0ba2e9a4c228cac4f8f19a305a9c6c26d6df2c5735e4ed8404575b8817fabea36bc0a92e7354d623959a6854cfd3d0a35c87c86c WHIRLPOOL f6516bf2d8a4819d989ecd51f2bb3dea8fe2332bd639e46f52f3367c538adb99ee9c8990d968b3e4dd09bf91e76a8319e2d424573530a1cfc261ee5d968cf2be
+EBUILD sslh-1.13.ebuild 1016 SHA256 f1dad63775c55592cd7000bab0fc792ae2e8fd1f9ab6b98513e535a58fbc075c SHA512 80310b5c546aee773d7bfc818ab22aa91b4fd6d5d29df23e033c9c3028a790cdebb51b24ac86d23c120432092f951ca65f801657462c8fcd811492c5f811c10f WHIRLPOOL 257b8d4e39bdfb8a04065a214c979fbc06d1c7db610d1f5a6dfe04c301997a0ae1f046034fe40878c47216be05b4e532aa443451b0417015797ddd3cda988918
+EBUILD sslh-1.9.ebuild 986 SHA256 9a5e835f8ddd87edc55c45d739ded8dc8329c5a09e2a1e0f625a84d6c78c0a65 SHA512 92830ebe7f6a37ce2444956def5db5d2ded27f2e445970ce4480850f9f4588ceb3a1a65abe1a60d0d303fd17579fce9c6f3c4cb16e3d55f296286a825dd916d7 WHIRLPOOL f27bf0192d76597419a0f588f8719606f09dab64f81d78db87eafef83cd9a84e2d8d92b2e5cad1b90ea067f835d927c6e27c55772beaa7b6b33badfe5f165aec
+MISC ChangeLog 1198 SHA256 2cba98981cfc9662151ff23fb4c4e2fc070e6bf4c3f744f99d833eb72bde3142 SHA512 dee9a156d3ae965bc505fe7d377afa61d71fe30405f4f9453aac83d26fe936524459f58b8c31b5bee2dec2440db43bc159c41fa4fa9c19807583a08162701a0e WHIRLPOOL 9f58110eaf2572b43d6a46014877ae7c446151e78f43712ab880b4601a2594cb2d2dac1d096961b8ec56b8aa89997d279420ce23a990839c7f3dc7a0e2c0e323
+MISC metadata.xml 207 SHA256 0f4131f48e720ed4f2e263ca18f58c37039504337a3571c131e86efc252b7aee SHA512 3bc937a6a26718c7bf65074d1453621bcbd90399c45198dac52e4e283b996ae1a0ae753c6e3a7346a29b7299aea51791a625bc44126493e02de8ed0e5bbc9ca6 WHIRLPOOL ea870335381074a993ce783194e8d2f4065cec66a5a4fab5aab8a5c10f734a72c3efddf24f5bdad269a6990c4be5731012c201c04ef0f6ea74254212800d7d1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/0TC0ACgkQVWmRsqeSphNkqgCdFmKa3tVdrhWvigERyjbWgUsj
-pLMAnRh+oCo9UZf1W4GZcfijWH8FHykP
-=sPhl
+iQEcBAEBAgAGBQJP9yt3AAoJEMbwO6tnXQ0sCYcH/1FwnS6W9+Db1jd+2Ic58zO2
+QEq3pz5sapskfCD15YU7++uw9x1aWGurfglP/e5OEsl2HdsLKM0rq1HR5u3MDben
+e/j33/M0M1Kh2+/AypZ/BS3esNX0qMF2AwBZh1wTtT/9/CjyUFVxk+qbp+dFajIg
+uyK6h3ajtlDScN84G9YlBv0EfgGxcAC4PgqElJW6c+zQblDejbmw7uuxdiqv97OC
+gURAsKUfQlTyfaYcd3vJiVslcCQ3PXnPGRe9K3YPM342jPUM9V9wYP5Ddl50C/zB
+ZSJf0lb8+i5QQyDCBzeIkF+jlvAe5fCzhIQWLaxBMKAgyPejt2mrn3Lzm3/2MP8=
+=FLPs
 -----END PGP SIGNATURE-----
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
+}