Attachment 55040 Details for Bug 83245 – stunnel_4.10_4.11.diff

[patch] stunnel_4.10_4.11.diff

stunnel_4.10_4.11.diff (text/plain), 3.55 KB, created by Vasil Dimov on 2005-07-11 07:20:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vasil Dimov

Created: 2005-07-11 07:20:23 UTC

Size: 3.55 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/security/stunnel/Makefile,v
>retrieving revision 1.65
>diff -u -r1.65 Makefile
>--- Makefile	14 Jun 2005 09:07:12 -0000	1.65
>+++ Makefile	11 Jul 2005 06:07:45 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	stunnel
>-PORTVERSION=	4.10
>-PORTREVISION=	3
>+PORTVERSION=	4.11
> CATEGORIES=	security
> MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
> 		ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \
>@@ -47,13 +46,12 @@
> BROKEN=	'The WITH_UCONTEXT, WITH_FORK and WITH_PTHREAD options are mutually exclusive - please specify at most one of them, the default is WITH_PTHREAD'
> .endif
> 
>-CFLAGS+=-DFORCE_THREADING_MODEL
> .if defined(WITH_UCONTEXT)
>-CFLAGS+=-DFORCE_UCONTEXT
>+CONFIGURE_ARGS+=	--with-threads=ucontext
> .elif defined(WITH_FORK)
>-CFLAGS+=-DFORCE_FORK
>+CONFIGURE_ARGS+=	--with-threads=fork
> .else
>-CFLAGS+=-DFORCE_PTHREAD
>+CONFIGURE_ARGS+=	CFLAGS=${PTHREAD_CFLAGS} LDFLAGS=${PTHREAD_LIBS} --with-threads=pthread
> .endif
> 
> post-patch:
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/security/stunnel/distinfo,v
>retrieving revision 1.34
>diff -u -r1.34 distinfo
>--- distinfo	12 May 2005 11:36:41 -0000	1.34
>+++ distinfo	11 Jul 2005 06:07:45 -0000
>@@ -1,2 +1,2 @@
>-MD5 (stunnel-4.10.tar.gz) = 9de7a62a44083114779ca4e109d70776
>-SIZE (stunnel-4.10.tar.gz) = 487066
>+MD5 (stunnel-4.11.tar.gz) = 253c50435d4d81cba6f19ca34266e6dc
>+SIZE (stunnel-4.11.tar.gz) = 484559
>Index: files/patch-src::common.h
>===================================================================
>RCS file: /home/ncvs/ports/security/stunnel/files/patch-src::common.h,v
>retrieving revision 1.1
>diff -u -r1.1 patch-src::common.h
>--- files/patch-src::common.h	14 Jun 2005 08:58:47 -0000	1.1
>+++ files/patch-src::common.h	11 Jul 2005 06:07:45 -0000
>@@ -1,50 +0,0 @@
>---- src/common.h.orig	Sat Apr 23 13:40:10 2005
>-+++ src/common.h	Tue Jun 14 08:27:11 2005
>-@@ -38,17 +38,44 @@
>- #endif
>- 
>- /* threads model */
>-+#if defined(FORCE_THREADING_MODEL)
>-+
>-+#undef USE_UCONTEXT
>-+#undef USE_PTHREAD
>-+#undef USE_FORK
>-+
>-+#ifdef FORCE_UCONTEXT
>-+#define USE_UCONTEXT
>-+#else
>-+#ifdef FORCE_PTHREAD
>-+#define USE_PTHREAD
>-+#else
>-+#define USE_FORK
>-+#endif	/* FORCE_PTHREAD */
>-+#endif	/* FORCE_UCONTEXT */
>-+
>-+#else	/* FORCE_THREADING_MODEL */
>-+
>- #if HAVE_UCONTEXT_H && HAVE_GETCONTEXT && HAVE_POLL
>- #define USE_UCONTEXT
>--#include <ucontext.h>
>- #elif HAVE_PTHREAD_H && HAVE_LIBPTHREAD
>- #define USE_PTHREAD
>-+#else
>-+#define USE_FORK
>-+#endif
>-+
>-+#endif	/* FORCE_THREADING_MODEL */
>-+
>-+#ifdef USE_UCONTEXT
>-+#include <sys/types.h>
>-+#include <ucontext.h>
>-+#endif
>-+
>-+#ifdef USE_PTHREAD
>- #include <pthread.h>
>- #define THREADS
>- #define _REENTRANT
>- #define _THREAD_SAFE
>--#else
>--#define USE_FORK
>- #endif
>- 
>- /* TCP wrapper */
>Index: files/patch-src::sthreads.c
>===================================================================
>RCS file: /home/ncvs/ports/security/stunnel/files/patch-src::sthreads.c,v
>retrieving revision 1.1
>diff -u -r1.1 patch-src::sthreads.c
>--- files/patch-src::sthreads.c	14 Jun 2005 08:58:47 -0000	1.1
>+++ files/patch-src::sthreads.c	11 Jul 2005 06:07:45 -0000
>@@ -1,12 +0,0 @@
>-*** src/sthreads.c.old	Mon Jun 13 21:34:53 2005
>---- src/sthreads.c	Mon Jun 13 22:15:01 2005
>-***************
>-*** 63,68 ****
>---- 63,69 ----
>-  
>-  static void ctx_cleanup_func(void) { /* cleanup the active thread */
>-      s_log(LOG_DEBUG, "Context %ld closed", ready_head->id);
>-+     makecontext(&ctx_cleanup, ctx_cleanup_func, 0);
>-      s_poll_wait(NULL, 0); /* wait on poll() */
>-  }
>-

Actions: View | Diff

Attachments on bug 83245: 55040