OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jul-2005 16:48:58
Branch: HEAD Handle: 2005072215485800
Modified files:
openpkg-src/flowtools flowtools.patch flowtools.spec
Log:
port flowtools to real 64-bit platforms like FreeBSD/amd64 where
time_t is a 64-bit integer and hence we have to explicitly _cast_ a
32-bit integer value into the 64-bit time_t variable before we pass a
pointer to the time_t variable to localtime(3)
Summary:
Revision Changes Path
1.11 +38 -0 openpkg-src/flowtools/flowtools.patch
1.17 +1 -1 openpkg-src/flowtools/flowtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 flowtools.patch
--- openpkg-src/flowtools/flowtools.patch 15 May 2005 17:51:33 -0000
1.10
+++ openpkg-src/flowtools/flowtools.patch 22 Jul 2005 14:48:58 -0000
1.11
@@ -359,3 +359,41 @@
sprintf(buf, "%02d/%02d/%04d %02d:%02d:%02d",
tm->tm_mon+1,
+Index: flow-tools-0.68/lib/ftfile.c
+--- flow-tools-0.68/lib/ftfile.c.orig 2003-02-13 03:38:42 +0100
++++ flow-tools-0.68/lib/ftfile.c 2005-07-22 16:42:39 +0200
+@@ -417,12 +417,14 @@
+ long gmt_val;
+ char gmt_sign;
+ int tm_gmtoff;
++ time_t t;
+
+- if (!(tm = localtime ((time_t*)&ftime))) {
++ t = (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) {
+@@ -503,6 +505,7 @@
+ {
+ struct tm *tm;
+ char buf[32];
++ time_t t;
+
+ /* no directories */
+ if (nest == 0)
+@@ -512,7 +515,8 @@
+ if ((nest > 3) || (nest < -3))
+ return -1;
+
+- if (!(tm = localtime ((time_t*)&ftime)))
++ t = (time_t)ftime;
++ if (!(tm = localtime (&t)))
+ return -1;
+
+ if (nest == -1)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 flowtools.spec
--- openpkg-src/flowtools/flowtools.spec 16 May 2005 10:09:34 -0000
1.16
+++ openpkg-src/flowtools/flowtools.spec 22 Jul 2005 14:48:58 -0000
1.17
@@ -38,7 +38,7 @@
Group: Network
License: BSD
Version: %{V_flowtools}
-Release: 20050516
+Release: 20050722
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
