Fixed amd64 specific problem reported by Alexander Zubkov <green AT mes.msu.ru> in bug #177955.

Package-Manager: portage-2.1.2.7

2 files changed, 68 insertions, 0 deletions

diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r5 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r5
new file mode 100644
index 000000000000..3db6eb93276d
--- /dev/null
+++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r5
@@ -0,0 +1,3 @@
+MD5 c9e0a8b53c79611b6bffcb9d510a5a38 flow-tools-0.68.tar.gz 987151
+RMD160 71bfd1a40cb34fae55b2769d93208d13b3b0a927 flow-tools-0.68.tar.gz 987151
+SHA256 69d5353b339f917fc141919db042b007d5c8d31c9ad1bc2f989a41aa41d629df flow-tools-0.68.tar.gz 987151
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68-another-amd64-casting-fixes.patch b/net-analyzer/flow-tools/files/flow-tools-0.68-another-amd64-casting-fixes.patch
new file mode 100644
index 000000000000..1d795e1d4eaa
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68-another-amd64-casting-fixes.patch
@@ -0,0 +1,65 @@
+diff -Naur flow-tools-0.68.orig/lib/ftio.c flow-tools-0.68/lib/ftio.c
+--- flow-tools-0.68.orig/lib/ftio.c	2007-05-15 18:56:54.000000000 +0000
++++ flow-tools-0.68/lib/ftio.c	2007-05-15 18:48:02.000000000 +0000
+@@ -1605,6 +1605,7 @@
+   u_int32 flags, fields;
+   u_long period;
+   int n, streaming2;
++  time_t _ftime;
+ 
+   fth = &ftio->fth;
+ 
+@@ -1639,17 +1640,21 @@
+   }
+ 
+   if (!streaming2)
+-    if (fields & FT_FIELD_CAP_START)
++    if (fields & FT_FIELD_CAP_START) {
++      _ftime = (time_t)fth->cap_start;
+       fprintf(std, "%c capture start:        %s", cc,
+-        ctime((time_t*)&fth->cap_start));
++        ctime(&_ftime));
++    }
+ 
+   if (!streaming2) {
+ 
+     if ((flags & FT_HEADER_FLAG_DONE) || (flags & FT_HEADER_FLAG_PRELOADED)) {
+ 
+-      if (fields & FT_FIELD_CAP_END)
++      if (fields & FT_FIELD_CAP_END) {
++        _ftime = (time_t)fth->cap_end;
+         fprintf(std, "%c capture end:          %s", cc,
+-          ctime((time_t*)&fth->cap_end));
++          ctime(&_ftime));
++      }
+ 
+       period = fth->cap_end - fth->cap_start;
+       if ((fields & FT_FIELD_CAP_END) && (fields & FT_FIELD_CAP_START))
+diff -Naur flow-tools-0.68.orig/lib/ftstat.c flow-tools-0.68/lib/ftstat.c
+--- flow-tools-0.68.orig/lib/ftstat.c	2007-05-15 18:56:54.000000000 +0000
++++ flow-tools-0.68/lib/ftstat.c	2007-05-15 18:51:00.000000000 +0000
+@@ -12363,7 +12363,7 @@
+ {
+   int comma, sort_field;
+   char *buf, fmt_buf[32];
+-  time_t now;
++  time_t now, _ftime;
+ 
+   /* shortcut */
+   if (!(rpt->out->options & FT_STAT_OPT_HEADER))
+@@ -12619,11 +12619,13 @@
+     fprintf(fp, "# records_shown:      %s\n", fmt_buf);
+   }
+ 
++  _ftime = (time_t)rpt->time_start;
+   fprintf(fp, "# first-flow:           %lu %s",
+-    (unsigned long)rpt->time_start, ctime((time_t*)&rpt->time_start));
++    (unsigned long)rpt->time_start, ctime(&_ftime));
+ 
++  _ftime = (time_t)rpt->time_end;
+   fprintf(fp, "# last-flow:            %lu %s",
+-    (unsigned long)rpt->time_end, ctime((time_t*)&rpt->time_end));
++    (unsigned long)rpt->time_end, ctime(&_ftime));
+ 
+   now = time((time_t*)0L);
+