commit: 71d53b4138dec0178ad8838b3e89f2ceaf9cba08
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Jan 31 14:08:22 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Jan 31 14:09:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d53b41
net-analyzer/rain: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706874
Signed-off-by: Jeroen Roovers gentoo.org>
.../rain/files/rain-1.2.9_beta1-die-on-error.patch | 40
.../rain/files/rain-1.2.9_beta1-fno-common.patch | 111 +
net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild | 37 +++
3 files changed, 188 insertions(+)
diff --git a/net-analyzer/rain/files/rain-1.2.9_beta1-die-on-error.patch
b/net-analyzer/rain/files/rain-1.2.9_beta1-die-on-error.patch
new file mode 100644
index 000..ac73a0f5390
--- /dev/null
+++ b/net-analyzer/rain/files/rain-1.2.9_beta1-die-on-error.patch
@@ -0,0 +1,40 @@
+--- a/Makefile.in
b/Makefile.in
+@@ -15,22 +15,22 @@
+
+ all:
+ @echo Making all
+- -$(CC) $(CFLAGS) -c source/rain_command_line.c
+- -$(CC) $(CFLAGS) -c source/rain_defaults.c
+- -$(CC) $(CFLAGS) -c source/rain_die.c
+- -$(CC) $(CFLAGS) -c source/rain_icmp.c
+- -$(CC) $(CFLAGS) -c source/rain_igmp.c
+- -$(CC) $(CFLAGS) -c source/rain_inet_common.c
+- -$(CC) $(CFLAGS) -c source/rain_mem.c
+- -$(CC) $(CFLAGS) -c source/rain_resolv.c
+- -$(CC) $(CFLAGS) -c source/rain_services.c
+- -$(CC) $(CFLAGS) -c source/rain_signal.c
+- -$(CC) $(CFLAGS) -c source/rain_string.c
+- -$(CC) $(CFLAGS) -c source/rain_tcp.c
+- -$(CC) $(CFLAGS) -c source/rain_udp.c
+- -$(CC) $(CFLAGS) -c source/rain_main.c
++ $(CC) $(CFLAGS) -c source/rain_command_line.c
++ $(CC) $(CFLAGS) -c source/rain_defaults.c
++ $(CC) $(CFLAGS) -c source/rain_die.c
++ $(CC) $(CFLAGS) -c source/rain_icmp.c
++ $(CC) $(CFLAGS) -c source/rain_igmp.c
++ $(CC) $(CFLAGS) -c source/rain_inet_common.c
++ $(CC) $(CFLAGS) -c source/rain_mem.c
++ $(CC) $(CFLAGS) -c source/rain_resolv.c
++ $(CC) $(CFLAGS) -c source/rain_services.c
++ $(CC) $(CFLAGS) -c source/rain_signal.c
++ $(CC) $(CFLAGS) -c source/rain_string.c
++ $(CC) $(CFLAGS) -c source/rain_tcp.c
++ $(CC) $(CFLAGS) -c source/rain_udp.c
++ $(CC) $(CFLAGS) -c source/rain_main.c
+
+- -$(CC) $(CFLAGS) $(LDFLAGS) -o rain rain_command_line.o rain_defaults.o
rain_die.o rain_icmp.o rain_igmp.o rain_inet_common.o rain_main.o rain_mem.o
rain_resolv.o rain_services.o rain_signal.o rain_string.o rain_tcp.o rain_udp.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -o rain rain_command_line.o rain_defaults.o
rain_die.o rain_icmp.o rain_igmp.o rain_inet_common.o rain_main.o rain_mem.o
rain_resolv.o rain_services.o rain_signal.o rain_string.o rain_tcp.o rain_udp.o
+
+ @echo done.
+
diff --git a/net-analyzer/rain/files/rain-1.2.9_beta1-fno-common.patch
b/net-analyzer/rain/files/rain-1.2.9_beta1-fno-common.patch
new file mode 100644
index 000..06eb84fc2e7
--- /dev/null
+++ b/net-analyzer/rain/files/rain-1.2.9_beta1-fno-common.patch
@@ -0,0 +1,111 @@
+--- a/include/rain_inet_common.h
b/include/rain_inet_common.h
+@@ -368,14 +368,14 @@
+ /*
+ * global variables
+ */
+-u_int16_t packetsize;
+-unsigned char *buffer; /* For holding packets. Declared globally to
ensure it is freed when the program exits */
+-time_t send_start; /* for storing start and finish time of total
packets sent */
+-time_t send_finish;
+-unsigned long packets_sent;
+-u_shortverbose;
+-struct in_addr group; /* for ICMP gateway and IGMP group addresses */
+-int sendflags; /* stores flags for sendto(); Default is 0 */
++extern u_int16_t packetsize;
++extern unsigned char *buffer; /* For holding packets. Declared
globally to ensure it is freed when the program exits */
++extern time_t send_start; /* for storing start and finish time of
total packets sent */
++extern time_t send_finish;
++extern unsigned long packets_sent;
++extern u_shortverbose;
++extern struct in_addr group; /* for ICMP gateway and IGMP group
addresses */
++extern int sendflags; /* stores flags for sendto(); Default is
0 */
+ /*---*/
+
+
+--- a/source/rain_inet_common.c
b/source/rain_inet_common.c
+@@ -17,6 +17,18 @@
+ *-*/
+ #include "rain_common.h"
+
++/*
++ * global variables
++ */
++u_int16_t packetsize;
++unsigned char *buffer; /* For holding packets. Declared globally to
ensure it is freed when the program exits */
++time_t send_start; /* for storing start and finish time of total
packets sent */
++time_t send_finish;
++unsigned long packets_sent;
++u_shortverbose;
