Attachment 136165 Details for Bug 181286 – file.diff

[patch] file.diff

file.diff (text/plain), 1.85 KB, created by Horia Racoviceanu on 2013-08-14 12:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Horia Racoviceanu

Created: 2013-08-14 12:50:01 UTC

Size: 1.85 KB

patch

obsolete

>diff -ruN libscrypt-v1.1/Makefile libscrypt/Makefile
>--- libscrypt-v1.1/Makefile	2013-07-28 12:51:54.000000000 -0400
>+++ libscrypt/Makefile	2013-08-14 06:45:30.000000000 -0400
>@@ -1,8 +1,8 @@
> # Created by: Horia Racoviceanu <horia@racoviceanu.com>
>-# $FreeBSD: security/libscrypt/Makefile 323838 2013-07-28 16:51:54Z vanilla $
>+# $FreeBSD$
> 
> PORTNAME=	libscrypt
>-PORTVERSION=	1.1
>+PORTVERSION=	1.13
> CATEGORIES=	security
> 
> MAINTAINER=	horia@racoviceanu.com
>@@ -14,7 +14,7 @@
> USE_LDCONFIG=	yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	technion
>-GH_COMMIT=	49f9136
>+GH_COMMIT=	a217e5b
> GH_TAGNAME=	v${PORTVERSION}
> 
> PLIST_FILES+=	include/libscrypt.h \
>@@ -22,11 +22,22 @@
> 		lib/libscrypt.so \
> 		lib/libscrypt.so.0
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == i386
>+CCVERSION!=	${CC} --version
>+.  if !empty(CCVERSION:tl:M*gcc*)
>+# gcc+i386+-fstack-protector fails with undefined reference to `__stack_chk_fail_local'
>+CFLAGS+=	-fno-stack-protector
>+.  endif
>+.endif
>+
> post-patch:
>-	${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s,$$, ${CFLAGS},' \
>-	    -e 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s,$$, ${CFLAGS},' \
>+	    -e 's,/usr/local,${PREFIX},' -e 's,install: library,& install-static,' \
>+	    -e 's,$$(LDFLAGS),,' ${WRKSRC}/Makefile
> 
> regression-test: build
> 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check)
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN libscrypt-v1.1/distinfo libscrypt/distinfo
>--- libscrypt-v1.1/distinfo	2013-07-28 12:51:54.000000000 -0400
>+++ libscrypt/distinfo	2013-08-14 04:11:51.000000000 -0400
>@@ -1,2 +1,2 @@
>-SHA256 (libscrypt-1.1.tar.gz) = f6cec579980850604267566731e12d985f16739cd92b828fe28c326f6a7ee798
>-SIZE (libscrypt-1.1.tar.gz) = 20276
>+SHA256 (libscrypt-1.13.tar.gz) = 603c029cdff9b993d42eb1d48882ae6fb9083dfad6b4ecf154e935805d150dcd
>+SIZE (libscrypt-1.13.tar.gz) = 20503

Actions: View | Diff

Attachments on bug 181286: 136165 | 136166