diff options
author | Rene Ladan <rene@FreeBSD.org> | 2018-05-01 19:03:18 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2018-05-01 19:03:18 +0000 |
commit | 2a5c72ab87762a201c2e1c4eb965c04601fbbcfb (patch) | |
tree | 150e9c762eab6f05d0c20ed95aa5848592293d34 | |
parent | 88348d75cdca5b52e3b225f8a1e4b11bddf645db (diff) |
Notes
-rw-r--r-- | ftp/curl/Makefile | 6 | ||||
-rw-r--r-- | net-mgmt/zabbix3-server/Makefile | 7 | ||||
-rw-r--r-- | net-mgmt/zabbix32-server/Makefile | 7 | ||||
-rw-r--r-- | net-mgmt/zabbix34-server/Makefile | 7 | ||||
-rw-r--r-- | net-p2p/transmission-cli/Makefile | 5 |
5 files changed, 9 insertions, 23 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index be0ca71bba17..3c521de7cde7 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -18,7 +18,7 @@ OPTIONS_GROUP= PROTOCOL OPTIONS_RADIO= SSL OPTIONS_SINGLE= GSSAPI RESOLV OPTIONS_GROUP_PROTOCOL= DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH2 POP3 RTMP RTSP SMB SMTP TELNET TFTP -OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL WOLFSSL +OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL WOLFSSL OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER OPTIONS_DEFAULT= CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP OPENSSL POP3 PROXY RESOLV RTSP SMTP TELNET TFTP THREADED_RESOLVER TLS_SRP @@ -122,8 +122,6 @@ OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} OPENSSL_USES= ssl -POLARSSL_CONFIGURE_WITH=polarssl -POLARSSL_LIB_DEPENDS= libmbedtls.so.9:security/polarssl13 POP3_CONFIGURE_ENABLE= pop3 PROXY_CONFIGURE_ENABLE= proxy PSL_CONFIGURE_WITH= libpsl @@ -147,7 +145,7 @@ WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS .endif -.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL} && !${PORT_OPTIONS:MWOLFSSL} +.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL} IGNORE= only supports LDAPS with SSL .endif diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile index 0f14c3978d49..f098741b2f68 100644 --- a/net-mgmt/zabbix3-server/Makefile +++ b/net-mgmt/zabbix3-server/Makefile @@ -84,7 +84,7 @@ LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) OPTIONS_SINGLE= DB ODBC SSL OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= mysql @@ -121,7 +121,7 @@ UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .else OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 @@ -143,9 +143,6 @@ OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \ GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -POLARSSL_CONFIGURE_WITH=mbedtls -POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 - .include <bsd.port.pre.mk> post-patch: diff --git a/net-mgmt/zabbix32-server/Makefile b/net-mgmt/zabbix32-server/Makefile index 8c39db7c5276..36a375086b37 100644 --- a/net-mgmt/zabbix32-server/Makefile +++ b/net-mgmt/zabbix32-server/Makefile @@ -86,7 +86,7 @@ LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) OPTIONS_SINGLE= DB ODBC SSL OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= mysql @@ -123,7 +123,7 @@ UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .else OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 @@ -145,9 +145,6 @@ OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \ GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -POLARSSL_CONFIGURE_WITH=mbedtls -POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 - .include <bsd.port.pre.mk> post-patch: diff --git a/net-mgmt/zabbix34-server/Makefile b/net-mgmt/zabbix34-server/Makefile index 7b9ad1f18279..0be8c76549c2 100644 --- a/net-mgmt/zabbix34-server/Makefile +++ b/net-mgmt/zabbix34-server/Makefile @@ -90,7 +90,7 @@ LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) OPTIONS_SINGLE= DB ODBC SSL OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= mysql @@ -127,7 +127,7 @@ UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .else OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 @@ -149,9 +149,6 @@ OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \ GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -POLARSSL_CONFIGURE_WITH=mbedtls -POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 - .include <bsd.port.pre.mk> post-patch: diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile index e13ea2c6fdd6..86f3493b4198 100644 --- a/net-p2p/transmission-cli/Makefile +++ b/net-p2p/transmission-cli/Makefile @@ -62,7 +62,7 @@ EXTRA_PATCHES= ${PATCHDIR}/disable-web OPTIONS_DEFINE+= DOCS LITE OPTIONS_DEFAULT+= OPENSSL OPTIONS_SINGLE+= SSL -OPTIONS_SINGLE_SSL+= OPENSSL POLARSSL WOLFSSL +OPTIONS_SINGLE_SSL+= OPENSSL WOLFSSL LITE_CONFIGURE_ENABLE= lightweight @@ -71,9 +71,6 @@ OPENSSL_CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" OPENSSL_CONFIGURE_ON= --with-crypto=openssl -POLARSSL_LIB_DEPENDS= libpolarssl.so:security/polarssl13 -POLARSSL_CONFIGURE_ON= --with-crypto=polarssl - WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl WOLFSSL_CONFIGURE_ON= --with-crypto=cyassl WOLFSSL_BROKEN= Requires security/wolfssl built with --enable-arc4 |