Date: Thu, 8 Apr 2021 06:05:28 GMT From: Kevin Bowling <kbowling@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a302d29cbe95 - main - sysutils/pcapfix: update to 1.1.5 Message-ID: <202104080605.13865SoE080471@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=a302d29cbe9580c49fff129d13d9801d2267ae14 commit a302d29cbe9580c49fff129d13d9801d2267ae14 Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2021-04-08 06:02:58 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2021-04-08 06:05:19 +0000 sysutils/pcapfix: update to 1.1.5 Changelog https://github.com/Rup0rt/pcapfix/blob/v1.1.5/Changelog PR: 254818 Approved by: Vidar Karlsen <vidar@karlsen.tech> (maintainer) --- sysutils/pcapfix/Makefile | 2 +- sysutils/pcapfix/distinfo | 6 +++--- sysutils/pcapfix/files/patch-Makefile | 25 ++++++++++++++++--------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/sysutils/pcapfix/Makefile b/sysutils/pcapfix/Makefile index 0d46d6f32543..9e6117720aad 100644 --- a/sysutils/pcapfix/Makefile +++ b/sysutils/pcapfix/Makefile @@ -1,5 +1,5 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104080605.13865SoE080471>