diff options
| author |   Lance Albertson <ramereth@gentoo.org> | 2005-06-25 00:45:38 +0000 |
|---|---|---|
| committer | Lance Albertson <ramereth@gentoo.org> | 2005-06-25 00:45:38 +0000 |
| commit | 9240279d538b17b8fe4090b1973b8d8fc6d68bc0 (patch) | |
| tree | c8a4b1d8a542e8d4238544f5e8aebe219c36b89b /net-misc/stunnel/files | |
| parent | ebuild modifications and cleanup of old versions. fixes #68328, #72192 (diff) | |
| download | gentoo-2-9240279d538b17b8fe4090b1973b8d8fc6d68bc0.tar.gz gentoo-2-9240279d538b17b8fe4090b1973b8d8fc6d68bc0.tar.bz2 gentoo-2-9240279d538b17b8fe4090b1973b8d8fc6d68bc0.zip | |
added patch from #96896 and restored 3.26 for missing deps
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-misc/stunnel/files')
| -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 |
4 files changed, 51 insertions, 0 deletions
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; + } |