stable x86

8 files changed, 4 insertions, 51 deletions

diff --git a/net-misc/stunnel/files/digest-stunnel-3.24 b/net-misc/stunnel/files/digest-stunnel-3.24
deleted file mode 100644
index 75c759407ba2..000000000000
--- a/net-misc/stunnel/files/digest-stunnel-3.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c14bc43985ab2f8298b30e72dd9fde9e stunnel-3.24.tar.gz 225353
diff --git a/net-misc/stunnel/files/digest-stunnel-3.24-r1 b/net-misc/stunnel/files/digest-stunnel-3.24-r1
deleted file mode 100644
index 75c759407ba2..000000000000
--- a/net-misc/stunnel/files/digest-stunnel-3.24-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c14bc43985ab2f8298b30e72dd9fde9e stunnel-3.24.tar.gz 225353
diff --git a/net-misc/stunnel/files/digest-stunnel-3.26 b/net-misc/stunnel/files/digest-stunnel-3.26
new file mode 100644
index 000000000000..4955702bd09a
--- /dev/null
+++ b/net-misc/stunnel/files/digest-stunnel-3.26
@@ -0,0 +1 @@
+MD5 e2cffe2f2753416d37ea1619c0d0f96e stunnel-3.26.tar.gz 228923
diff --git a/net-misc/stunnel/files/stunnel-3.24-blinding.fix b/net-misc/stunnel/files/stunnel-3.24-blinding.fix
deleted file mode 100644
index d7a53f3045bd..000000000000
--- a/net-misc/stunnel/files/stunnel-3.24-blinding.fix
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/client.c	2003-06-28 22:10:23.000000000 +0000
-+++ client.c	2003-06-28 22:10:57.000000000 +0000
-@@ -970,7 +970,7 @@
-       } else {
-           log(LOG_DEBUG, "Private key is not RSA, no blinding needed");
-       }
--    } else {
-+    } else if (ssl->type == SSL_ST_ACCEPT) {
-       log(LOG_ERR, "Unable to get access to the SSL private key.");
-       sslerror("SSL_get_privatekey");
-       exit(1);
diff --git a/net-misc/stunnel/files/stunnel-3.24-gentoo.diff b/net-misc/stunnel/files/stunnel-3.26-gentoo.diff
index a6d0faa66f80..a6d0faa66f80 100644
--- a/net-misc/stunnel/files/stunnel-3.24-gentoo.diff
+++ b/net-misc/stunnel/files/stunnel-3.26-gentoo.diff
diff --git a/net-misc/stunnel/stunnel-3.24.ebuild b/net-misc/stunnel/stunnel-3.24.ebuild
deleted file mode 100644
index 66d20b1d75dd..000000000000
--- a/net-misc/stunnel/stunnel-3.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-3.24.ebuild,v 1.1 2003/06/28 22:16:20 aliz Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="TLS/SSL - Port Wrapper"
-SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
-HOMEPAGE="http://www.stunnel.org/"
-DEPEND="virtual/glibc >=dev-libs/openssl-0.9.6c"
-RDEPEND=">=dev-libs/openssl-0.9.6c"
-KEYWORDS="~x86 ~sparc"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-blinding.fix
-}
-
-src_compile() {
-	econf || die
-#	./configu --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man || die
-	emake || die
-}
-
-src_install() {
-	into /usr
-	dosbin stunnel
-	dodoc FAQ README HISTORY COPYING BUGS PORTS TODO transproxy.txt
-	doman stunnel.8
-	dolib.so stunnel.so
-}
diff --git a/net-misc/stunnel/stunnel-3.24-r1.ebuild b/net-misc/stunnel/stunnel-3.26.ebuild
index f412ef9e3749..fea5f908ddf7 100644
--- a/net-misc/stunnel/stunnel-3.24-r1.ebuild
+++ b/net-misc/stunnel/stunnel-3.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-3.24-r1.ebuild,v 1.2 2003/07/28 22:50:28 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-3.26.ebuild,v 1.1 2003/09/12 02:55:42 vapier Exp $
 
 inherit eutils
 
diff --git a/net-misc/stunnel/stunnel-4.04-r1.ebuild b/net-misc/stunnel/stunnel-4.04-r1.ebuild
index d44387103e11..c79f5a7dffe5 100644
--- a/net-misc/stunnel/stunnel-4.04-r1.ebuild
+++ b/net-misc/stunnel/stunnel-4.04-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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-r1.ebuild,v 1.4 2003/09/05 22:01:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.04-r1.ebuild,v 1.5 2003/09/12 02:55:42 vapier Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ 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.6c"
 RDEPEND=">=dev-libs/openssl-0.9.6c"
-KEYWORDS="~x86 sparc "
+KEYWORDS="x86 sparc "
 LICENSE="GPL-2"
 SLOT="0"