Attachment 223874 Details for Bug 254818 – Fixed git diff

[patch] Fixed git diff

sysutils_pcapfix_1.1.5.diff (text/plain), 1.95 KB, created by Vidar Karlsen on 2021-04-06 19:59:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vidar Karlsen

Created: 2021-04-06 19:59:40 UTC

Size: 1.95 KB

patch

obsolete

>diff --git a/sysutils/pcapfix/Makefile b/sysutils/pcapfix/Makefile
>index e5b025b1ac62..205c86c6240b 100644
>--- a/sysutils/pcapfix/Makefile
>+++ b/sysutils/pcapfix/Makefile
>@@ -1,6 +1,6 @@
> 
> PORTNAME=	pcapfix
>-PORTVERSION=	1.1.4
>+PORTVERSION=	1.1.5
> DISTVERSIONPREFIX=	v
> CATEGORIES=	sysutils
> 
>diff --git a/sysutils/pcapfix/distinfo b/sysutils/pcapfix/distinfo
>index d4ec797dcee7..9d2d3082a925 100644
>--- a/sysutils/pcapfix/distinfo
>+++ b/sysutils/pcapfix/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1548274664
>-SHA256 (Rup0rt-pcapfix-v1.1.4_GH0.tar.gz) = 73c2e316937792f6b9265ab2e12b9bb0e6d6a46626e311412c4903ace3e3a9f6
>-SIZE (Rup0rt-pcapfix-v1.1.4_GH0.tar.gz) = 51659
>+TIMESTAMP = 1617716795
>+SHA256 (Rup0rt-pcapfix-v1.1.5_GH0.tar.gz) = 60c25e2410db5b161a3c16f6d097dc4a62fdb815df2a9f3abc6f22a085ed90cb
>+SIZE (Rup0rt-pcapfix-v1.1.5_GH0.tar.gz) = 52670
>diff --git a/sysutils/pcapfix/files/patch-Makefile b/sysutils/pcapfix/files/patch-Makefile
>index f46911d00330..8245df591b5b 100644
>--- a/sysutils/pcapfix/files/patch-Makefile
>+++ b/sysutils/pcapfix/files/patch-Makefile
>@@ -1,15 +1,22 @@
>---- Makefile.orig	2018-07-16 12:17:05 UTC
>+--- Makefile.orig	2021-04-06 13:54:58 UTC
> +++ Makefile
>-@@ -8,9 +8,9 @@ WARNFLAGS = -Wall -Wextra -std=gnu99 -pe
>+@@ -7,18 +7,7 @@ OPTFLAGS = $(shell getconf LFS_CFLAGS) -D_FORTIFY_SOUR
>+ WARNFLAGS = -Wall -Wextra -std=gnu99 -pedantic -Wformat -Werror=format-security
>  DEBUGFLAGS = -g
>  CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
>- OS := $(shell uname)
>--ifneq ($(OS), Darwin)
>--	LDFLAGS += -Wl,-z,relro
>+-
>+-# Determine extra LDFLAGS
>+-OS := $(shell uname)
>+-ifeq ($(findstring Darwin,$(OS)),Darwin)
>+-   skip_ldflags = yes
>+-endif
>+-ifeq ($(findstring CYGWIN,$(OS)),CYGWIN)
>+-   skip_ldflags = yes
>+-endif
>+-ifndef skip_ldflags
>+-   LDFLAGS += -Wl,-z,relro
> -endif
>-+.if ${OS} != Darwin
> +LDFLAGS += -Wl,-z,relro
>-+.endif
>- 
>- 
>  
>+ all: pcap pcap_kuznet pcapng
>+ 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) pcapfix.c pcap.o pcap_kuznet.o pcapng.o -o pcapfix

Flags:

vidar: maintainer-approval+

Actions: View | Diff

Attachments on bug 254818: 223862 | 223874