Index: head/security/distcache/Makefile =================================================================== --- head/security/distcache/Makefile (revision 421922) +++ head/security/distcache/Makefile (revision 421923) @@ -1,38 +1,37 @@ # Created by: Marcel Prisi # $FreeBSD$ PORTNAME= distcache PORTVERSION= 1.4.5 PORTREVISION= 2 CATEGORIES= security www MASTER_SITES= SF/${PORTNAME}/2.%20${PORTNAME}-stable/${PORTVERSION} \ http://osdn.dl.sourceforge.net/sourceforge/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org 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 PORTDOCS= ANNOUNCE BUGS CHANGES FAQ README OPTIONS_DEFINE= DOCS post-install: # INSTALL_TARGET=install-strip isn't working! Brute force it @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/security/distcache/files/patch-proto_fd.c =================================================================== --- head/security/distcache/files/patch-proto_fd.c (revision 421922) +++ head/security/distcache/files/patch-proto_fd.c (nonexistent) @@ -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 - #include "nal_internal.h" - #include -+ #ifdef __FreeBSD__ -+ #if __FreeBSD_version >= 502010 -+ #include -+ #else -+ #include -+ #endif -+ #endif /* __FreeBSD__ */ - - /**************************/ - /* predeclare our vtables */ Property changes on: head/security/distcache/files/patch-proto_fd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/distcache/files/patch-libnal_proto__fd.c =================================================================== --- head/security/distcache/files/patch-libnal_proto__fd.c (nonexistent) +++ head/security/distcache/files/patch-libnal_proto__fd.c (revision 421923) @@ -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 + #include "nal_internal.h" + #include ++#include + + /**************************/ + /* predeclare our vtables */ Property changes on: head/security/distcache/files/patch-libnal_proto__fd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/distcache/files/patch-ssl__swamp__swamp.c =================================================================== --- head/security/distcache/files/patch-ssl__swamp__swamp.c (revision 421922) +++ head/security/distcache/files/patch-ssl__swamp__swamp.c (revision 421923) @@ -1,13 +1,17 @@ ---- 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; +#ifndef OPENSSL_NO_SSL2 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: Index: head/security/distcache/files/patch-ssl__swamp__swamp.h =================================================================== --- head/security/distcache/files/patch-ssl__swamp__swamp.h (revision 421922) +++ head/security/distcache/files/patch-ssl__swamp__swamp.h (revision 421923) @@ -1,12 +1,12 @@ ---- 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() */ +#ifndef OPENSSL_NO_SSL2 SWAMP_SSLMETH_SSLv2, /* SSLv2_client_method() */ +#endif SWAMP_SSLMETH_SSLv3, /* SSLv3_client_method() */ SWAMP_SSLMETH_TLSv1 /* TLSv1_client_method() */ } swamp_sslmeth; Index: head/security/distcache/files/patch-ssl__swamp__utils.c =================================================================== --- head/security/distcache/files/patch-ssl__swamp__utils.c (revision 421922) +++ head/security/distcache/files/patch-ssl__swamp__utils.c (revision 421923) @@ -1,13 +1,17 @@ ---- 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; +#ifndef OPENSSL_NO_SSL2 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