stable on x86, files/ebuild cleanup

(Portage version: 2.0.54-r2)

13 files changed, 18 insertions, 301 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 36c7e20d3c44..ecde81fb71a4 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.54 2006/05/23 20:07:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.55 2006/06/05 02:52:37 ramereth Exp $
+
+  05 Jun 2006; Lance Albertson <ramereth@gentoo.org>
+  -files/stunnel-4.05-gentoo.diff, -files/stunnel-4.09-gentoo.diff,
+  -files/stunnel-4.10-inetd.patch, -files/stunnel.conf.4.05,
+  -files/stunnel.conf.4.09, -files/stunnel.rc6.4.05,
+  -files/stunnel.rc6.4.09, -stunnel-4.09.ebuild, stunnel-4.14-r1.ebuild,
+  stunnel-4.15.ebuild:
+  * Stable on x86
+  * Removed old ebuild
+  * Cleaned up files dir
 
   23 May 2006; Markus Rothe <corsair@gentoo.org> stunnel-4.09-r1.ebuild:
   Stable on ppc64
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 49cccbd4eac0..61eb649cb766 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,22 +1,13 @@
-MD5 54c48d67bd8c2c290feb466b1f2e6ff5 ChangeLog 8057
+MD5 5c3b2d87b564dd5c58ea28c77cb361b7 ChangeLog 8455
 MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64
-MD5 b562ecc7a9dab7e2e2582a0601b42569 files/digest-stunnel-4.09 64
 MD5 b562ecc7a9dab7e2e2582a0601b42569 files/digest-stunnel-4.09-r1 64
 MD5 ae279447729ad0d6d59b870b4ed28683 files/digest-stunnel-4.14-r1 64
 MD5 b8c378c46e46f1a99d22f25d970d02a5 files/digest-stunnel-4.15 64
 MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
-MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.05-gentoo.diff 321
-MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.09-gentoo.diff 321
-MD5 09f88a8e4bd6ae556b11c82d2c09de32 files/stunnel-4.10-inetd.patch 818
 MD5 9193cc027bed086a3852dc7189602f0b files/stunnel.conf 1423
-MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.05 725
-MD5 9193cc027bed086a3852dc7189602f0b files/stunnel.conf.4.09 1423
 MD5 f4879ffd6081bf6db14af6fac04f6b9e files/stunnel.rc6 933
-MD5 2d0c9c806bbcf7f7999d1ea564e27e9d files/stunnel.rc6.4.05 591
-MD5 915cb8e081d324df458589674689652c files/stunnel.rc6.4.09 938
 MD5 3c7d56a1f6a95f21ceb95ddf5c76073c metadata.xml 703
 MD5 40938d8bb3bba86aea441e89ad04bdc9 stunnel-3.26.ebuild 1085
 MD5 0c914a1eb8d80cfa0ef23f0722d6afc9 stunnel-4.09-r1.ebuild 2225
-MD5 1217dcb1ea077fa30403aa71cdaf7480 stunnel-4.09.ebuild 2127
-MD5 ef75a700735837f02b4e8c592c2e4b03 stunnel-4.14-r1.ebuild 2426
-MD5 d1cc2fc24f3874bca5265d4a7bd19727 stunnel-4.15.ebuild 2423
+MD5 11321bb09d7dcae785ac93ccd1c34f6a stunnel-4.14-r1.ebuild 2425
+MD5 1361fcff78a921181c3b232e0b79dc26 stunnel-4.15.ebuild 2422
diff --git a/net-misc/stunnel/files/digest-stunnel-4.09 b/net-misc/stunnel/files/digest-stunnel-4.09
deleted file mode 100644
index f3ec67c1f42d..000000000000
--- a/net-misc/stunnel/files/digest-stunnel-4.09
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2077669b04c36e4c0baa68348e8860a7 stunnel-4.09.tar.gz 484745
diff --git a/net-misc/stunnel/files/stunnel-4.05-gentoo.diff b/net-misc/stunnel/files/stunnel-4.05-gentoo.diff
deleted file mode 100644
index b41de790e162..000000000000
--- a/net-misc/stunnel/files/stunnel-4.05-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/Makefile.in    2002-10-26 16:48:22.000000000 +0000
-+++ tools/Makefile.in   2002-10-26 16:48:38.000000000 +0000
-@@ -83,7 +83,7 @@
-
-
- confdir = $(sysconfdir)/stunnel
--conf_DATA = stunnel.conf-sample stunnel.pem
-+conf_DATA = stunnel.conf-sample
-
- docdir = $(datadir)/doc/stunnel
- examplesdir = $(docdir)/examples
-
diff --git a/net-misc/stunnel/files/stunnel-4.09-gentoo.diff b/net-misc/stunnel/files/stunnel-4.09-gentoo.diff
deleted file mode 100644
index b41de790e162..000000000000
--- a/net-misc/stunnel/files/stunnel-4.09-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/Makefile.in    2002-10-26 16:48:22.000000000 +0000
-+++ tools/Makefile.in   2002-10-26 16:48:38.000000000 +0000
-@@ -83,7 +83,7 @@
-
-
- confdir = $(sysconfdir)/stunnel
--conf_DATA = stunnel.conf-sample stunnel.pem
-+conf_DATA = stunnel.conf-sample
-
- docdir = $(datadir)/doc/stunnel
- examplesdir = $(docdir)/examples
-
diff --git a/net-misc/stunnel/files/stunnel-4.10-inetd.patch b/net-misc/stunnel/files/stunnel-4.10-inetd.patch
deleted file mode 100644
index abb068adbcb3..000000000000
--- a/net-misc/stunnel/files/stunnel-4.10-inetd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# arch-tag: 5a2234d7-fe10-4a6e-845a-4ee6f13e262c
---- stunnel-4.10/src/network.c.inetd    2005-06-01 11:39:36.000000000 +0200
-+++ stunnel-4.10/src/network.c  2005-06-01 11:43:38.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "prototypes.h"
-
- #ifndef USE_WIN32
--static int signal_pipe[2];
-+static int signal_pipe[2] = { -1, -1 };
- static char signal_buffer[16];
- static void sigchld_handler(int);
- static void signal_pipe_empty(void);
-@@ -136,7 +136,7 @@
-     do { /* skip "Interrupted system call" errors */
-         retry=0;
-         retval=poll(ufds, nfds, min_timeout<0 ? -1 : 1000*min_timeout);
--        if(retval>0 && (*signal_revents & POLLIN)) {
-+        if(retval>0 && signal_revents && (*signal_revents & POLLIN)) {
-             signal_pipe_empty(); /* no timeout -> main loop */
-             retry=1;
-         }
diff --git a/net-misc/stunnel/files/stunnel.conf.4.05 b/net-misc/stunnel/files/stunnel.conf.4.05
deleted file mode 100644
index 571e74b50393..000000000000
--- a/net-misc/stunnel/files/stunnel.conf.4.05
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.conf.4.09 b/net-misc/stunnel/files/stunnel.conf.4.09
deleted file mode 100644
index 4aa8b8c5252e..000000000000
--- a/net-misc/stunnel/files/stunnel.conf.4.09
+++ /dev/null
@@ -1,61 +0,0 @@
-# Sample stunnel configuration file by Michal Trojnara 2002-2005
-# Some options used here may not be adequate for your particular configuration
-# Please make sure you understand them (especially the effect of chroot jail)
-
-# Certificate/key is needed in server mode and optional in client mode
-# cert = /etc/stunnel/stunnel.pem
-# key = /etc/stunnel/stunnel.pem
-
-# Some security enhancements for UNIX systems - comment them out on Win32
-# chroot = /chroot/stunnel/
-setuid = stunnel
-setgid = stunnel
-# PID is created inside chroot jail
-pid = /var/run/stunnel/stunnel.pid
-
-# Some performance tunings
-socket = l:TCP_NODELAY=1
-socket = r:TCP_NODELAY=1
-#compression = rle
-
-# Workaround for Eudora bug
-#options = DONT_INSERT_EMPTY_FRAGMENTS
-
-# Authentication stuff
-#verify = 2
-# Don't forget to c_rehash CApath
-# CApath is located inside chroot jail:
-#CApath = /certs
-# It's often easier to use CAfile:
-#CAfile = /etc/stunnel/certs.pem
-# Don't forget to c_rehash CRLpath
-# CRLpath is located inside chroot jail:
-#CRLpath = /crls
-# Alternatively you can use CRLfile:
-#CRLfile = /etc/stunnel/crls.pem
-
-# Some debugging stuff useful for troubleshooting
-#debug = 7
-#output = stunnel.log
-
-# Use it for client mode
-#client = yes
-
-# Service-level configuration
-
-#[pop3s]
-#accept  = 995
-#connect = 110
-
-#[imaps]
-#accept  = 993
-#connect = 143
-
-#[ssmtp]
-#accept  = 465
-#connect = 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
deleted file mode 100644
index 4f9d57fba0b2..000000000000
--- a/net-misc/stunnel/files/stunnel.rc6.4.05
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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/files/stunnel.rc6.4.09 b/net-misc/stunnel/files/stunnel.rc6.4.09
deleted file mode 100755
index d3fac3283205..000000000000
--- a/net-misc/stunnel/files/stunnel.rc6.4.09
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 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.09,v 1.1 2005/05/13 21:45:29 ramereth Exp $
-
-# Default pidfile location
-PIDFILE="/var/run/stunnel/stunnel.pid"
-
-checkconfig() {
-    # To ensure backwards compatibility
-    if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' /etc/stunnel/stunnel.conf)" ] ; then
-	ewarn "Please update your stunnel.conf!"
-	ewarn "pid should point to /var/run/stunnel/stunnel.pid"
-	PIDFILE="/etc/stunnel/stunnel.pid"
-    fi
-}
-
-depend() {
-    need net
-}
-
-start() {
-    checkconfig
-    ebegin "Starting stunnel"
-    start-stop-daemon --start --pidfile ${PIDFILE} --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf  
-    eend $?
-}
-
-stop() {
-    checkconfig
-    ebegin "Stopping stunnel"
-    start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-    eend $?
-}
diff --git a/net-misc/stunnel/stunnel-4.09.ebuild b/net-misc/stunnel/stunnel-4.09.ebuild
deleted file mode 100644
index 54e6db18be5e..000000000000
--- a/net-misc/stunnel/stunnel-4.09.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.09.ebuild,v 1.7 2005/06/18 21:58:44 ferdy Exp $
-
-inherit ssl-cert eutils flag-o-matic
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://stunnel.mirt.net/"
-SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc sparc x86"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6j"
-RDEPEND=">=dev-libs/openssl-0.9.6j
-	selinux? ( sec-policy/selinux-stunnel )"
-
-src_unpack() {
-	unpack ${A}
-	# Hack away generation of certificate
-	sed -i s/^install-data-local:/do-not-run-this:/ "${S}"/tools/Makefile.in
-}
-
-src_compile() {
-	econf \
-		`use_enable ipv6`\
-		`use_with tcpd tcp-wrappers` \
-		|| die "econf died"
-	emake || die "emake died"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	rm -rf ${D}/usr/share/doc/${PN}
-	rm -f ${D}/{etc/stunnel/stunnel.conf-sample,usr/sbin/stunnel3}
-	rm -f ${D}/usr/share/man/man8/{stunnel.fr.8,stunnel.pl.8}
-
-	dodoc AUTHORS BUGS CREDITS INSTALL NEWS PORTS README TODO ChangeLog \
-		doc/en/transproxy.txt
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	donewins ${FILESDIR}/stunnel.conf.${PVR} stunnel.conf
-	docert stunnel
-	newinitd ${FILESDIR}/stunnel.rc6.${PVR} stunnel
-
-	keepdir /var/run/stunnel
-}
-
-pkg_postinst() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-
-	chown stunnel:stunnel ${ROOT}/var/run/stunnel
-	chown stunnel:stunnel ${ROOT}/etc/stunnel/stunnel.{conf,crt,csr,key,pem}
-	chmod 0640 ${ROOT}/etc/stunnel/stunnel.{conf,crt,csr,key,pem}
-
-	if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' \
-		${ROOT}/etc/stunnel/stunnel.conf )" ] ; then
-
-		ewarn "As of stunnel-4.09, the pid file will be located in /var/run/stunnel."
-		ewarn "Please stop stunnel, etc-update, and start stunnel back up to ensure"
-		ewarn "the update takes place"
-		ewarn ""
-		ewarn "The new location will be /var/run/stunnel/stunnel.pid"
-		ebeep 3
-		epause 3
-	fi
-}
diff --git a/net-misc/stunnel/stunnel-4.14-r1.ebuild b/net-misc/stunnel/stunnel-4.14-r1.ebuild
index 8c3a0861bea3..8a4a493484ac 100644
--- a/net-misc/stunnel/stunnel-4.14-r1.ebuild
+++ b/net-misc/stunnel/stunnel-4.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.14-r1.ebuild,v 1.1 2006/04/27 13:56:18 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.14-r1.ebuild,v 1.2 2006/06/05 02:52:37 ramereth 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="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc x86"
 IUSE="ipv6 selinux tcpd"
 
 DEPEND="virtual/libc
diff --git a/net-misc/stunnel/stunnel-4.15.ebuild b/net-misc/stunnel/stunnel-4.15.ebuild
index 742a1f2c6961..fa4d93eb1035 100644
--- a/net-misc/stunnel/stunnel-4.15.ebuild
+++ b/net-misc/stunnel/stunnel-4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.15.ebuild,v 1.1 2006/04/27 13:56:18 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.15.ebuild,v 1.2 2006/06/05 02:52:37 ramereth 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="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc x86"
 IUSE="ipv6 selinux tcpd"
 
 DEPEND="virtual/libc