Date: Mon, 21 Sep 2015 19:03:14 +0000 (UTC) From: Bartek Rutkowski <robak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397516 - head/security/pecl-scrypt Message-ID: <201509211903.t8LJ3ERP073439@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: robak Date: Mon Sep 21 19:03:13 2015 New Revision: 397516 URL: https://svnweb.freebsd.org/changeset/ports/397516 Log: security/pecl-scrypt: various fixes and improvements - Bump PORTREVISION - Replace STRIP_CMD with INSTALL_TARGET=install-strip - Remove STACKPROTECTOR and STACKPROTECTORALL from options - Add EXAMPLES and TEST to options PR: 200698 Submitted by: Horia Racoviceanu <horia@racoviceanu.com> (maintainer) Modified: head/security/pecl-scrypt/Makefile Modified: head/security/pecl-scrypt/Makefile ============================================================================== --- head/security/pecl-scrypt/Makefile Mon Sep 21 18:11:06 2015 (r397515) +++ head/security/pecl-scrypt/Makefile Mon Sep 21 19:03:13 2015 (r397516) @@ -3,7 +3,7 @@ PORTNAME= scrypt PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security pear MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- @@ -17,33 +17,43 @@ USES= compiler tar:tgz USE_PHP= hash USE_PHPEXT= yes USE_PHP_BUILD= yes +INSTALL_TARGET= install-strip DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= README.md -OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=STACKPROTECTOR +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} +PORTEXAMPLES= scrypt.php -OPTIONS_RADIO= BUFFER_OVERFLOW_PROTECTION -OPTIONS_RADIO_BUFFER_OVERFLOW_PROTECTION= STACKPROTECTOR STACKPROTECTORALL +TESTDIR= ${PREFIX}/tests/${PKGNAMEPREFIX}${PORTNAME} +PORTTEST= run-tests.php tests/params.phpt tests/vectors.phpt -STACKPROTECTOR_DESC= Protect functions with vulnerable objects -STACKPROTECTORALL_DESC= Protect all functions +OPTIONS_DEFINE= DOCS EXAMPLES TEST -STACKPROTECTOR_CFLAGS= -fstack-protector -STACKPROTECTORALL_CFLAGS= -fstack-protector-all +TEST_PLIST_FILES= ${PORTTEST:S|^|${TESTDIR:S|${PREFIX}/||:S|$|/|}|} .include <bsd.port.pre.mk> +.if ${ARCH} == i386 && ${OSVERSION} < 1000036 +CFLAGS+= -fstack-protector +.endif + .if ${ARCH} != amd64 && ${COMPILER_TYPE} == gcc post-patch: ${REINPLACE_CMD} '/emmintrin.h/d' ${WRKSRC}/config.m4 .endif post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/${PORTNAME}.so - @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR} + +.if ${PORT_OPTIONS:MTEST} + @${MKDIR} ${STAGEDIR}${TESTDIR} + ${INSTALL_DATA} ${PORTTEST:M*.php:S|^|${WRKSRC}/|} ${STAGEDIR}${TESTDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} tests ${STAGEDIR}${TESTDIR}) +.endif + .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509211903.t8LJ3ERP073439>