Fixing #36403 and other fixes

5 files changed, 72 insertions, 1 deletions

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 $?
+}