svn commit: r382265 - head/security/openvpn

[Matthias Andree]

Author: mandree
Date: Wed Mar 25 20:06:20 2015
New Revision: 382265
URL: https://svnweb.freebsd.org/changeset/ports/382265
QAT: https://qat.redports.org/buildarchive/r382265/

Log:
  Add a X509ALTUSERNAME port option to enable the --x509-username-field
  run-time option.
  
  Bump PORTREVISION.
  
  PR:		198896
  Submitted by:	bastian+freebsd.org at waldi.eu.org

Modified:
  head/security/openvpn/Makefile

Modified: head/security/openvpn/Makefile
==============================================================================
--- head/security/openvpn/Makefile	Wed Mar 25 19:20:37 2015	(r382264)
+++ head/security/openvpn/Makefile	Wed Mar 25 20:06:20 2015	(r382265)
@@ -3,7 +3,7 @@
 
 PORTNAME=		openvpn
 DISTVERSION=		2.3.6
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		security net
 MASTER_SITES=		http://swupdate.openvpn.net/community/releases/ \
 			http://build.openvpn.net/downloads/releases/
@@ -25,7 +25,7 @@ SHEBANG_FILES=		sample/sample-scripts/ve
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=		PW_SAVE PKCS11 EASYRSA DOCS EXAMPLES
+OPTIONS_DEFINE=		PW_SAVE PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME
 OPTIONS_DEFAULT=	EASYRSA OPENSSL
 OPTIONS_SINGLE=		SSL
 OPTIONS_SINGLE_SSL=	OPENSSL POLARSSL
@@ -33,6 +33,7 @@ PW_SAVE_DESC=		Interactive passwords may
 PKCS11_DESC=		Use security/pkcs11-helper
 EASYRSA_DESC=		Install security/easy-rsa RSA helper package
 POLARSSL_DESC=		SSL/TLS support via PolarSSL
+X509ALTUSERNAME_DESC=	Enable --x509-username-field (only with OpenSSL)
 
 EASYRSA_RUN_DEPENDS=	easy-rsa>=0:${PORTSDIR}/security/easy-rsa
 
@@ -41,11 +42,17 @@ PKCS11_CONFIGURE_ENABLE=	pkcs11
 
 PW_SAVE_CONFIGURE_ENABLE=	password-save
 
+X509ALTUSERNAME_CONFIGURE_ENABLE=	x509-alt-username
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPOLARSSL}
+. if ${PORT_OPTIONS:MX509ALTUSERNAME}
+BROKEN=	OpenVPN ${DISTVERSION} cannot use --x509-username-field with PolarSSL. Disable X509ALTUSERNAME, or use OpenSSL instead
+. else
 LIB_DEPENDS+=		libpolarssl.so:${PORTSDIR}/security/polarssl
 CONFIGURE_ARGS+=	--with-crypto-library=polarssl
+. endif
 .else
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--with-crypto-library=openssl