Date: Mon, 12 Sep 2016 13:23:47 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421923 - in head/security/distcache: . files Message-ID: <201609121323.u8CDNl9N011380@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Sep 12 13:23:47 2016 New Revision: 421923 URL: https://svnweb.freebsd.org/changeset/ports/421923 Log: security/distcache: Configure SSL base, fix build on LibreSSL While here, simplify existing patch for modern FreeBSD and DragonFly Added: head/security/distcache/files/patch-libnal_proto__fd.c (contents, props changed) Deleted: head/security/distcache/files/patch-proto_fd.c Modified: head/security/distcache/Makefile head/security/distcache/files/patch-ssl__swamp__swamp.c head/security/distcache/files/patch-ssl__swamp__swamp.h head/security/distcache/files/patch-ssl__swamp__utils.c Modified: head/security/distcache/Makefile ============================================================================== --- head/security/distcache/Makefile Mon Sep 12 13:01:32 2016 (r421922) +++ head/security/distcache/Makefile Mon Sep 12 13:23:47 2016 (r421923) @@ -14,12 +14,11 @@ COMMENT= Distributed OpenSSL session cac 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 Added: head/security/distcache/files/patch-libnal_proto__fd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/distcache/files/patch-libnal_proto__fd.c Mon Sep 12 13:23:47 2016 (r421923) @@ -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 */ Modified: head/security/distcache/files/patch-ssl__swamp__swamp.c ============================================================================== --- head/security/distcache/files/patch-ssl__swamp__swamp.c Mon Sep 12 13:01:32 2016 (r421922) +++ head/security/distcache/files/patch-ssl__swamp__swamp.c Mon Sep 12 13:23:47 2016 (r421923) @@ -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: Modified: head/security/distcache/files/patch-ssl__swamp__swamp.h ============================================================================== --- head/security/distcache/files/patch-ssl__swamp__swamp.h Mon Sep 12 13:01:32 2016 (r421922) +++ head/security/distcache/files/patch-ssl__swamp__swamp.h Mon Sep 12 13:23:47 2016 (r421923) @@ -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() */ Modified: head/security/distcache/files/patch-ssl__swamp__utils.c ============================================================================== --- head/security/distcache/files/patch-ssl__swamp__utils.c Mon Sep 12 13:01:32 2016 (r421922) +++ head/security/distcache/files/patch-ssl__swamp__utils.c Mon Sep 12 13:23:47 2016 (r421923) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609121323.u8CDNl9N011380>