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: 09-Oct-2006 10:02:05
Branch: HEAD Handle: 2006100909020400
Modified files:
openpkg-src/flowtools flowtools.patch flowtools.spec
Log:
fix building under Solaris 10/amd64 by replacing one more u_in32_t
with u_int32 (which is defined in the sources)
Summary:
Revision Changes Path
1.14 +9 -2 openpkg-src/flowtools/flowtools.patch
1.24 +1 -1 openpkg-src/flowtools/flowtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 flowtools.patch
--- openpkg-src/flowtools/flowtools.patch 14 Oct 2005 09:34:44 -0000
1.13
+++ openpkg-src/flowtools/flowtools.patch 9 Oct 2006 08:02:04 -0000
1.14
@@ -399,8 +399,15 @@
if (nest == -1)
Index: flow-tools-0.68/lib/ftlib.h
--- flow-tools-0.68/lib/ftlib.h.orig 2005-05-10 17:51:33 +0200
-+++ flow-tools-0.68/lib/ftlib.h 2005-09-27 14:41:19 +0200
-@@ -3032,4 +3032,7 @@
++++ flow-tools-0.68/lib/ftlib.h 2006-10-09 09:53:10 +0200
+@@ -3026,10 +3026,13 @@
+ int ftxfield_parse(char *line, u_int64 *xfields);
+
+ #ifndef IN_CLASSD_SSM
+-#define IN_CLASSD_SSM(i) (((u_int32_t)(i) & 0xff000000) == 0xe8000000)
++#define IN_CLASSD_SSM(i) (((u_int32)(i) & 0xff000000) == 0xe8000000)
+ #endif /* IN_CLASSD_SSM */
+
/* MACHINE DEPENDANT */
#define fmt_uint fmt_uint32
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 flowtools.spec
--- openpkg-src/flowtools/flowtools.spec 24 Sep 2006 13:52:21 -0000
1.23
+++ openpkg-src/flowtools/flowtools.spec 9 Oct 2006 08:02:04 -0000
1.24
@@ -38,7 +38,7 @@
Group: Auditing
License: BSD
Version: %{V_flowtools}
-Release: 20060924
+Release: 20061009
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
