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

(-)stunnel/Makefile (-1 / +18 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	stunnel
8
PORTNAME=	stunnel
9
PORTVERSION=	4.10
9
PORTVERSION=	4.10
10
PORTREVISION=	1
10
CATEGORIES=	security
11
CATEGORIES=	security
11
MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
12
MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
12
		ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \
13
		ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \
Lines 35-40 Link Here
35
CONFIGURE_ARGS+=	--enable-ipv6
36
CONFIGURE_ARGS+=	--enable-ipv6
36
.endif
37
.endif
37
38
39
.if defined(WITH_UCONTEXT)
40
EXTRA_PATCHES+=	${FILESDIR}/common.h-ucontext.patch
41
.elif defined(WITH_FORK)
42
EXTRA_PATCHES+=	${FILESDIR}/common.h-fork.patch
43
.else
44
EXTRA_PATCHES+=	${FILESDIR}/common.h-pthread.patch
45
.endif
46
47
pre-everything::
48
	@${ECHO}
49
	@${ECHO} "You can build ${PORTNAME} with the following options:"
50
	@${ECHO} "WITH_UCONTEXT   use ucontext(3) model. Currently has known problems"
51
	@${ECHO} "WITH_FORK       use fork(2) model"
52
	@${ECHO} "default is to use pthread(3) model"
53
	@${ECHO}
54
38
post-patch:
55
post-patch:
39
# place files under /var/tmp so that this can be run by an unprivileged user
56
# place files under /var/tmp so that this can be run by an unprivileged user
40
# user stunnel and group stunnel
57
# user stunnel and group stunnel
Lines 83-89 Link Here
83
100
84
.if ${OSVERSION} > 500000
101
.if ${OSVERSION} > 500000
85
.if !defined(WITH_STUNNEL_SSL_ENGINE)
102
.if !defined(WITH_STUNNEL_SSL_ENGINE)
86
EXTRA_PATCHES=	${FILESDIR}/ssl-noengine.patch
103
EXTRA_PATCHES+=	${FILESDIR}/ssl-noengine.patch
87
pre-patch:
104
pre-patch:
88
	@${ECHO} "*************************************************************************"
105
	@${ECHO} "*************************************************************************"
89
	@${ECHO} "Note: you have to explicitly define WITH_STUNNEL_SSL_ENGINE to activate"
106
	@${ECHO} "Note: you have to explicitly define WITH_STUNNEL_SSL_ENGINE to activate"
(-)stunnel/files/common.h-fork.patch (+21 lines)
Line 0 Link Here
1
--- src/common.h.orig	Mon May 16 19:50:46 2005
2
+++ src/common.h	Mon May 16 19:53:05 2005
3
@@ -38,18 +38,7 @@
4
 #endif
5
 
6
 /* threads model */
7
-#if HAVE_UCONTEXT_H && HAVE_GETCONTEXT && HAVE_POLL
8
-#define USE_UCONTEXT
9
-#include <ucontext.h>
10
-#elif HAVE_PTHREAD_H && HAVE_LIBPTHREAD
11
-#define USE_PTHREAD
12
-#include <pthread.h>
13
-#define THREADS
14
-#define _REENTRANT
15
-#define _THREAD_SAFE
16
-#else
17
 #define USE_FORK
18
-#endif
19
 
20
 /* TCP wrapper */
21
 #if HAVE_TCPD_H && HAVE_LIBWRAP
(-)stunnel/files/common.h-pthread.patch (+21 lines)
Line 0 Link Here
1
--- src/common.h.orig	Mon May 16 19:50:46 2005
2
+++ src/common.h	Mon May 16 19:52:45 2005
3
@@ -38,18 +38,11 @@
4
 #endif
5
 
6
 /* threads model */
7
-#if HAVE_UCONTEXT_H && HAVE_GETCONTEXT && HAVE_POLL
8
-#define USE_UCONTEXT
9
-#include <ucontext.h>
10
-#elif HAVE_PTHREAD_H && HAVE_LIBPTHREAD
11
 #define USE_PTHREAD
12
 #include <pthread.h>
13
 #define THREADS
14
 #define _REENTRANT
15
 #define _THREAD_SAFE
16
-#else
17
-#define USE_FORK
18
-#endif
19
 
20
 /* TCP wrapper */
21
 #if HAVE_TCPD_H && HAVE_LIBWRAP
(-)stunnel/files/common.h-ucontext.patch (+21 lines)
Line 0 Link Here
1
--- src/common.h.orig	Mon May 16 19:50:46 2005
2
+++ src/common.h	Mon May 16 19:51:49 2005
3
@@ -38,18 +38,8 @@
4
 #endif
5
 
6
 /* threads model */
7
-#if HAVE_UCONTEXT_H && HAVE_GETCONTEXT && HAVE_POLL
8
 #define USE_UCONTEXT
9
 #include <ucontext.h>
10
-#elif HAVE_PTHREAD_H && HAVE_LIBPTHREAD
11
-#define USE_PTHREAD
12
-#include <pthread.h>
13
-#define THREADS
14
-#define _REENTRANT
15
-#define _THREAD_SAFE
16
-#else
17
-#define USE_FORK
18
-#endif
19
 
20
 /* TCP wrapper */
21
 #if HAVE_TCPD_H && HAVE_LIBWRAP

Return to bug 81289