Restore ebuild for 3.x branch (again), see bug 193770 why this is still useful. Update ebuild to EAPI 5.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 81 insertions, 16 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 7ad5304f1b98..d2ce92667e83 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.147 2013/07/21 17:54:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.148 2013/08/02 15:16:04 ulm Exp $
+
+  02 Aug 2013; Ulrich Müller <ulm@gentoo.org> +stunnel-3.26.ebuild,
+  +files/stunnel-3.26-gentoo.diff:
+  Restore ebuild for 3.x branch (again), see bug 193770 why this is still
+  useful. Update ebuild to EAPI 5.
 
   21 Jul 2013; Agostino Sarubbo <ago@gentoo.org> stunnel-4.56-r1.ebuild:
   Stable for sparc, wrt bug #460278
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 9d0dcae11892..7ff7b754a3dd 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX stunnel-3.26-gentoo.diff 941 SHA256 e2a9fab361699b01ccd004ef598bb868d5f6f37bd40d05b7a16a97cd9ecee2f2 SHA512 73461f59505ee6583e7ba0f7422f1bf3e1cbec6349497ef77bf7987b0c4c8c87bbafdd1c6256c47aa24e3577d5198ce0347f32880f7c0ac48604cfc720137a0f WHIRLPOOL 478ac545efd0c77ef0cc130637788a56b861bf6f203f14319f589086bcbbaebbacd13bac087dafcf8d62cd9ad66ed52a1b608d66b66b66e648c953084c37dbf7
 AUX stunnel-4.44-listen-queue.diff 2205 SHA256 5b94f4b1b2e1daec6a4f28fccf2bbc738581fdb7efcf700d9394af71e5d734fa SHA512 9df8ec5ade5bafea935b73b76d9528146757db4f53b1304188399e3194161b0394d92458c8f5573af69270f08fb9c2c649b6e513bcb98853e8f13f6be1fc04d2 WHIRLPOOL 8356ce215b9f2bb8a9e3359dedcff186d787f44ac46c1699f47662df739cd5235796987961b88569425b29aaff9d030b95601d9f4265574207497546bb94d16c
 AUX stunnel-4.44-xforwarded-for.diff 11232 SHA256 0bdef230b03c2086992bc0e4e8e11bd625695bafc56f222d3a3ed69de34706ee SHA512 77eb690496703740e4b3029121f61a0ebfcfe32c3e2074f833f966dcc5815dcc212d50d36f28fbe8c6fc1afabff18148027e794cf0e70c8d7b920654a10c24af WHIRLPOOL 5ba1f44ccb208ec0b2c08a5c17a9a22cdf52c58a541b69c0f43dd4016f206e185aa49a8041a57119e1eb9107b8dfbebd346e344fe24526c80a6e7a960b8892c9
 AUX stunnel-4.54-listen-queue.patch 1604 SHA256 ff89533cad18aa644c4761f7fbd254d368605f12b2f5d9bda30e61b61805c6f0 SHA512 bc5a420697f5ef16fb0afd9ca7820ae90407bb2ddf8e428bc09876ce15d7ac59487d08f7ae332214a7fcb3416cf21b361a29b716c597fce464d5064596ba3d48 WHIRLPOOL c6fc601de22a8863c1ff9397ebef28819721aef09e4b9482103ea8a7e8668cbb01d9b00920f7bb712573195da997cfda36c9bba7d238e9683b10348f62573e1a
@@ -11,28 +12,27 @@ AUX stunnel.conf 1423 SHA256 be8deb0e051f594e14c898c2ec8a4a6879adcd48a5628609365
 AUX stunnel.initd 1986 SHA256 4f97093f81b854099851ba32552b36036906933933f7a794c7b1e6aa1c006e3b SHA512 8d764b0687d0d219e30dd489c6f16da20f8bac9d9797d2de937368e03fb18ddfec6c69c6e4bfdafb8bd8e7d751984c34a4351ce2ec1521bf2082fdc5f661f031 WHIRLPOOL 4d1cc28389b8d7b5e2ad16ea7e4b2e8b35ad634e4f8680a6d725389684f44cdc0aff633785d7ada6272c17891869a9b05484717dc296f7a79940ddbc975bec4e
 AUX stunnel.initd-start-stop-daemon 1401 SHA256 65297430933a971e4c96b62666c478b6f37dfd1be5422d1b42fbfa117f445ae9 SHA512 413c6be816bd4e27cdc573a89968362cddcc77d211f745c8e9e3cb86e6a8d44ed54ddf191fda1857e5f99331412a215b80437f52edb4f8029dd05090659cae81 WHIRLPOOL f082360b92bc6870140af22790c161706635022730e1be1dd1f4aa55ba5516b7d2a93a30188b95d3827969faab1c63d61eeaa5925bc4f97f2412fd100e1e765f
 AUX stunnel.rc6 779 SHA256 b2128e3bfe38485ef4afad35b57d8711666281087f3fcf920d5d313642e06dea SHA512 f603be13b92e5221dcedb5715f166d8ab57a1b2e76594bbe9a6ef6adacd033f13daad639be214c0304d42b37963b081b69d8cfe383aa2eb431aade28a09e46cb WHIRLPOOL 6c202615995368bfc2b68769f78e4a12b7331409ac2ebf1f732e17068df3f7268e98b9292b862fa6699c7d1a414427c38515000c7c2294c8af75d7b028061317
+DIST stunnel-3.26.tar.gz 228923 SHA256 d2a55b089d46d14bc4b456bb1927303492dab6649867c67a005d2c9d1ededfb3 SHA512 5eb5abc7c74af00a36163ea43b1e8bd9072d4b5aa15c22d48f48252b1c9d0e2fd6ad8a9b7ce49bfa57ce88babb968ee17491bc64049f731f5e6a09675c75399a WHIRLPOOL dadc4fef2442a00e02952368f6245b11fcd53357ec3ce7a95e86e8c7f2a6ba2985bfce39e1c4f577b43254d68716319ce32a38fd3627d8f0f9539d6f1b515b05
 DIST stunnel-4.44.tar.gz 568861 SHA256 fa0dfc33f323abfbc94aa993d90d37481cd2f652ee93ec2f8c333ac7a496c7b9 SHA512 439036efc4d2ad12b8412e7c78670fcca1a8650f822bd9b6bde61003d24671794514b79fa14e1b6ff2776ba992be044d4c4beafd3ab5e345c1a699fa5e003a55 WHIRLPOOL d003aec5b06beb0192b963c23c714bf145297b46fcff94e7c6e3920ec87590ec3ca079bfde4efd1156363efe9643773fa783fc2510fe271f27942d0871d46c1f
 DIST stunnel-4.54.tar.gz 535202 SHA256 b7e1b9e63569574dbdabee8af90b8ab88db3fe13dcb1268d59a1408c56e6de7b SHA512 50533d7d7c33788aadc353321d96935dc41d078a096076d007238b9890fcb32a0d0c99bc69415c4e77122ce37fbfcd2c527b2fc37bc903f3b044ccff341880fd WHIRLPOOL 7efd8fe6bc3ae62a51cacfee2febbe2f28e71761100c0b6f80fe629792953333fa4971ac6fcb9816076f80410aec5e0e3b70bf179f4c8454bbd2916127e1e0d6
 DIST stunnel-4.56.tar.gz 540032 SHA256 9cae2cfbe26d87443398ce50d7d5db54e5ea363889d5d2ec8d2778a01c871293 SHA512 1d708d574b6e2886fb0553081166f7b90e8572a8ccf7e7bf8d7ec13c8f8f760e93f3a2b9eab78a35ba0eeb5750d7c7e328a98dd428e915176c78a2250453dc15 WHIRLPOOL 232e4f321fbe4d8dd33e268f3c8fa878c09239827599e0f1b742a2dd7e9c84ff7dcfcbf56db90f93ea14af07a98db319e8d5e0c60bbcac0c2a8e383b34f5e166
+EBUILD stunnel-3.26.ebuild 733 SHA256 15db76680362eb5ffd7ff35e56bbd909e4c52984cf61bbab775e72592200cee3 SHA512 7c3468d309b8c1a348396fe38776f705c29d818c727161a9df1e1534896bfc3fe6c477384991dc21048956bebe69742fe02fbe88ea82fe83b244e66b3a55d5bc WHIRLPOOL 62f01d3407d4d4b789d62c68e1b9908bafb9cc52dbb3e31241af483b10f01e19695eb2dc064e832d8507097430b95e0b0101efc0625670dcd616b42b9ba5d474
 EBUILD stunnel-4.44.ebuild 2261 SHA256 2478f1a96da39456e398bd20ff24b83973c5d399543ac30f559ff2af6e91fceb SHA512 be43d44c9d9d165bc52a4b0af0ddaf069e7b55e745dc239dc0d83f481e48fc2e4b0d7d51ef47185d1da27a8e02582f7870b0d289513170c5b92376703c415bf8 WHIRLPOOL 9b62493987844651b7993187d817f0d48d25d21c7215f876816bdefb1efae036db2fd2d04fceea5feef0f0c029db6c3ea29090fd7a6731f4a5e2fb5617fbd5cf
 EBUILD stunnel-4.54.ebuild 2344 SHA256 20ef28efb3e7a82262c91ac2c2cf623550547c50f0f48214e18ef28cc5edbb93 SHA512 6d0f50e6852fba738cf093eebed4bf01270a8d199d76168d83dac641f10cb6842c1213eba235e7e1229ca5d684730dedd5d3009b7f85895149d1b66cd5aada2f WHIRLPOOL d7f2b67758dce5252b12ab879ed072642db51feba0f7e12b3db225212362e71d817fcecc2f253dad58bafba434f77c3bad9cc915917a08047381391b67b3ca47
 EBUILD stunnel-4.56-r1.ebuild 2248 SHA256 f46412492ce6364ebe848668546958f731e45aefa97b81a9acdb8609b7747500 SHA512 44983a0ac1849a2c3de67618848c6f3c49483f33eacd828003f815d7e204167b4c455c9f02e1a576237cba5597d819a86b8290bf36408500fa408b0e5ff13ff1 WHIRLPOOL 5f9628837a9462748eca6ba3fd032d18e589243e01c37cc10551ffec65a8e7c83eb72d810112f7aa370177d85ad90c3dd72844717f496059abfac968f8d6c883
-MISC ChangeLog 21830 SHA256 24afaa8414d9b49c8e3d29e8ec930459eab9aad3ba1382aa86072f80d8b1dc67 SHA512 700161b8b8ad62b7b5ce36910d529adf9b38f10375fc9ad8f14e1d6a4f9ebd228e66d9f01ea738c4c4315d5f1eae0186f9d75198795c5aa401119360aff5b5bf WHIRLPOOL 3d9bb52d0cfec631217131bc9ac41e9f6e712f69680f37de07a67ca04f451eeedc51a585321f40f4227ee0ad6f7a2f7cb8c9ed3d4bb32e168365906a73783265
+MISC ChangeLog 22044 SHA256 961390b3ea43edbd26b9d58509723dda4de36938ebf5a8443d9b7b079f82b1b8 SHA512 2c7d2a7fc43706124843225d112b83b4cbbd4c9c47a2943742fb94d990f6ede9d7c101843d8313b632ecccfb4d2182f5530a157ab89a5fd52159f29f0e4b9629 WHIRLPOOL ffb8ca4679a1aef295a82045b6c4f57fee73b465c06d0065b9774a8c874484c20c7ec7fafb3c83be955a5d534979bc8d05765e22085bb02506773e4bca653756
 MISC metadata.xml 786 SHA256 89e26645a5b0f47e4eeff63f207e868f4f05d313c170c3efeb4ce2af1c73cfb7 SHA512 dcd39ea294b27109f7e9a8d0e8ded9a42e5e27018b25d202af39ff12adf60caa987e326c45912a7bc52ad357dcc87bf618725cd34208888164a8117588466801 WHIRLPOOL 39d384fbfd8b6d618272c844436bc9531aa58a34edcd43807edc7315795ef31b5f26cab4e69adae463ed11c83d8c5953e04935612af22b3002c0e83048ad0e1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR7CBrAAoJELp701BxlEWfVikQAKimhDRZrJm4j0A3tMVL8QSB
-GZ0K3YpcOkMHb9ckr4HtbJ2oizY3IpvuoN63klxPDTu5Bi5RbXDID9tTfK0KreyX
-YeXctFhwdUHvun1U0MlFgzrJmNHSZtw/iDCmt0oStei4yujMgKwwYj+Gm59VjrSh
-Y63FQZT330IItftEU/eLsJ7voZIXf9pJsFvRUAfG+4r46mLJOPBORxzS7dRjkvnM
-rl9umRX1MaKA+ggxUXmdcwuQbiwKlm07Qw3CKzzJeYrNXsAlKVp7G0SnPKhRY8/P
-660G8QBdm2sWzVK10LhGth7NigiLi+LFNku0CPxbsCN31KURofoAIQAOiIUsPACc
-K/ThNsxY/Dmv6zVzBTiGl3TOvOdl5kTZyTPyuGjXYYlE0Zze+AAZ/5CdxTcCTPG9
-7jp2gAmGeM1AmKyeNm665nbeAAxu+jLUUekB1nwUaTlWG1bVbdpHW5PsrujESb4e
-TW0Hoa22FTmQWwrESoR6GWRYbZFIRIYMQE0BcfeVzdXNKJ1JJbShWM5ox9jC+Ja2
-PxKK5II1rCbyxpHBb+or5VElZ9A4XdjgOyJRlRK2uhNMRXjzZRKaCddbrYmn4n4k
-Z7BZaHhyQlwKKajc3Lbga+W3cZ+i4cMdPBeGBEPSYO/X9YIEz94YALQnwRsPAjzi
-QMLqeh94/0G4Zl5K/BNP
-=KW1Y
+iQGcBAEBCAAGBQJR+82pAAoJEJQzkH1pP7W40KkL/1qoEDvtKttQhB15ZUDg/xqJ
+6mtUPP7slQZ8gr4Hn6z6Kar97H5tzq+nqlOY0T3cVTUDdUcaJv4RJ5kl0OvoZQ6M
+p9EUI5i7c5pHszMYA/K0LLJkVm94KMr6OHK2SQOUEssZj8W5p+f2CgsDMYR4bNO2
+bD/PSbY9UQWwx92TGVrqMQka1tpN9s+IZxOIlCPO/JfQzd6JgEJvxisMc9TGnQD6
+GX4jiOfv3poysJVLa4O2Y34J9hZZph5kwB/IuNOHr8O5wdCxuF/Fdy7x0VGtaDlH
+Hk8riIq5T+t1IaSKzjTQFiT60nswNbIO6uS1ekbj2G1BlTxM5JGhQml0GsXNbgz5
+yT7PzZbDiTr9GVWFYRbl/jI/1yfV83zj2xtcPsNAhpgoDimGX1UmtGlVcWfSzz32
+0k9M8uOPBufYCFxlzf4kKa8Wu5UXQN6tb65vNEa/fyCfZUuT2MR7j0SRGPma/dpB
+AQQqdCIjBk5IApcA/IF1ulBZuo6a/5GXBJHphmZEQg==
+=YUMl
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/files/stunnel-3.26-gentoo.diff b/net-misc/stunnel/files/stunnel-3.26-gentoo.diff
new file mode 100644
index 000000000000..a6d0faa66f80
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-3.26-gentoo.diff
@@ -0,0 +1,29 @@
+--- Makefile.in	Sun Dec 23 12:03:25 2001
++++ Makefile.in	Thu Jan 17 12:28:22 2002
+@@ -9,7 +9,7 @@
+ sbindir=@sbindir@
+ libdir=@libdir@
+ man8dir=@mandir@/man8
+-piddir=@localstatedir@/stunnel/
++piddir=/var/run
+ ssldir=@ssldir@
+ openssl=$(ssldir)/bin/openssl
+ PEM_DIR=@PEM_DIR@
+@@ -24,7 +24,7 @@
+ LIBS=@LIBS@
+ HEADERS=common.h prototypes.h client.h
+ OBJS=client.o stunnel.o ssl.o protocol.o sthreads.o pty.o log.o options.o
+-DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8  $(PEM_DIR)/stunnel.pem
++DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8
+ 
+ WINGCC=i386-mingw32msvc-gcc 
+ WINCFLAGS=-O2 -Wall -DUSE_WIN32=1 -DHAVE_OPENSSL=1 -DFD_SETSIZE=4096 -DVERSION=\"@VERSION@\" -I../openssl-0.9.6b/outinc
+@@ -33,7 +33,7 @@
+ 
+ # standard external rules
+ 
+-all: stunnel stunnel.8 stunnel.html stunnel.so stunnel.pem
++all: stunnel stunnel.8 stunnel.html stunnel.so
+ 
+ install: all installdirs $(DESTFILES)
+ 
diff --git a/net-misc/stunnel/stunnel-3.26.ebuild b/net-misc/stunnel/stunnel-3.26.ebuild
new file mode 100644
index 000000000000..364d5fdba31c
--- /dev/null
+++ b/net-misc/stunnel/stunnel-3.26.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-3.26.ebuild,v 1.22 2013/08/02 15:16:04 ulm Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/"
+SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND=">=dev-libs/openssl-0.9.6j"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+}
+
+src_install() {
+	dosbin stunnel
+	dolib.so stunnel.so
+	dodoc FAQ README HISTORY BUGS PORTS TODO
+	doman stunnel.8
+}