unmasked and closing #54390

5 files changed, 95 insertions, 18 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 5046512772ff..c70013aa6b84 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.31 2004/07/28 20:35:26 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.32 2004/08/18 23:10:03 aliz Exp $
+
+  18 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> files/stunnel.conf.4.05,
+  files/stunnel.rc6.4.05:
+  Added missing files to CVS, closing #54390.
+  Unmasked on x86 and amd64.
 
   28 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> stunnel-3.26.ebuild:
   Marked ~amd64.
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 59a1995f9a97..dde9ec9b4443 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,26 +1,28 @@
-MD5 3435c39479e45a8abca4b306d55c1b64 ChangeLog 3957
+MD5 0d6fd050e843744f8508c46bef52b5cb stunnel-4.04-r2.ebuild 1742
 MD5 999de3b41b1d7ca26acbda3b8615bc14 stunnel-3.22-r2.ebuild 900
 MD5 7cf91228b89912319ed3e729f0fb115a stunnel-3.26.ebuild 781
+MD5 62f034db5f89b9164d270ebbab309b7d stunnel-4.05.ebuild 1705
 MD5 4f3b875d2f47cfec6611819a1bd07ad5 stunnel-4.04-r1.ebuild 1673
-MD5 0d6fd050e843744f8508c46bef52b5cb stunnel-4.04-r2.ebuild 1742
 MD5 c7e1498b9972c10a97d90425788b0a26 stunnel-4.04-r3.ebuild 1736
+MD5 d62dc6e4bd6bfe76e7be907c059a0729 ChangeLog 4127
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 260ecbb9d6ee4a867152512b543acc68 stunnel-4.05.ebuild 1711
-MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r2 64
-MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64
-MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r1 64
-MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r2 64
-MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r3 64
 MD5 9177dd12df6261a5bde7e8756c0f1585 files/stunnel-3.22-blinding.patch 3756
-MD5 60507279a2c9abbec2037b9e5a0840f7 files/stunnel-3.22-gentoo.diff 1170
-MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
-MD5 6cdf521ff4c96a48e8863635b78fa596 files/stunnel-4.04-blinding.patch 2526
-MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.04-gentoo.diff 321
-MD5 4839b059fba14c4f7f2acb50888aadac files/stunnel.conf 720
-MD5 021f1b3d5a07aa11f572d4fa8a50b4f1 files/stunnel.conf.4.04-r2 721
-MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.04-r3 725
 MD5 a7262319408c8fc154543b7614662329 files/stunnel.rc6 534
+MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.05 725
+MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r2 64
 MD5 39bf8947e5bcc172aba321a975eff263 files/stunnel.rc6.4.04-r2 561
 MD5 1ceef2be86dab81ee4499b783188fa44 files/stunnel.rc6.4.04-r3 598
+MD5 021f1b3d5a07aa11f572d4fa8a50b4f1 files/stunnel.conf.4.04-r2 721
+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
+MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r3 64
+MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64
 MD5 c0fb8fc4f6d919edc9d76e0f423873eb files/digest-stunnel-4.05 64
+MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.04-gentoo.diff 321
+MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
+MD5 60507279a2c9abbec2037b9e5a0840f7 files/stunnel-3.22-gentoo.diff 1170
+MD5 2d0c9c806bbcf7f7999d1ea564e27e9d files/stunnel.rc6.4.05 591
 MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.05-gentoo.diff 321
+MD5 4839b059fba14c4f7f2acb50888aadac files/stunnel.conf 720
diff --git a/net-misc/stunnel/files/stunnel.conf.4.05 b/net-misc/stunnel/files/stunnel.conf.4.05
new file mode 100644
index 000000000000..571e74b50393
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.conf.4.05
@@ -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.05 b/net-misc/stunnel/files/stunnel.rc6.4.05
new file mode 100644
index 000000000000..4f9d57fba0b2
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.rc6.4.05
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.05,v 1.1 2004/08/18 23:10:03 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.05.ebuild b/net-misc/stunnel/stunnel-4.05.ebuild
index d8d3501d0658..3e9ae6d61f9c 100644
--- a/net-misc/stunnel/stunnel-4.05.ebuild
+++ b/net-misc/stunnel/stunnel-4.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.05.ebuild,v 1.6 2004/07/15 03:38:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.05.ebuild,v 1.7 2004/08/18 23:10:03 aliz Exp $
 
 inherit ssl-cert eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha arm amd64"
 IUSE="static"
 
 DEPEND="virtual/libc