# Makefile                            |    7 ++++---
# files/patch-crypto__x509__by_file.c |   15 +++++++++++++++
# 2 files changed, 19 insertions(+), 3 deletions(-)
# svn status
M       security/openssl/Makefile
A       security/openssl/files/patch-crypto__x509__by_file.c

Index: security/openssl/Makefile
===================================================================
--- security/openssl/Makefile	(revision 369741)
+++ security/openssl/Makefile	(working copy)
@@ -4,7 +4,7 @@
 PORTNAME=	openssl
 PORTVERSION=	1.0.1
 DISTVERSIONSUFFIX=	i
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
 		ftp://ftp.openssl.org/%SUBDIR%/ \
@@ -59,6 +59,7 @@ USES=		perl5 cpe
 USE_PERL5=	build
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
+CFLAGS+=	-DLOCALBASE="${LOCALBASE:Q}"
 SUB_FILES=	pkg-message
 
 CPE_VERSION=	${PORTVERSION}${DISTVERSIONSUFFIX}
@@ -216,14 +217,14 @@ do-configure:
 		${WRKSRC}/config
 .if ${PORT_OPTIONS:MTHREADS}
 	cd ${WRKSRC} \
-	&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
+	&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS=${CFLAGS:Q} PERL="${PERL}" \
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
 	./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
 		--install_prefix=${STAGEDIR} \
 		-L${PREFIX}/lib ${EXTRACONFIGURE}
 .else
 	cd ${WRKSRC} \
-	&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
+	&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS=${CFLAGS:Q} PERL="${PERL}" \
 	./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
 		--install_prefix=${STAGEDIR} \
 		-L${PREFIX}/lib ${EXTRACONFIGURE}
Index: security/openssl/files/patch-crypto__x509__by_file.c
===================================================================
--- security/openssl/files/patch-crypto__x509__by_file.c	(revision 0)
+++ security/openssl/files/patch-crypto__x509__by_file.c	(working copy)
@@ -0,0 +1,15 @@
+--- crypto/x509/by_file.c.orig	2014-10-01 14:12:26.415174536 -0500
++++ crypto/x509/by_file.c	2014-10-01 14:12:37.313173487 -0500
+@@ -105,9 +105,12 @@ static int by_file_ctrl(X509_LOOKUP *ctx
+ 				ok = (X509_load_cert_crl_file(ctx,file,
+ 					      X509_FILETYPE_PEM) != 0);
+ 
+ 			else
++				if ((ok = (X509_load_cert_crl_file(ctx,
++				    LOCALBASE "/etc/ssl/cert.pem",
++				    X509_FILETYPE_PEM) != 0)) == 0)
+ 				ok = (X509_load_cert_crl_file(ctx,X509_get_default_cert_file(),
+ 					      X509_FILETYPE_PEM) != 0);
+ 
+ 			if (!ok)
+ 				{

Property changes on: security/openssl/files/patch-crypto__x509__by_file.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
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