Fixing #36403 and other fixes

7 files changed, 141 insertions, 7 deletions

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index d3a6e1d368a9..359de6ad8ee5 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,16 +1,16 @@
-MD5 578706f1e2e3e6de3b7dc6b19d72fcdc stunnel-4.04-r2.ebuild 1817
+MD5 b42f7fd22070ddddb1be7c55b778eafb stunnel-4.04-r2.ebuild 1766
 MD5 dcebdde5e1aeb2e8615b0d7c23e4ee82 stunnel-3.22-r2.ebuild 916
 MD5 3fc859b0c6e1cc1a4c5b032aa4f80876 stunnel-3.26.ebuild 771
 MD5 b583fa16301c63e81e546fe03d8ba2fe stunnel-4.04-r1.ebuild 1696
-MD5 578706f1e2e3e6de3b7dc6b19d72fcdc stunnel-4.04-r3.ebuild 1817
-MD5 c9cd7ebc9157bad82d005d70fde312ec ChangeLog 3016
+MD5 570c051926ec3ab7e06e40e5a59540cc stunnel-4.04-r3.ebuild 1755
+MD5 73dfa8a725445f30e8428c83f6ea932b ChangeLog 3164
 MD5 9177dd12df6261a5bde7e8756c0f1585 files/stunnel-3.22-blinding.patch 3756
 MD5 5e045381b30eee84f8a88ad0f92dab24 files/stunnel.rc6 550
 MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r2 64
-MD5 0e35d974708e77a12a106d94227199ba files/stunnel.rc6.4.04-r2 577
-MD5 85f7480e1d1158f27ac0cb4b0d06fd1a files/stunnel.rc6.4.04-r3 585
+MD5 cbaff70a8eca7686aef382689c6f2e41 files/stunnel.rc6.4.04-r2 576
+MD5 e2d92823cd420d281b896273eefa0f08 files/stunnel.rc6.4.04-r3 613
 MD5 021f1b3d5a07aa11f572d4fa8a50b4f1 files/stunnel.conf.4.04-r2 721
-MD5 5f5df9543b2605f24edede6f0c2663a1 files/stunnel.conf.4.04-r3 780
+MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.04-r3 725
 MD5 6cdf521ff4c96a48e8863635b78fa596 files/stunnel-4.04-blinding.patch 2526
 MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r1 64
 MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r2 64
diff --git a/net-misc/stunnel/files/digest-stunnel-4.04-r3 b/net-misc/stunnel/files/digest-stunnel-4.04-r3
new file mode 100644
index 000000000000..f8df0f6a7fdf
--- /dev/null
+++ b/net-misc/stunnel/files/digest-stunnel-4.04-r3
@@ -0,0 +1 @@
+MD5 2fcdf0311a0ab8a3223293c706a84e97 stunnel-4.04.tar.gz 309072
diff --git a/net-misc/stunnel/files/stunnel.conf.4.0.4-r2 b/net-misc/stunnel/files/stunnel.conf.4.04-r2
index 86598a262efa..86598a262efa 100644
--- a/net-misc/stunnel/files/stunnel.conf.4.0.4-r2
+++ b/net-misc/stunnel/files/stunnel.conf.4.04-r2
diff --git a/net-misc/stunnel/files/stunnel.conf.4.04-r3 b/net-misc/stunnel/files/stunnel.conf.4.04-r3
new file mode 100644
index 000000000000..571e74b50393
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.conf.4.04-r3
@@ -0,0 +1,50 @@
+# location of pid file
+pid = /etc/stunnel/stunnel.pid
+
+# user to run as
+setuid = stunnel
+setgid = stunnel
+
+# Authentication stuff
+#verify = 2
+# don't forget about c_rehash CApath
+# it is located inside chroot jail:
+#CApath = /certs
+# or simply use CAfile instead:
+#CAfile = /usr/etc/stunnel/certs.pem
+
+# Some debugging stuff
+#debug = 7
+#output = stunnel.log
+
+# Use it for client mode
+#client = yes
+
+# sample service-level configuration
+
+#[pop3s]
+#accept  = 995
+#connect = 110
+
+#[imaps]
+#accept  = 993
+#connect = 143
+
+#[ssmtp]
+#accept  = 465
+#connect = 25
+
+#[s1]
+#accept  = 5000
+#connect = mail.osw.pl:110
+#delay = yes
+
+#[s2]
+#accept  = 5001
+#connect = mail.osw.pl:25
+
+#[https]
+#accept  = 443
+#connect = 80
+#TIMEOUTclose = 0
+
diff --git a/net-misc/stunnel/files/stunnel.rc6.4.0.4-r2 b/net-misc/stunnel/files/stunnel.rc6.4.04-r2
index 698bbdbaff1f..6b5d07f7166f 100644
--- a/net-misc/stunnel/files/stunnel.rc6.4.0.4-r2
+++ b/net-misc/stunnel/files/stunnel.rc6.4.04-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.0.4-r2,v 1.1 2003/10/28 15:23:38 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.04-r2,v 1.1 2004/01/03 19:31:10 aliz Exp $
 
 depend() {
 	need net
diff --git a/net-misc/stunnel/files/stunnel.rc6.4.04-r3 b/net-misc/stunnel/files/stunnel.rc6.4.04-r3
new file mode 100644
index 000000000000..87544ae2559f
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.rc6.4.04-r3
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.04-r3,v 1.1 2004/01/03 19:31:10 aliz Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting stunnel"
+	start-stop-daemon -p /etc/stunnel/stunnel.pid --start --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping stunnel"
+	start-stop-daemon -p /etc/stunnel/stunnel.pid --stop --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf
+	eend $?
+}
diff --git a/net-misc/stunnel/stunnel-4.04-r3.ebuild b/net-misc/stunnel/stunnel-4.04-r3.ebuild
new file mode 100644
index 000000000000..0ff5c636e62e
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.04-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.04-r3.ebuild,v 1.1 2004/01/03 19:31:10 aliz Exp $
+
+inherit ssl-cert
+
+IUSE="static"
+S=${WORKDIR}/${P}
+DESCRIPTION="TLS/SSL - Port Wrapper"
+SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
+HOMEPAGE="http://stunnel.mirt.net"
+DEPEND="virtual/glibc >=dev-libs/openssl-0.9.6j"
+RDEPEND=">=dev-libs/openssl-0.9.6j"
+KEYWORDS="~x86 ~sparc ~alpha ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	use static && myconf="${myconf} --disable-shared --enable-static"
+	use static && LDADD="${LDADD} -all-static" && export LDADD
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	insinto /etc/stunnel
+	docert stunnel
+
+	into /usr
+	dosbin src/stunnel
+	dodoc AUTHORS BUGS COPYING COPYRIGHT.GPL CREDITS INSTALL NEWS PORTS README TODO
+	dodoc doc/en/transproxy.txt
+	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html tools/importCA.html
+	doman doc/stunnel.8
+
+	insinto /usr/share/doc/${PVR}
+	doins tools/ca.pl tools/importCA.sh
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/stunnel.rc6.${PVR} stunnel
+
+	dolib src/.libs/libstunnel.la
+	use static || newlib.so src/.libs/libstunnel.so libstunnel.so.${PV}
+	use static || dosym /usr/lib/libstunnel.so.${PV} /usr/lib/libstunnel.so
+
+	insinto /etc/stunnel
+	donewins ${FILESDIR}/stunnel.conf.${PVR} stunnel.conf
+}
+
+pkg_postinst() {
+	enewuser stunnel
+	enewgroup stunnel
+
+	chown stunnel /etc/stunnel
+
+	einfo "Starting from version 4 stunnel now uses a configuration file for setting up stunnels."
+	einfo "Stunnel can now also be run as a daemon"
+}