From nobody Thu Nov 17 07:08:07 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NCWGH4tKkz4hJ2m; Thu, 17 Nov 2022 07:08:07 +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 4NCWGH4PbGz3whD; Thu, 17 Nov 2022 07:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668668887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S5HjBfhFogv5YqSwF+ujVARzkSq/jLzYmTz3J+traRQ=; b=q5rPBk9TE9M65ecsdyxJpF1zegc1eDNOPugwcSVXCffvItDVJvZSj+yZ8yCzve/dJV5NzN lnR7j7iZpyv79LtAGP0MrlWxK0TpjjB1nTUedhB5UjhPiAdmjlHKDqKLzyM+gFwxn023dA ceUpF6Xv8Vbwpwvlpgx2Q+2rkmNirfqxnV5DCI1pq6wczouPSwcPHobqv4ejOhRNjkGlF2 ehDz29uar4P7poHzTmwowdsLitlFwz3iZtWrjM/fftzSIdt/cnj9U0vB0XJ+Pwr3ckeqvd V7P1Ys09thQw7y2gEYOuQi6KYZBXLui2qE3McZ3j4czpsvx7y+Bg29dwPulAHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668668887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S5HjBfhFogv5YqSwF+ujVARzkSq/jLzYmTz3J+traRQ=; b=cNL/tf8/vvulHAChlX8aaXkd9tQliRosGIQBvcw6yN72kiEvOKwF6gKjxM9+DyaLiOgTmn MyTzXrdRQ6MEBe0u8pfoEozvlLdny3XY5gR1kMDyalSUbrQl2s2ji8L2WLkgY5zsPh8L0k jB3JT6EUtc/QIruUngDH9DUVsv+9B5Ra7AfA8zwjyiZysE7do2kHvFg+HKQ/XRu3fFekmJ B0Ib+zs6o6LTX8X9A88/i0lTdJCdTIo2f8IAgYPAhq5QU315D1KiRHYrh2iDQpcrDmMPJe /1YjTPjzrWBzsoOPKVZkwAAu1fnZOoFpyTgpKscux6M9f2zGQ4YLyii1N6WqZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668668887; a=rsa-sha256; cv=none; b=iIyh25WsCywq+PH/muCIe2JGV7hTDCISZLfKB/b64ph9dosvq8gHkGCCeAR47kgZ1r3UUu 0BEszFil1dYBdPCgWL10rPj0ixsD7UsAZ85aiX/y9JuxceTA0b2GZMAm373iy3mZdExFh+ bsn/5O3QOT6RSozoRJwEiP90g8GdHXsM/1TXg95XIJ4a1RldPekWLXV5ZaQgw10d5pt8mu JXOezIW2QHpFhW0sOcKq9n5Smtm3w3sO7anNAPtYsTGJgP+ouQHHL1HQNTEAKMTaSs/ObQ R7BHigxW8W3Jcm1S4XxkVQ+r/AJLD0r7+xK0cKxDcCxa25fsY3VSzo+rahzCmA== 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 4NCWGH3SgczXql; Thu, 17 Nov 2022 07:08:07 +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 2AH787Oc018622; Thu, 17 Nov 2022 07:08:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AH787CC018621; Thu, 17 Nov 2022 07:08:07 GMT (envelope-from git) Date: Thu, 17 Nov 2022 07:08:07 GMT Message-Id: <202211170708.2AH787CC018621@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 0330fdec1370 - 2022Q4 - net/traff: fix build with -fno-common List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 0330fdec13705154dfffcbd8cfa0cf8760699353 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=0330fdec13705154dfffcbd8cfa0cf8760699353 commit 0330fdec13705154dfffcbd8cfa0cf8760699353 Author: Robert Clausecker AuthorDate: 2022-11-07 19:08:14 +0000 Commit: Fernando Apesteguía CommitDate: 2022-11-17 07:04:18 +0000 net/traff: fix build with -fno-common Also: * define LICENSE * fix missing LIB_DEPENDS on libargp.so PR: 267594 Reported by: fuz@fuz.su Approved by: daniel@freebsd.ro (maintainer, timeout 2 weeks) MFH: 2022Q4 (build fix) (cherry picked from commit 98a1bc7f0d2f5539100fe22e27f83cedb29ab040) --- net/traff/Makefile | 9 +++++---- net/traff/files/patch-readconfig.c | 11 +++++++++++ net/traff/files/patch-readconfig.h | 12 ++++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/net/traff/Makefile b/net/traff/Makefile index 70c12cc5ad79..a75fb9916df9 100644 --- a/net/traff/Makefile +++ b/net/traff/Makefile @@ -1,16 +1,17 @@ PORTNAME= traff PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= daniel@freebsd.ro COMMENT= Libpcab based fast traffic accounting program +WWW= https://sourceforge.net/projects/traff -BROKEN_FreeBSD_13= ld: error: duplicate symbol: conf_file -BROKEN_FreeBSD_14= ld: error: duplicate symbol: conf_file +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:devel/argp-standalone +LIB_DEPENDS= libargp.so:devel/argp-standalone USES= gmake USE_RC_SUBR= traff diff --git a/net/traff/files/patch-readconfig.c b/net/traff/files/patch-readconfig.c new file mode 100644 index 000000000000..1d89296124ff --- /dev/null +++ b/net/traff/files/patch-readconfig.c @@ -0,0 +1,11 @@ +--- readconfig.c.orig 2022-11-06 12:02:53 UTC ++++ readconfig.c +@@ -23,6 +23,8 @@ + + #define WHITESPACE " \t\r\n" + ++char conf_file[]; ++ + typedef enum { + // oSQL, + oBadOption,oDevices,oPeriod,oCat, diff --git a/net/traff/files/patch-readconfig.h b/net/traff/files/patch-readconfig.h index 0f0af5b4f64f..15c31d3ae1c8 100644 --- a/net/traff/files/patch-readconfig.h +++ b/net/traff/files/patch-readconfig.h @@ -1,5 +1,5 @@ ---- readconfig.h.orig 2009-11-10 20:55:07.000000000 -0500 -+++ readconfig.h 2011-05-26 21:06:12.000000000 -0400 +--- readconfig.h.orig 2009-11-11 01:55:07 UTC ++++ readconfig.h @@ -13,7 +13,7 @@ #endif @@ -9,3 +9,11 @@ #endif #include +@@ -118,6 +118,6 @@ int config_read_config_file(t_config * config,char * f + void config_destroy(t_config * config); + char * get_dump_type_str(e_dumptypes dumptype); + +-char conf_file[FILELENGTH]; ++extern char conf_file[FILELENGTH]; + + #endif