orion pushed to flow-tools (epel7). "Fix flow-capture segfaults on platforms with 64bit time_t"

[notifications at fedoraproject.org]

>From 3eeb44a46cf4541c50064fcd5ad6f21589b65aba Mon Sep 17 00:00:00 2001
From: Paul P Komkoff Jr <stingray at fedoraproject.org>
Date: Sun, 30 Oct 2005 16:36:36 +0000
Subject: Fix flow-capture segfaults on platforms with 64bit time_t


diff --git a/flow-tools-0.68b.patch b/flow-tools-0.68b.patch
new file mode 100644
index 0000000..5b6ab3e
--- /dev/null
+++ b/flow-tools-0.68b.patch
@@ -0,0 +1,40 @@
+diff -urN flow-tools-0.68/lib/ftfile.c flow-tools-0.68.a/lib/ftfile.c
+--- flow-tools-0.68/lib/ftfile.c	2003-02-13 05:38:42.000000000 +0300
++++ flow-tools-0.68.a/lib/ftfile.c	2005-10-30 00:27:33.000000000 +0400
+@@ -413,16 +413,17 @@
+  int done, u_int32 ftime)
+ {
+   struct tm *tm;
++  time_t _t = (time_t) ftime;
+   char *prefix, dbuf[64];
+   long gmt_val;
+   char gmt_sign;
+   int tm_gmtoff;
+   
+-  if (!(tm = localtime ((time_t*)&ftime))) {
++  if (!(tm = localtime (&_t))) {
+     snprintf(buf, bsize, ".");
+   }
+ 
+-  tm_gmtoff = get_gmtoff(ftime);
++  tm_gmtoff = get_gmtoff(_t);
+ 
+   /* compute GMT offset */
+   if (tm_gmtoff >= 0) {
+@@ -502,6 +503,7 @@
+ int ftfile_mkpath(u_int32 ftime, int nest)
+ {
+   struct tm *tm;
++  time_t _t = (time_t) ftime;
+   char buf[32];
+ 
+   /* no directories */
+@@ -512,7 +514,7 @@
+   if ((nest > 3) || (nest < -3))
+     return -1;
+ 
+-  if (!(tm = localtime ((time_t*)&ftime)))
++  if (!(tm = localtime (&_t)))
+     return -1;
+ 
+   if (nest == -1)
diff --git a/flow-tools.spec b/flow-tools.spec
index b86848c..3e0f344 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -1,12 +1,13 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
 Source0: ftp://ftp.eng.oar.net/pub/flow-tools/flow-tools-%{version}.tar.gz
 Patch0: flow-tools-0.68a.patch
+Patch1: flow-tools-0.68b.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf zlib-devel
 
@@ -39,6 +40,7 @@ libft.
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1
 
 %build
 autoreconf -f -i -s
@@ -77,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*.h
 
 %changelog
+* Sun Oct 30 2005 Paul P Komkoff Jr <i at stingr.net> 0.68-5
+- Fix flow-capture segfaults on platforms with 64bit time_t
+
 * Thu Oct 20 2005 Paul P Komkoff Jr <i at stingr.net> 0.68-4
 - Fix accidential damage
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/flow-tools.git/commit/?h=epel7&id=3eeb44a46cf4541c50064fcd5ad6f21589b65aba