Attachment 140811 Details for Bug 187513 – file.diff

[patch] file.diff

file.diff (text/plain), 1.87 KB, created by Horia Racoviceanu on 2014-03-12 22:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Horia Racoviceanu

Created: 2014-03-12 22:10:00 UTC

Size: 1.87 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 348009)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libscrypt
>-PORTVERSION=	1.14
>-PORTREVISION=	1
>+PORTVERSION=	1.18
> CATEGORIES=	security
> 
> MAINTAINER=	horia@racoviceanu.com
>@@ -16,23 +15,25 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	technion
> GH_TAGNAME=	${GH_COMMIT}
>-GH_COMMIT=	8e6966e
>+GH_COMMIT=	35b6894
> 
> PLIST_FILES=	include/libscrypt.h \
>-		lib/libscrypt.a \
> 		lib/libscrypt.so \
> 		lib/libscrypt.so.0
> 
> PORTDOCS=	README.md
>-
> OPTIONS_DEFINE=	DOCS
> 
>+.include <bsd.port.pre.mk>
>+
> post-patch:
>-	@${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s|$$| ${CFLAGS}|' \
>-		-e 's|/usr/local|${PREFIX}| ; \
>-		s|install: library|& install-static| ; \
>-		s|$$(LDFLAGS)||' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e 's|CC?=gcc|CC?=${CC}|; s|CFLAGS?=|CFLAGS+=|; \
>+		s|LIBDIR       ?|LIBDIR        |' ${WRKSRC}/Makefile
> 
>+.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc
>+	@${REINPLACE_CMD} -e 's|stack-protector|no-&|' ${WRKSRC}/Makefile
>+.endif
>+
> regression-test: build
> 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check)
> 
>@@ -40,10 +41,6 @@
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
> 
>-.include <bsd.port.pre.mk>
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.0
> 
>-.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc
>-CFLAGS+=	-fno-stack-protector
>-.endif
>-
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 348009)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (libscrypt-1.14.tar.gz) = 08d9f83eee4f2eb00c740357fd3648ce7d038ba4b5af2ee9fdc4319f76113e8b
>-SIZE (libscrypt-1.14.tar.gz) = 20562
>+SHA256 (libscrypt-1.18.tar.gz) = 5c8c59cc76bbbcb9d674fb72a668938cd2d6c5e1d5a302a8dc83f541f33b65ea
>+SIZE (libscrypt-1.18.tar.gz) = 17418

Actions: View | Diff

Attachments on bug 187513: 140811