From owner-svn-ports-all@freebsd.org Tue Sep 13 19:06:36 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A521BD9FBF; Tue, 13 Sep 2016 19:06:36 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EEAC4750; Tue, 13 Sep 2016 19:06:35 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8DJ6ZWm011665; Tue, 13 Sep 2016 19:06:35 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DJ6ZL0011664; Tue, 13 Sep 2016 19:06:35 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609131906.u8DJ6ZL0011664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 13 Sep 2016 19:06:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422063 - head/net-mgmt/zabbix3-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2016 19:06:36 -0000 Author: marino Date: Tue Sep 13 19:06:34 2016 New Revision: 422063 URL: https://svnweb.freebsd.org/changeset/ports/422063 Log: net-mgmt/zabbix3-server: Simplify FreeBSD 9 SSL check, ignore LibreSSL Zabbix3-server can't be built by LibreSSL because it uses PSK. It also can't be built by FreeBSD 9 base OpenSSL. The latter was documented, but the solution in the notification was incorrect, so improve all that. Approved by: SSL blanket Modified: head/net-mgmt/zabbix3-server/Makefile Modified: head/net-mgmt/zabbix3-server/Makefile ============================================================================== --- head/net-mgmt/zabbix3-server/Makefile Tue Sep 13 19:00:41 2016 (r422062) +++ head/net-mgmt/zabbix3-server/Makefile Tue Sep 13 19:06:34 2016 (r422063) @@ -152,8 +152,12 @@ POLARSSL_LIB_DEPENDS= libmbedtls.so:secu .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base -IGNORE= OpenSSL from the base system is too old, add DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything that needs SSL. +.if ${SSL_DEFAULT} == base +IGNORE_FreeBSD_9= Requires newer OpenSSL (set SSL_DEFAULT=openssl) +.endif + +.if ${SSL_DEFAULT:Mlibressl*} +IGNORE= Requires PSK which is unsupported by the selected LibreSSL .endif post-patch: