diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/distcache/Makefile | 5 | ||||
| -rw-r--r-- | security/distcache/files/patch-libnal_proto__fd.c | 10 | ||||
| -rw-r--r-- | security/distcache/files/patch-proto_fd.c | 18 | ||||
| -rw-r--r-- | security/distcache/files/patch-ssl__swamp__swamp.c | 10 | ||||
| -rw-r--r-- | security/distcache/files/patch-ssl__swamp__swamp.h | 6 | ||||
| -rw-r--r-- | security/distcache/files/patch-ssl__swamp__utils.c | 10 |
6 files changed, 29 insertions, 30 deletions
diff --git a/security/distcache/Makefile b/security/distcache/Makefile index 7f0b7021baed..d5836e93fe68 100644 --- a/security/distcache/Makefile +++ b/security/distcache/Makefile @@ -14,12 +14,11 @@ COMMENT= Distributed OpenSSL session caching tools LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= libtool tar:bzip2 +USES= libtool ssl tar:bzip2 USE_RC_SUBR= dc_server -USE_OPENSSL= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared +CONFIGURE_ARGS= --enable-shared --with-ssl=${OPENSSLBASE} INSTALL_TARGET= install-strip SUB_LIST= NAME=dc_server diff --git a/security/distcache/files/patch-libnal_proto__fd.c b/security/distcache/files/patch-libnal_proto__fd.c new file mode 100644 index 000000000000..fe39d22377e1 --- /dev/null +++ b/security/distcache/files/patch-libnal_proto__fd.c @@ -0,0 +1,10 @@ +--- libnal/proto_fd.c.orig 2003-11-27 00:02:32 UTC ++++ libnal/proto_fd.c +@@ -24,6 +24,7 @@ + #include <libnal/nal.h> + #include "nal_internal.h" + #include <libsys/post.h> ++#include <sys/limits.h> + + /**************************/ + /* predeclare our vtables */ diff --git a/security/distcache/files/patch-proto_fd.c b/security/distcache/files/patch-proto_fd.c deleted file mode 100644 index a9bbf9a8bba2..000000000000 --- a/security/distcache/files/patch-proto_fd.c +++ /dev/null @@ -1,18 +0,0 @@ -*** libnal/proto_fd.c.ori Wed Apr 13 19:34:07 2005 ---- libnal/proto_fd.c Wed Apr 13 21:51:20 2005 -*************** -*** 24,29 **** ---- 24,36 ---- - #include <libnal/nal.h> - #include "nal_internal.h" - #include <libsys/post.h> -+ #ifdef __FreeBSD__ -+ #if __FreeBSD_version >= 502010 -+ #include <sys/limits.h> -+ #else -+ #include <machine/limits.h> -+ #endif -+ #endif /* __FreeBSD__ */ - - /**************************/ - /* predeclare our vtables */ diff --git a/security/distcache/files/patch-ssl__swamp__swamp.c b/security/distcache/files/patch-ssl__swamp__swamp.c index abc49335d02b..b21f89363d5c 100644 --- a/security/distcache/files/patch-ssl__swamp__swamp.c +++ b/security/distcache/files/patch-ssl__swamp__swamp.c @@ -1,6 +1,6 @@ ---- ssl/swamp/swamp.c.orig 2004-02-19 15:37:33.000000000 -0500 -+++ ssl/swamp/swamp.c 2015-03-23 19:47:07.787300000 -0400 -@@ -104,8 +104,10 @@ +--- ssl/swamp/swamp.c.orig 2004-02-19 20:37:33 UTC ++++ ssl/swamp/swamp.c +@@ -104,10 +104,14 @@ static SSL_CTX *ossl_setup_ssl_ctx(const switch(config->sslmeth) { case SWAMP_SSLMETH_NORMAL: sslmethod = SSLv23_client_method(); break; @@ -8,6 +8,10 @@ case SWAMP_SSLMETH_SSLv2: sslmethod = SSLv2_client_method(); break; +#endif ++#ifndef OPENSSL_NO_SSL3 case SWAMP_SSLMETH_SSLv3: sslmethod = SSLv3_client_method(); break; ++#endif case SWAMP_SSLMETH_TLSv1: + sslmethod = TLSv1_client_method(); break; + default: diff --git a/security/distcache/files/patch-ssl__swamp__swamp.h b/security/distcache/files/patch-ssl__swamp__swamp.h index 8de5ef1cf0b3..763b1922bb24 100644 --- a/security/distcache/files/patch-ssl__swamp__swamp.h +++ b/security/distcache/files/patch-ssl__swamp__swamp.h @@ -1,6 +1,6 @@ ---- ssl/swamp/swamp.h.orig 2004-02-17 15:29:34.000000000 -0500 -+++ ssl/swamp/swamp.h 2015-03-23 19:47:20.490894000 -0400 -@@ -161,7 +161,9 @@ +--- ssl/swamp/swamp.h.orig 2004-02-17 20:29:34 UTC ++++ ssl/swamp/swamp.h +@@ -161,7 +161,9 @@ char *util_parse_escaped_string(const ch typedef enum st_swamp_sslmeth { SWAMP_SSLMETH_NORMAL, /* SSLv23_client_method() */ diff --git a/security/distcache/files/patch-ssl__swamp__utils.c b/security/distcache/files/patch-ssl__swamp__utils.c index bb68c905c223..813fd3ab268b 100644 --- a/security/distcache/files/patch-ssl__swamp__utils.c +++ b/security/distcache/files/patch-ssl__swamp__utils.c @@ -1,6 +1,6 @@ ---- ssl/swamp/utils.c.orig 2004-02-17 15:29:34.000000000 -0500 -+++ ssl/swamp/utils.c 2015-03-23 19:47:34.795067000 -0400 -@@ -269,8 +269,10 @@ +--- ssl/swamp/utils.c.orig 2004-02-17 20:29:34 UTC ++++ ssl/swamp/utils.c +@@ -269,10 +269,14 @@ int util_parse_sslmeth(const char *str_t { if(!strcmp(str_toconvert, "normal")) *val = SWAMP_SSLMETH_NORMAL; @@ -8,6 +8,10 @@ else if(!strcmp(str_toconvert, "sslv2")) *val = SWAMP_SSLMETH_SSLv2; +#endif ++#ifndef OPENSSL_NO_SSL3 else if(!strcmp(str_toconvert, "sslv3")) *val = SWAMP_SSLMETH_SSLv3; ++#endif else if(!strcmp(str_toconvert, "tlsv1")) + *val = SWAMP_SSLMETH_TLSv1; + else |