Restore ebuild for 3.x branch.

(Portage version: 2.2_rc36/cvs/Linux i686, RepoMan options: --force)

3 files changed, 37 insertions, 90 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index b0bdb6a200ec..90cf84272293 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.102 2009/04/30 21:55:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.103 2009/08/09 09:20:52 ulm Exp $
+
+  09 Aug 2009; Ulrich Mueller <ulm@gentoo.org> +stunnel-3.26.ebuild,
+  -files/stunnel-4.21-setuid.patch:
+  Restore ebuild for 3.x branch, see bug 193770 why this is still useful.
+  Remove unused patch file.
 
   30 Apr 2009; Patrick Lauer <patrick@gentoo.org> -stunnel-3.26.ebuild,
   -stunnel-4.21-r1.ebuild, -stunnel-4.26.ebuild:
diff --git a/net-misc/stunnel/files/stunnel-4.21-setuid.patch b/net-misc/stunnel/files/stunnel-4.21-setuid.patch
deleted file mode 100644
index 93078ee9a394..000000000000
--- a/net-misc/stunnel/files/stunnel-4.21-setuid.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- stunnel-4.21-orig/src/stunnel.c	2007-10-27 17:41:39.000000000 +0200
-+++ stunnel-4.21/src/stunnel.c	2007-11-03 16:44:02.000000000 +0100
-@@ -41,7 +41,7 @@
- static void accept_connection(LOCAL_OPTIONS *);
- static void get_limits(void); /* setup global max_clients and max_fds */
- #if !defined (USE_WIN32) && !defined (__vms)
--static void make_chroot(void);
-+static void drop_privileges(void);
- static void daemonize(void);
- static void create_pid(void);
- static void delete_pid(void);
-@@ -111,9 +111,6 @@
-     } else { /* inetd mode */
- #if !defined (USE_WIN32) && !defined (__vms)&&!defined(USE_OS2)
-         max_fds=FD_SETSIZE; /* just in case */
--#ifdef HAVE_CHROOT
--        make_chroot();
--#endif /* HAVE_CHROOT */
-         drop_privileges();
- #endif
-         num_clients=1;
-@@ -171,9 +168,6 @@
- #if !defined (USE_WIN32) && !defined (__vms) && !defined(USE_OS2)
-     if(!(options.option.foreground))
-         daemonize();
--#ifdef HAVE_CHROOT
--        make_chroot();
--#endif /* HAVE_CHROOT */
-     drop_privileges();
-     create_pid();
- #endif /* !defined USE_WIN32 && !defined (__vms) */
-@@ -299,24 +293,9 @@
- #endif
- }
- 
--#ifdef HAVE_CHROOT
--static void make_chroot(void) {
--    if(options.chroot_dir) {
--        if(chroot(options.chroot_dir)) {
--            sockerror("chroot");
--            exit(1);
--        }
--        if(chdir("/")) {
--            sockerror("chdir");
--            exit(1);
--        }
--    }
--}
--#endif /* HAVE_CHROOT */
--
- #if !defined (USE_WIN32) && !defined (__vms)
--    /* set process user and group(s) id */
--void drop_privileges(void) {
-+    /* chroot and set process user and group(s) id */
-+static void drop_privileges(void) {
-     int uid=0, gid=0;
-     struct group *gr;
- #ifdef HAVE_SETGROUPS
-@@ -350,6 +329,20 @@
-         }
-     }
- 
-+#ifdef HAVE_CHROOT
-+    /* chroot */
-+    if(options.chroot_dir) {
-+        if(chroot(options.chroot_dir)) {
-+            sockerror("chroot");
-+            exit(1);
-+        }
-+        if(chdir("/")) {
-+            sockerror("chdir");
-+            exit(1);
-+        }
-+    }
-+#endif /* HAVE_CHROOT */
-+
-     /* Set uid and gid */
-     if(gid) {
-         if(setgid(gid)) {
---- stunnel-4.21-orig/src/prototypes.h	2007-10-05 17:42:48.000000000 +0200
-+++ stunnel-4.21/src/prototypes.h	2007-11-03 16:33:49.000000000 +0100
-@@ -57,7 +57,6 @@
- void main_initialize(char *, char *);
- void main_execute(void);
- void stunnel_info(int);
--void drop_privileges(void);
- 
- /**************************************** Prototypes for log.c */
- 
diff --git a/net-misc/stunnel/stunnel-3.26.ebuild b/net-misc/stunnel/stunnel-3.26.ebuild
new file mode 100644
index 000000000000..6278f5683dc4
--- /dev/null
+++ b/net-misc/stunnel/stunnel-3.26.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-3.26.ebuild,v 1.20 2009/08/09 09:20:52 ulm Exp $
+
+inherit eutils
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org"
+SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 alpha ppc sparc x86"
+IUSE="selinux"
+
+DEPEND=">=dev-libs/openssl-0.9.6j"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+}
+
+src_install() {
+	dosbin stunnel
+	dolib.so stunnel.so
+	dodoc FAQ README HISTORY BUGS PORTS TODO
+	doman stunnel.8
+}