Attachment 201663 Details for Bug 235444 – patch to update port

[patch] patch to update port

patch (text/plain), 3.16 KB, created by jharris on 2019-02-02 23:37:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jharris

Created: 2019-02-02 23:37:26 UTC

Size: 3.16 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 492020)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	sha1collisiondetection
>-PORTVERSION=	1.0.2
>+PORTVERSION=	1.0.3
> DISTVERSIONPREFIX=	stable-v
> CATEGORIES=	security
> 
>@@ -28,14 +28,14 @@
> 		bin/sha1dcsum_partialcoll \
> 		include/sha1dc/sha1.h \
> 		lib/libsha1detectcoll.so \
>-		lib/libsha1detectcoll.so.0 \
>-		lib/libsha1detectcoll.so.0.0.0
>+		lib/libsha1detectcoll.so.1 \
>+		lib/libsha1detectcoll.so.1.0.0
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/sha1dcsum* ${STAGEDIR}${PREFIX}/bin
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/sha1dc
> 	${INSTALL_DATA} ${WRKSRC}/lib/sha1.h ${STAGEDIR}${PREFIX}/include/sha1dc
>-	${INSTALL_LIB} ${WRKSRC}/bin/.libs/libsha1detectcoll.so.0.0.0 ${STAGEDIR}${PREFIX}/lib
>-	${LN} -sf libsha1detectcoll.so.0.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so
>-	${LN} -sf libsha1detectcoll.so.0.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so.0
>+	${INSTALL_LIB} ${WRKSRC}/bin/.libs/libsha1detectcoll.so.1.0.0 ${STAGEDIR}${PREFIX}/lib
>+	${LN} -sf libsha1detectcoll.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so
>+	${LN} -sf libsha1detectcoll.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so.1
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 492020)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1489459273
>-SHA256 (cr-marcstevens-sha1collisiondetection-stable-v1.0.2_GH0.tar.gz) = ab1a5624d12417b5af9ffe6662546b6932c39c0e4c4bef822851a2d0e53df790
>-SIZE (cr-marcstevens-sha1collisiondetection-stable-v1.0.2_GH0.tar.gz) = 778302
>+TIMESTAMP = 1549146242
>+SHA256 (cr-marcstevens-sha1collisiondetection-stable-v1.0.3_GH0.tar.gz) = 77a1c2b2a4fbe4f78de288fa4831ca63938c3cb84a73a92c79f436238bd9ac07
>+SIZE (cr-marcstevens-sha1collisiondetection-stable-v1.0.3_GH0.tar.gz) = 780306
>--- /dev/null	2019-02-02 19:22:51.598960000 -0400
>+++ files/patch-Makefile	2019-02-02 19:10:49.295930000 -0400
>@@ -0,0 +1,12 @@
>+diff -u Makefile Makefile
>+--- Makefile	2017-03-27 12:11:23.000000000 -0400
>++++ Makefile	2019-02-02 19:04:55.614733000 -0400
>+@@ -33,7 +33,7 @@
>+ endif
>+ 
>+ 
>+-CFLAGS=-O2 -Wall -Werror -Wextra -pedantic -std=c90 -Ilib
>++CFLAGS=-O2 -Wall -Werror -Wextra -pedantic -Ilib
>+ LDFLAGS=
>+ 
>+ LT_CC:=$(LIBTOOL) --tag=CC --mode=compile $(CC)
>--- /dev/null	2019-02-02 19:22:56.582800000 -0400
>+++ files/patch-src::main.c	2019-02-02 19:11:50.399237000 -0400
>@@ -0,0 +1,23 @@
>+diff -u src/main.c src/main.c
>+--- src/main.c	2017-03-27 12:11:23.000000000 -0400
>++++ src/main.c	2019-02-02 19:07:36.596835000 -0400
>+@@ -9,6 +9,8 @@
>+ #include <stdlib.h>
>+ #include <string.h>
>+ #include <libgen.h>
>++#include <limits.h>	/* for NAME_MAX, max bytes in a file name */
>++#include <assert.h>	/* for assert() macro */
>+ 
>+ #include "sha1.h"
>+ 
>+@@ -23,7 +25,9 @@
>+ 
>+ 	if (argc < 2)
>+ 	{
>+-		printf("Usage: %s <file>\n", basename(argv[0]));
>++assert (sizeof(buffer) >= NAME_MAX); /* reuse buffer[] for newly-POSIX-compliant, thread-safe basename() */
>++		(void) strlcpy (buffer, argv[0], sizeof (buffer));
>++		printf("Usage: %s <file>\n", basename(buffer));
>+ 		return 1;
>+ 	}
>+

Flags:

jharris: maintainer-approval+

Actions: View | Diff

Attachments on bug 235444: 201663