diff options
| -rw-r--r-- | security/stunnel/Makefile | 22 | ||||
| -rw-r--r-- | security/stunnel/files/ssl-noengine.patch | 11 |
2 files changed, 32 insertions, 1 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 5a8790755df7..0db9946c0da3 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -7,6 +7,7 @@ PORTNAME= stunnel PORTVERSION= 4.05 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \ ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \ @@ -17,8 +18,10 @@ COMMENT= SSL encryption wrapper for standard network daemons USE_OPENSSL= YES USE_REINPLACE= YES +USE_INC_LIBTOOL_VER= 13 GNU_CONFIGURE= yes +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/tmp --with-pem-dir=${PEM_DIR} \ --enable-static @@ -68,7 +71,24 @@ cert: .include <bsd.port.pre.mk> .if ${OSVERSION} > 500000 -IGNORE= Bus error with OpenSSL in -CURRENT, under investigation +.if !defined(WITH_STUNNEL_SSL_ENGINE) +EXTRA_PATCHES= ${FILESDIR}/ssl-noengine.patch +pre-patch: + @${ECHO} "*************************************************************************" + @${ECHO} "Note: you have to explicitly define WITH_STUNNEL_SSL_ENGINE to activate" + @${ECHO} "the OpenSSL ENGINE code on FreeBSD 5.x." + @${ECHO} "There are known reliability issues with stunnel and the OpenSSL ENGINE" + @${ECHO} "code, so you are advised not to enable it." + @${ECHO} "*************************************************************************" +.else +pre-patch: + @${ECHO} "*************************************************************************" + @${ECHO} "Note: you have defined WITH_STUNNEL_SSL_ENGINE. Now stunnel will activate" + @${ECHO} "the OpenSSL ENGINE code even on FreeBSD 5.x." + @${ECHO} "There are known reliability issues with stunnel and the OpenSSL ENGINE" + @${ECHO} "code. You have enabled it at your own risk." + @${ECHO} "*************************************************************************" +.endif .endif .include <bsd.port.post.mk> diff --git a/security/stunnel/files/ssl-noengine.patch b/security/stunnel/files/ssl-noengine.patch new file mode 100644 index 000000000000..e2a444b12ef0 --- /dev/null +++ b/security/stunnel/files/ssl-noengine.patch @@ -0,0 +1,11 @@ +--- src/ssl.c.orig Thu Sep 2 18:02:59 2004 ++++ src/ssl.c Thu Sep 2 18:03:26 2004 +@@ -70,7 +70,7 @@ + void context_init(void) { /* init SSL */ + int i; + +-#if SSLEAY_VERSION_NUMBER >= 0x00907000L ++#if 0 + /* Load all bundled ENGINEs into memory and make them visible */ + ENGINE_load_builtin_engines(); + /* Register all of them for every algorithm they collectively implement */ |