summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Hartmann <sultan@gentoo.org>2021-01-04 18:21:38 +0100
committerStephan Hartmann <sultan@gentoo.org>2021-01-04 18:21:38 +0100
commitc4716e4f1bebc10f9962edc66b1faecda1b02ba8 (patch)
treed7dfc3b63fc015bbda4e80ccecf8e2bb7f212327 /net-analyzer/traceproto
parentapp-emulation/docker-compos: 1.28.0_rc2 (diff)
downloadgentoo-c4716e4f1bebc10f9962edc66b1faecda1b02ba8.tar.gz
gentoo-c4716e4f1bebc10f9962edc66b1faecda1b02ba8.tar.bz2
gentoo-c4716e4f1bebc10f9962edc66b1faecda1b02ba8.zip
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 <sultan@gentoo.org>
Diffstat (limited to 'net-analyzer/traceproto')
-rw-r--r--net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch122
-rw-r--r--net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild20
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 <dmalloc.h>
+ #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 <dmalloc.h>
+ #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
}