Attachment #55040 for bug #83245

View | Details | Raw Unified | Return to bug 83245
Collapse All | Expand All




#

PORTNAME=	stunnel
PORTVERSION=	4.11
PORTREVISION=	3
CATEGORIES=	security
MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
		ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \

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)
CONFIGURE_ARGS+=	--with-threads=ucontext
.elif defined(WITH_FORK)
CONFIGURE_ARGS+=	--with-threads=fork
.else
CONFIGURE_ARGS+=	CFLAGS=${PTHREAD_CFLAGS} LDFLAGS=${PTHREAD_LIBS} --with-threads=pthread
.endif

post-patch:

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (stunnel-4.10.tar.gz) = 9de7a62a44083114779ca4e109d70776	1	MD5 (stunnel-4.11.tar.gz) = 253c50435d4d81cba6f19ca34266e6dc
2	SIZE (stunnel-4.10.tar.gz) = 487066	2	SIZE (stunnel-4.11.tar.gz) = 484559




--- 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 */




*** 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() */
  }
  

Return to bug 83245

Lines 6-13 Link Here

(-)Makefile (-6 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= stunnel	8	PORTNAME= stunnel
9	PORTVERSION= 4.10	9	PORTVERSION= 4.11
10	PORTREVISION= 3
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \	11	MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \
13	ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \	12	ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \
Lines 47-59 Link Here
47	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'	46	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'
48	.endif	47	.endif
49		48
50	CFLAGS+=-DFORCE_THREADING_MODEL
51	.if defined(WITH_UCONTEXT)	49	.if defined(WITH_UCONTEXT)
52	CFLAGS+=-DFORCE_UCONTEXT	50	CONFIGURE_ARGS+= --with-threads=ucontext
53	.elif defined(WITH_FORK)	51	.elif defined(WITH_FORK)
54	CFLAGS+=-DFORCE_FORK	52	CONFIGURE_ARGS+= --with-threads=fork
55	.else	53	.else
56	CFLAGS+=-DFORCE_PTHREAD	54	CONFIGURE_ARGS+= CFLAGS=${PTHREAD_CFLAGS} LDFLAGS=${PTHREAD_LIBS} --with-threads=pthread
57	.endif	55	.endif
58		56
59	post-patch:	57	post-patch:

Lines 1-50 Link Here

(-)files/patch-src::common.h (-50 lines)
1	--- src/common.h.orig Sat Apr 23 13:40:10 2005
2	+++ src/common.h Tue Jun 14 08:27:11 2005
3	@@ -38,17 +38,44 @@
4	#endif
5
6	/* threads model */
7	+#if defined(FORCE_THREADING_MODEL)
8	+
9	+#undef USE_UCONTEXT
10	+#undef USE_PTHREAD
11	+#undef USE_FORK
12	+
13	+#ifdef FORCE_UCONTEXT
14	+#define USE_UCONTEXT
15	+#else
16	+#ifdef FORCE_PTHREAD
17	+#define USE_PTHREAD
18	+#else
19	+#define USE_FORK
20	+#endif /* FORCE_PTHREAD */
21	+#endif /* FORCE_UCONTEXT */
22	+
23	+#else /* FORCE_THREADING_MODEL */
24	+
25	#if HAVE_UCONTEXT_H && HAVE_GETCONTEXT && HAVE_POLL
26	#define USE_UCONTEXT
27	-#include <ucontext.h>
28	#elif HAVE_PTHREAD_H && HAVE_LIBPTHREAD
29	#define USE_PTHREAD
30	+#else
31	+#define USE_FORK
32	+#endif
33	+
34	+#endif /* FORCE_THREADING_MODEL */
35	+
36	+#ifdef USE_UCONTEXT
37	+#include <sys/types.h>
38	+#include <ucontext.h>
39	+#endif
40	+
41	+#ifdef USE_PTHREAD
42	#include <pthread.h>
43	#define THREADS
44	#define _REENTRANT
45	#define _THREAD_SAFE
46	-#else
47	-#define USE_FORK
48	#endif
49
50	/* TCP wrapper */

Lines 1-12 Link Here

(-)files/patch-src::sthreads.c (-12 lines)
1	*** src/sthreads.c.old Mon Jun 13 21:34:53 2005
2	--- src/sthreads.c Mon Jun 13 22:15:01 2005
3	***************
4	* 63,68 **
5	--- 63,69 ----
6
7	static void ctx_cleanup_func(void) { /* cleanup the active thread */
8	s_log(LOG_DEBUG, "Context %ld closed", ready_head->id);
9	+ makecontext(&ctx_cleanup, ctx_cleanup_func, 0);
10	s_poll_wait(NULL, 0); /* wait on poll() */
11	}
12