From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3A2231382C5 for ; Mon, 4 Jan 2021 17:22:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70D1EE09D0; Mon, 4 Jan 2021 17:22:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44514E09D0 for ; Mon, 4 Jan 2021 17:22:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C01EC3411F3 for ; Mon, 4 Jan 2021 17:22:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48CC4332 for ; Mon, 4 Jan 2021 17:22:55 +0000 (UTC) From: "Stephan Hartmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stephan Hartmann" Message-ID: <1609780898.c4716e4f1bebc10f9962edc66b1faecda1b02ba8.sultan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/traceproto/files/, net-analyzer/traceproto/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild X-VCS-Directories: net-analyzer/traceproto/ net-analyzer/traceproto/files/ X-VCS-Committer: sultan X-VCS-Committer-Name: Stephan Hartmann X-VCS-Revision: c4716e4f1bebc10f9962edc66b1faecda1b02ba8 X-VCS-Branch: master Date: Mon, 4 Jan 2021 17:22:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37956520-72e4-4062-8965-712a949af39b X-Archives-Hash: bdf1fba5108dd363b254b3940f83e4f9 commit: c4716e4f1bebc10f9962edc66b1faecda1b02ba8 Author: Stephan Hartmann gentoo org> AuthorDate: Mon Jan 4 17:21:38 2021 +0000 Commit: Stephan Hartmann gentoo org> CommitDate: Mon Jan 4 17:21:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4716e4f net-analyzer/traceproto: fix build with -fno-common, EAPI 7 Closes: https://bugs.gentoo.org/751718 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Stephan Hartmann gentoo.org> .../files/traceproto-1.1.2_beta1-fno-common.patch | 122 +++++++++++++++++++++ .../traceproto/traceproto-1.1.2_beta1.ebuild | 20 ++-- 2 files changed, 135 insertions(+), 7 deletions(-) diff --git a/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch new file mode 100644 index 00000000000..8d95517ab27 --- /dev/null +++ b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch @@ -0,0 +1,122 @@ +--- a/tp_as.c ++++ b/tp_as.c +@@ -50,6 +50,7 @@ static char * ra_service; + static struct hostent * ra_hostent; + static struct servent * ra_servent; + ++char as_string[1024]; + + int setup_as ( void ) + { +--- a/tp_as.h ++++ b/tp_as.h +@@ -33,7 +33,7 @@ + #ifndef TP_AS_H + #define TP_AS_H 1 + +-char as_string[1024]; ++extern char as_string[1024]; + + /*! Initialisation function for AS lookups; returns 0 iff successful. */ + int setup_as(void); +--- a/tp_miscfunc.c ++++ b/tp_miscfunc.c +@@ -52,6 +52,8 @@ + #include + #endif /* HAVE_LIBDMALLOC */ + ++struct cleanup tixe_cleanup; ++ + /* + * take a comma separated list (sans spaces) and give them a miss + * (ie don't send probes with the ttl set to these numbers) +--- a/tp_miscfunc.h ++++ b/tp_miscfunc.h +@@ -32,7 +32,8 @@ struct cleanup { + unsigned int libnet_cleanup : 1; + unsigned int pcap_cleanup : 1; + unsigned int addrinfo_cleanup : 1; +-} tixe_cleanup; ++}; ++extern struct cleanup tixe_cleanup; + + int parse_skips ( char * ); + +--- a/traceproto.c ++++ b/traceproto.c +@@ -55,6 +55,12 @@ + #include + #endif /* HAVE_LIBDMALLOC */ + ++struct tp_align_ref tp_align_freelist; ++struct behavior behavior; ++struct packet packet; ++struct state state; ++struct debug debug; ++ + int main( int argc, char * argv[] ) + { + +--- a/traceproto.h ++++ b/traceproto.h +@@ -104,9 +104,10 @@ enum tp_tstamps { + struct tp_align_ref { + struct tp_align_ref * next; + u_char * ref; +-} tp_align_freelist; ++}; ++extern struct tp_align_ref tp_align_freelist; + +-struct { ++struct behavior { + unsigned int continuous : 1; + unsigned int continuous_accounting : 1; + unsigned int do_skip : 1; +@@ -148,9 +149,10 @@ struct { + char timestamp_str [ TP_TIMESTAMP_LEN ]; + char timestamp_style; + struct addrinfo hint; +-} behavior; ++}; ++extern struct behavior behavior; + +-struct { ++struct packet { + int dst_port; + int src_port; + int protocol_number; +@@ -161,9 +163,10 @@ struct { + long packed_src; + unsigned short frag_bit; + unsigned short ip_id; +-} packet; ++}; ++extern struct packet packet; + +-struct { ++struct state { + char * prog; + unsigned int account_hops; + struct hop_record { +@@ -208,9 +211,10 @@ struct { + unsigned int low_ttl; + unsigned int incr_error : 1; + unsigned int target_response : 1; +-} state; ++}; ++extern struct state state; + +-struct { ++struct debug { + unsigned int loop : 1; + unsigned int interface : 1; + unsigned int send_buf : 1; +@@ -219,6 +223,7 @@ struct { + unsigned int timestamp : 1; + unsigned int as_lookup : 1; + unsigned int memory : 1; +-} debug; ++}; ++extern struct debug debug; + + #endif /* TRACEPROTO_H */ diff --git a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild index 15e52604060..28f0ddbe591 100644 --- a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild +++ b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils autotools +EAPI=7 + +inherit autotools MY_PV=${PV/_/} @@ -18,11 +19,11 @@ IUSE="debug" RDEPEND=" net-libs/libnet:1.1 net-libs/libpcap - sys-libs/ncurses + sys-libs/ncurses:0= debug? ( dev-libs/dmalloc ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-doc/doxygen[dot] virtual/pkgconfig " @@ -31,8 +32,13 @@ S=${WORKDIR}/${PN}-${MY_PV} DOCS=( AUTHORS ChangeLog NEWS README TODO ) +PATCHES=( + "${FILESDIR}/${P}-tinfo.patch" + "${FILESDIR}/${P}-fno-common.patch" +) + src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch + default eautoreconf }