From owner-dev-commits-ports-main@freebsd.org Thu Apr 8 06:05:28 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 89FE55D0AC0; Thu, 8 Apr 2021 06:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FG9jN3Ylvz3w0K; Thu, 8 Apr 2021 06:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 627C82D284; Thu, 8 Apr 2021 06:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13865SXq080472; Thu, 8 Apr 2021 06:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13865SoE080471; Thu, 8 Apr 2021 06:05:28 GMT (envelope-from git) Date: Thu, 8 Apr 2021 06:05:28 GMT Message-Id: <202104080605.13865SoE080471@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: a302d29cbe95 - main - sysutils/pcapfix: update to 1.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a302d29cbe9580c49fff129d13d9801d2267ae14 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 06:05:28 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=a302d29cbe9580c49fff129d13d9801d2267ae14 commit a302d29cbe9580c49fff129d13d9801d2267ae14 Author: Kevin Bowling AuthorDate: 2021-04-08 06:02:58 +0000 Commit: Kevin Bowling 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 (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