Attachment 157081 Details for Bug 200412 – libscrypt.diff

[patch] libscrypt.diff

libscrypt.diff (text/plain), 1.89 KB, created by Horia Racoviceanu on 2015-05-23 14:54:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Horia Racoviceanu

Created: 2015-05-23 14:54:31 UTC

Size: 1.89 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 387020)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libscrypt
>-PORTVERSION=	1.19
>+PORTVERSION=	1.20
> CATEGORIES=	security
> 
> MAINTAINER=	horia@racoviceanu.com
>@@ -14,9 +14,9 @@
> USE_LDCONFIG=	yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	technion
>-GH_TAGNAME=	457ff86
>+GH_TAGNAME=	c107c41
> 
>-MAKE_ARGS+=	CC="${CC}" LIBDIR=${PREFIX}/lib
>+MAKE_ARGS+=	CC="${CC}" LIBDIR="${PREFIX}"/lib
> 
> PLIST_FILES=	include/libscrypt.h \
> 		lib/libscrypt.so \
>@@ -25,26 +25,17 @@
> 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 \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 387020)
>+++ distinfo	(working copy)
>@@ -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-1.20-c107c41_GH0.tar.gz) = d9781c534bdd4a888684a8a48e7c9c1df8c056122c1687039405eabe14627fb8
>+SIZE (technion-libscrypt-1.20-c107c41_GH0.tar.gz) = 18450

Actions: View | Diff

Attachments on bug 200412: 157081 | 157184