diff options
| -rw-r--r-- | net-misc/stunnel/ChangeLog | 10 | ||||
| -rw-r--r-- | net-misc/stunnel/Manifest | 7 | ||||
| -rw-r--r-- | net-misc/stunnel/files/digest-stunnel-3.26 | 1 | ||||
| -rw-r--r-- | net-misc/stunnel/files/digest-stunnel-4.10-r1 (renamed from net-misc/stunnel/files/digest-stunnel-4.10) | 0 | ||||
| -rw-r--r-- | net-misc/stunnel/files/stunnel-3.26-gentoo.diff | 29 | ||||
| -rw-r--r-- | net-misc/stunnel/files/stunnel-4.10-inetd.patch | 21 | ||||
| -rw-r--r-- | net-misc/stunnel/stunnel-3.26.ebuild | 46 | ||||
| -rw-r--r-- | net-misc/stunnel/stunnel-4.10-r1.ebuild (renamed from net-misc/stunnel/stunnel-4.10.ebuild) | 3 |
8 files changed, 114 insertions, 3 deletions
diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog index 08ab6a558d8b..a88197870612 100644 --- a/net-misc/stunnel/ChangeLog +++ b/net-misc/stunnel/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/stunnel # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.44 2005/06/22 04:28:25 ramereth Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.45 2005/06/25 00:45:38 ramereth Exp $ + +*stunnel-4.10-r1 (25 Jun 2005) + + 25 Jun 2005; Lance Albertson <ramereth@gentoo.org> + +files/stunnel-3.26-gentoo.diff, +files/stunnel-4.10-inetd.patch, + +stunnel-3.26.ebuild, -stunnel-4.10.ebuild, +stunnel-4.10-r1.ebuild: + * Bump 4.10 to fix inetd problem from bug #96896 + * Restored 3.23 for missed deps on other packages *stunnel-4.10 (22 Jun 2005) diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 93579d81d6be..85fc73860dfe 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,8 +1,9 @@ MD5 4fdb492cb71355d4e151c22c8064df2c ChangeLog 6406 -MD5 a31d9758f5b116772bc3264dbadf0207 stunnel-4.10.ebuild 2223 +MD5 5e7d8fe149284a2b7fd605704d6b1886 stunnel-3.26.ebuild 1090 MD5 3c7d56a1f6a95f21ceb95ddf5c76073c metadata.xml 703 MD5 b2b41fa38d0e49a159629341ba9f8f48 stunnel-4.05.ebuild 1755 MD5 1217dcb1ea077fa30403aa71cdaf7480 stunnel-4.09.ebuild 2127 +MD5 e357e3a5e0c2bc5571d7d95452862903 stunnel-4.10-r1.ebuild 2268 MD5 093291f53a8df7fb48928a750c4074f5 files/digest-stunnel-4.10 64 MD5 9193cc027bed086a3852dc7189602f0b files/stunnel.conf 1423 MD5 f4879ffd6081bf6db14af6fac04f6b9e files/stunnel.rc6 933 @@ -14,3 +15,7 @@ MD5 915cb8e081d324df458589674689652c files/stunnel.rc6.4.09 938 MD5 9193cc027bed086a3852dc7189602f0b files/stunnel.conf.4.09 1423 MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.09-gentoo.diff 321 MD5 b562ecc7a9dab7e2e2582a0601b42569 files/digest-stunnel-4.09 64 +MD5 093291f53a8df7fb48928a750c4074f5 files/digest-stunnel-4.10-r1 64 +MD5 09f88a8e4bd6ae556b11c82d2c09de32 files/stunnel-4.10-inetd.patch 818 +MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941 +MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64 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/digest-stunnel-4.10 b/net-misc/stunnel/files/digest-stunnel-4.10-r1 index 96751dd6cde2..96751dd6cde2 100644 --- a/net-misc/stunnel/files/digest-stunnel-4.10 +++ b/net-misc/stunnel/files/digest-stunnel-4.10-r1 diff --git a/net-misc/stunnel/files/stunnel-3.26-gentoo.diff b/net-misc/stunnel/files/stunnel-3.26-gentoo.diff new file mode 100644 index 000000000000..a6d0faa66f80 --- /dev/null +++ b/net-misc/stunnel/files/stunnel-3.26-gentoo.diff @@ -0,0 +1,29 @@ +--- Makefile.in Sun Dec 23 12:03:25 2001 ++++ Makefile.in Thu Jan 17 12:28:22 2002 +@@ -9,7 +9,7 @@ + sbindir=@sbindir@ + libdir=@libdir@ + man8dir=@mandir@/man8 +-piddir=@localstatedir@/stunnel/ ++piddir=/var/run + ssldir=@ssldir@ + openssl=$(ssldir)/bin/openssl + PEM_DIR=@PEM_DIR@ +@@ -24,7 +24,7 @@ + LIBS=@LIBS@ + HEADERS=common.h prototypes.h client.h + OBJS=client.o stunnel.o ssl.o protocol.o sthreads.o pty.o log.o options.o +-DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8 $(PEM_DIR)/stunnel.pem ++DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8 + + WINGCC=i386-mingw32msvc-gcc + WINCFLAGS=-O2 -Wall -DUSE_WIN32=1 -DHAVE_OPENSSL=1 -DFD_SETSIZE=4096 -DVERSION=\"@VERSION@\" -I../openssl-0.9.6b/outinc +@@ -33,7 +33,7 @@ + + # standard external rules + +-all: stunnel stunnel.8 stunnel.html stunnel.so stunnel.pem ++all: stunnel stunnel.8 stunnel.html stunnel.so + + install: all installdirs $(DESTFILES) + diff --git a/net-misc/stunnel/files/stunnel-4.10-inetd.patch b/net-misc/stunnel/files/stunnel-4.10-inetd.patch new file mode 100644 index 000000000000..abb068adbcb3 --- /dev/null +++ b/net-misc/stunnel/files/stunnel-4.10-inetd.patch @@ -0,0 +1,21 @@ +# 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/stunnel-3.26.ebuild b/net-misc/stunnel/stunnel-3.26.ebuild new file mode 100644 index 000000000000..d68c4d06b005 --- /dev/null +++ b/net-misc/stunnel/stunnel-3.26.ebuild @@ -0,0 +1,46 @@ +# 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-3.26.ebuild,v 1.12 2005/06/25 00:45:38 ramereth 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="x86 sparc alpha ppc ~amd64 ~ppc-macos" +IUSE="selinux" + +RDEPEND=">=dev-libs/openssl-0.9.6j + selinux? ( sec-policy/selinux-stunnel )" +DEPEND="${RDEPEND} + virtual/libc" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.diff + if use ppc-macos ; then + sed -i -e "s,-shared,-dynamic -flat_namespace -bundle -undefined suppress,g" \ + -e "s,stunnel.so,stunnel.dylib,g" \ + Makefile.in || die "sed failed" + fi +} + +src_compile() { + econf || die + emake || die +} + +src_install() { + dosbin stunnel + dodoc FAQ README HISTORY COPYING BUGS PORTS TODO transproxy.txt + doman stunnel.8 + if use ppc-macos ; then + dolib.so stunnel.dylib + else + dolib.so stunnel.so + fi +} diff --git a/net-misc/stunnel/stunnel-4.10.ebuild b/net-misc/stunnel/stunnel-4.10-r1.ebuild index e3a8431c409b..09d516d9350f 100644 --- a/net-misc/stunnel/stunnel-4.10.ebuild +++ b/net-misc/stunnel/stunnel-4.10-r1.ebuild @@ -1,6 +1,6 @@ # 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.10.ebuild,v 1.1 2005/06/22 04:28:25 ramereth Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.10-r1.ebuild,v 1.1 2005/06/25 00:45:38 ramereth Exp $ inherit ssl-cert eutils flag-o-matic @@ -22,6 +22,7 @@ src_unpack() { unpack ${A} # Hack away generation of certificate sed -i s/^install-data-local:/do-not-run-this:/ "${S}"/tools/Makefile.in + epatch ${FILESDIR}/stunnel-4.10-inetd.patch } src_compile() { |