Attachment #157184 for bug #200412




# $FreeBSD$

PORTNAME=	libscrypt
PORTVERSION=	1.20
DISTVERSIONPREFIX=	v
CATEGORIES=	security

MAINTAINER=	horia@racoviceanu.com

USE_LDCONFIG=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	technion
GH_TAGNAME=	457ff86

MAKE_ARGS+=	CC="${CC}" LIBDIR="${PREFIX}"/lib

PLIST_FILES=	include/libscrypt.h \
		lib/libscrypt.so \

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 \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (technion-libscrypt-1.19-457ff86_GH0.tar.gz) = 402ddeee71ed0a068ff03a370dbbb93bd87d5e0ebd05a285dab89a9bac098280	1	SHA256 (technion-libscrypt-v1.20_GH0.tar.gz) = 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21
2	SIZE (technion-libscrypt-1.19-457ff86_GH0.tar.gz) = 18208	2	SIZE (technion-libscrypt-v1.20_GH0.tar.gz) = 18451

Return to bug 200412

Lines 2-8 Link Here

(-)Makefile (-14 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libscrypt	4	PORTNAME= libscrypt
5	PORTVERSION= 1.19	5	PORTVERSION= 1.20
		6	DISTVERSIONPREFIX= v
6	CATEGORIES= security	7	CATEGORIES= security
7		8
8	MAINTAINER= horia@racoviceanu.com	9	MAINTAINER= horia@racoviceanu.com
Lines 14-22 Link Here
14	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
15	USE_GITHUB= yes	16	USE_GITHUB= yes
16	GH_ACCOUNT= technion	17	GH_ACCOUNT= technion
17	GH_TAGNAME= 457ff86
18		18
19	MAKE_ARGS+= CC="${CC}" LIBDIR=${PREFIX}/lib	19	MAKE_ARGS+= CC="${CC}" LIBDIR="${PREFIX}"/lib
20		20
21	PLIST_FILES= include/libscrypt.h \	21	PLIST_FILES= include/libscrypt.h \
22	lib/libscrypt.so \	22	lib/libscrypt.so \
Lines 25-50 Link Here
25	PORTDOCS= README.md	25	PORTDOCS= README.md
26		26
27	OPTIONS_DEFINE= DOCS	27	OPTIONS_DEFINE= DOCS
28	OPTIONS_DEFAULT=STACKPROTECTOR
29		28
30	OPTIONS_SINGLE= BUFFER_OVERFLOW_PROTECTION
31	OPTIONS_SINGLE_BUFFER_OVERFLOW_PROTECTION= STACKPROTECTOR STACKPROTECTORALL
32
33	STACKPROTECTOR_DESC= Protect functions with vulnerable objects
34	STACKPROTECTORALL_DESC= Protect all functions
35
36	.include <bsd.port.pre.mk>	29	.include <bsd.port.pre.mk>
37		30
38	post-patch:	31	post-patch:
39	@${REINPLACE_CMD} -e 's\|?=-\|+=-\|; s\|-O2 \|\|' ${WRKSRC}/Makefile	32	@${REINPLACE_CMD} -e 's\|?=-\|+=-\|; s\|-O2 \|\|' ${WRKSRC}/Makefile
40		33
41	.if ${PORT_OPTIONS:MSTACKPROTECTORALL}
42	@${REINPLACE_CMD} -e 's\|stack-protector\|&-all\|' ${WRKSRC}/Makefile
43	.endif
44
45	.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc && ${OSVERSION} < 1000036	34	.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc && ${OSVERSION} < 1000036
46	@${REINPLACE_CMD} -e 's\|-lscrypt\|& -lssp_nonshared\|; \	35	@${REINPLACE_CMD} -e 's\|-lscrypt\|& -lssp_nonshared\|; \
47	s\|\.version\|&,-lssp_nonshared\|' ${WRKSRC}/Makefile	36	s\|\.version\|&,-lssp_nonshared\|' ${WRKSRC}/Makefile
		37	.else
		38	@${REINPLACE_CMD} -e 's\|-fstack-protector \|\|' ${WRKSRC}/Makefile
48	.endif	39	.endif
49		40
50	@${REINPLACE_CMD} -e \	41	@${REINPLACE_CMD} -e \