Date: Sun, 11 Sep 2016 04:20:20 +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: r421788 - head/security/pam_ocra Message-ID: <201609110420.u8B4KK96085992@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Sep 11 04:20:19 2016 New Revision: 421788 URL: https://svnweb.freebsd.org/changeset/ports/421788 Log: security/pam_ocra: Fix SSL handling especially wrt FreeBSD 9 The SSL flags were moved to show unconditionally as they are always correct. The WITH_OPENSSL_PORT=yes variable was replaced with an SSL version check so that the port is marked broken if built on FreeBSD 9 with the base OpenSSL libary selected. This fixes other values of SSL_DEFAULT on all platforms. Approved by: SSL blanket Modified: head/security/pam_ocra/Makefile Modified: head/security/pam_ocra/Makefile ============================================================================== --- head/security/pam_ocra/Makefile Sun Sep 11 04:09:29 2016 (r421787) +++ head/security/pam_ocra/Makefile Sun Sep 11 04:20:19 2016 (r421788) @@ -10,25 +10,23 @@ COMMENT= RFC6287 (OCRA) PAM module LICENSE= BSD2CLAUSE -USES= uidfix -USE_OPENSSL= yes - +USES= ssl uidfix USE_GITHUB= yes - GH_ACCOUNT= sg2342 +CFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} + PLIST_FILES= lib/pam_ocra.so \ lib/pam_ocra.so.0 \ sbin/ocra_tool \ man/man8/pam_ocra.8.gz \ man/man8/ocra_tool.8.gz -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> -.if ${OSVERSION} < 1000015 -WITH_OPENSSL_PORT= yes -CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} +.if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_9= does not build with 9.x base OpenSSL .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609110420.u8B4KK96085992>