Restore ebuild for 3.x branch.

Package-Manager: portage-2.2_rc36/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 50 insertions, 92 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/Manifest b/net-misc/stunnel/Manifest
index ddf0c6b4fe97..104a26f938bd 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX stunnel-3.26-gentoo.diff 941 RMD160 4ca4f85a8888c7c9dbeed9d1303bae182d19195d SHA1 5517c6e3395664d76c84548ea67ffd8fddddbdcd SHA256 e2a9fab361699b01ccd004ef598bb868d5f6f37bd40d05b7a16a97cd9ecee2f2
 AUX stunnel-4.21-libwrap.patch 380 RMD160 c5ed7c06c3612bc5930ca8c77cac8bf58ec403f3 SHA1 fa1bf6674f775fa1b5934f4707c9e7eafed0d8a9 SHA256 b22f56707b96df785ebc20b48faf9761fb52cf4a362be875c60071b0d4572be1
-AUX stunnel-4.21-setuid.patch 2497 RMD160 037d422dd62c7140c03ad21103293cab201834e6 SHA1 2af63c8d7e212e80e0ce974a00f2ebb725a5d353 SHA256 38b525f41f7c876c0ec781d17a4c8096542b96a34d87f8b1acf49864479ca203
 AUX stunnel.conf 1423 RMD160 606c53b0e241e44c8aabe423ca6772dc76aa69a9 SHA1 0b18a6dea836abc3c224c367f9ebd6fa30b931f2 SHA256 be8deb0e051f594e14c898c2ec8a4a6879adcd48a56286093653346d12c3f105
 AUX stunnel.rc6 779 RMD160 3cb0ba8b6f90484a9cec951e3eb36eef45169f6d SHA1 7de8dc829e271b3ed248e3b44afb9b537621cc02 SHA256 b2128e3bfe38485ef4afad35b57d8711666281087f3fcf920d5d313642e06dea
+DIST stunnel-3.26.tar.gz 228923 RMD160 63347b6bc6fca1496d74a8ef234eea98a45e0b04 SHA1 0d40d268a9e4b63630312cdee4efa5ecba53c9ec SHA256 d2a55b089d46d14bc4b456bb1927303492dab6649867c67a005d2c9d1ededfb3
 DIST stunnel-4.25.tar.gz 532343 RMD160 dcb9962e5273e69f5aeaed6bf709495aa97baa52 SHA1 fc6d61fad996f750c76ea627c5dd9f789af0eaf6 SHA256 9c966a18124ad2c28773fe096b767071320bdb07db69f480df36cbca80069480
 DIST stunnel-4.27.tar.gz 538604 RMD160 a0beb4dffbc40c5c4452af767840d6fa703868c9 SHA1 2daf52fb0906de9fc5bd6a270e620e9316034fd4 SHA256 c260a6544a39c3cff59626ca6bc7c14087dc4d4fab95c6cddd7dddd81df87cfb
+EBUILD stunnel-3.26.ebuild 742 RMD160 828bcad3275266e52a5036f6670e0612c90e926a SHA1 84966259d3b71ddfce3ffec4b2ee14d43811fd81 SHA256 ab1b1e4697849381ed5acc09728dd07457674148a4864091eec747918b16b5ee
 EBUILD stunnel-4.25.ebuild 2375 RMD160 d8e2adf5aa30389a5c6f1ea3b59cccb3e88e2581 SHA1 cab4724bd91dc869cc4df296165804f6d9b57398 SHA256 98457e8a9921a07480aad95e2cd921e96cef87ef60c0e7a4b97f57bf641c63bf
 EBUILD stunnel-4.27.ebuild 2390 RMD160 319d6b740f7e086a5d4fcb4181dc2d6c6b86031c SHA1 abc19ccd0e243f36483f2612f6669e456a32f54d SHA256 51f64f5a5c7bc44a19e62fae2bb54aaa575d80a1dced42a7a2b1bf6003629d90
-MISC ChangeLog 14383 RMD160 4509aaba207546c92ba90474dd7bbe7d2b8683a8 SHA1 e193c3ba20109b9be74c8db2243d47299c64edb8 SHA256 917a22d1a54f48073ad125a2c70b346706397d5ad1c9b025ddb684c103ae167a
+MISC ChangeLog 14587 RMD160 c729330a73187d79e44d104dc707bbcf525dad0a SHA1 623c2f5809730bdccff0ae2e9fd0a1fde3e4ee0f SHA256 008f5e02b80a7b0780ffa6a0baa9ed146c712d889e6d3737714da44b4a86702a
 MISC metadata.xml 641 RMD160 7ad264c22b9e0705cf00b7985eee8d23c3383310 SHA1 c9314118d8fbc0644eb690f56f9d8859d3f7c578 SHA256 16e547775081b652662ac7156f0b6cfb7d1b8165865416cd154047c9ea6abebb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkp+lXMACgkQOeoy/oIi7uzSrwCg2/edd5kE/jJnVHmogAsd+Bpq
+eUIAn2t3vwISSyxW/swxEpvrDPK0TywA
+=Ijql
+-----END PGP SIGNATURE-----
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
+}