aboutsummaryrefslogtreecommitdiff
path: root/security/libscrypt
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2015-05-26 23:47:18 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2015-05-26 23:47:18 +0000
commit74654a4da40f043cb9399c08d416b447924b7b8f (patch)
treed98f7cf42eb9959b10d11d18f7d362b1c6f78d0f /security/libscrypt
parent1761870a317c3ef75a6fcc3aeb683548bcd55dfa (diff)
downloadports-74654a4da40f043cb9399c08d416b447924b7b8f.tar.gz
ports-74654a4da40f043cb9399c08d416b447924b7b8f.zip
- 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@racoviceanu.com (maintainer)
Notes
Notes: svn path=/head/; revision=387525
Diffstat (limited to 'security/libscrypt')
-rw-r--r--security/libscrypt/Makefile20
-rw-r--r--security/libscrypt/distinfo4
2 files changed, 8 insertions, 16 deletions
diff --git a/security/libscrypt/Makefile b/security/libscrypt/Makefile
index ba45a5185d34..463a6cec7a78 100644
--- a/security/libscrypt/Makefile
+++ b/security/libscrypt/Makefile
@@ -2,21 +2,22 @@
# $FreeBSD$
PORTNAME= libscrypt
-PORTVERSION= 1.19
+PORTVERSION= 1.20
+DISTVERSIONPREFIX= v
CATEGORIES= security
MAINTAINER= horia@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 \
diff --git a/security/libscrypt/distinfo b/security/libscrypt/distinfo
index 487dcc0e05cb..719d775fbf61 100644
--- a/security/libscrypt/distinfo
+++ b/security/libscrypt/distinfo
@@ -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