svn commit: r387525 - head/security/libscrypt

[Dmitry Marakasov]

Author: amdmi3
Date: Tue May 26 23:47:18 2015
New Revision: 387525
URL: https://svnweb.freebsd.org/changeset/ports/387525

Log:
  - Update to upstream version 1.20
  - Quote variable in MAKE_ARGS
  - Remove STACKPROTECTOR and STACKPROTECTORALL from OPTIONS
  - Use tag instead of commit hash in GH_TAGNAME
  
  - While here, add LICENSE_FILE
  
  PR:		200412
  Submitted by:	horia at racoviceanu.com (maintainer)

Modified:
  head/security/libscrypt/Makefile
  head/security/libscrypt/distinfo

Modified: head/security/libscrypt/Makefile
==============================================================================
--- head/security/libscrypt/Makefile	Tue May 26 23:39:40 2015	(r387524)
+++ head/security/libscrypt/Makefile	Tue May 26 23:47:18 2015	(r387525)
@@ -2,21 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	libscrypt
-PORTVERSION=	1.19
+PORTVERSION=	1.20
+DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	horia at racoviceanu.com
 COMMENT=	C library for the scrypt key derivation function
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	technion
-GH_TAGNAME=	457ff86
 
-MAKE_ARGS+=	CC="${CC}" LIBDIR=${PREFIX}/lib
+MAKE_ARGS+=	CC="${CC}" LIBDIR="${PREFIX}"/lib
 
 PLIST_FILES=	include/libscrypt.h \
 		lib/libscrypt.so \
@@ -25,26 +26,17 @@ PLIST_FILES=	include/libscrypt.h \
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=STACKPROTECTOR
-
-OPTIONS_SINGLE=	BUFFER_OVERFLOW_PROTECTION
-OPTIONS_SINGLE_BUFFER_OVERFLOW_PROTECTION=	STACKPROTECTOR STACKPROTECTORALL
-
-STACKPROTECTOR_DESC=	Protect functions with vulnerable objects
-STACKPROTECTORALL_DESC=	Protect all functions
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|?=-|+=-|; s|-O2 ||' ${WRKSRC}/Makefile
 
-.if ${PORT_OPTIONS:MSTACKPROTECTORALL}
-	@${REINPLACE_CMD} -e 's|stack-protector|&-all|' ${WRKSRC}/Makefile
-.endif
-
 .if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc && ${OSVERSION} < 1000036
 	@${REINPLACE_CMD} -e 's|-lscrypt|& -lssp_nonshared|; \
 		s|\.version|&,-lssp_nonshared|' ${WRKSRC}/Makefile
+.else
+	@${REINPLACE_CMD} -e 's|-fstack-protector ||' ${WRKSRC}/Makefile
 .endif
 
 	@${REINPLACE_CMD} -e \

Modified: head/security/libscrypt/distinfo
==============================================================================
--- head/security/libscrypt/distinfo	Tue May 26 23:39:40 2015	(r387524)
+++ head/security/libscrypt/distinfo	Tue May 26 23:47:18 2015	(r387525)
@@ -1,2 +1,2 @@
-SHA256 (technion-libscrypt-1.19-457ff86_GH0.tar.gz) = 402ddeee71ed0a068ff03a370dbbb93bd87d5e0ebd05a285dab89a9bac098280
-SIZE (technion-libscrypt-1.19-457ff86_GH0.tar.gz) = 18208
+SHA256 (technion-libscrypt-v1.20_GH0.tar.gz) = 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21
+SIZE (technion-libscrypt-v1.20_GH0.tar.gz) = 18451